X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..f1d5aa4eca541a2f90044a63f555985d6bd4adf3:/samples/console/console.cpp diff --git a/samples/console/console.cpp b/samples/console/console.cpp index 43669bf593..ce887b1a59 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 wxWidgets +// Purpose: A sample console (as opposed to GUI) program using wxWidgets // Author: Vadim Zeitlin // Modified by: // Created: 04.10.99 @@ -25,6 +25,9 @@ #include "wx/file.h" #include "wx/app.h" #include "wx/log.h" +#include "wx/apptrait.h" +#include "wx/platinfo.h" +#include "wx/wxchar.h" // without this pragma, the stupid compiler precompiles #defines below so that // changing them doesn't "take place" later! @@ -46,16 +49,14 @@ // 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 +#define TEST_ALL 1 #if TEST_ALL - - #define TEST_CHARSET #define TEST_CMDLINE #define TEST_DATETIME #define TEST_DIR - #define TEST_DLLLOADER + #define TEST_DYNLIB #define TEST_ENVIRON #define TEST_EXECUTE #define TEST_FILE @@ -63,15 +64,12 @@ #define TEST_FILENAME #define TEST_FILETIME // #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_MIME + #define TEST_MODULE #define TEST_PATHLIST - #define TEST_ODBC #define TEST_PRINTF #define TEST_REGCONF #define TEST_REGEX @@ -79,6 +77,8 @@ #define TEST_SCOPEGUARD #define TEST_SNGLINST // #define TEST_SOCKETS --FIXME! (RN) + #define TEST_STACKWALKER + #define TEST_STDPATHS #define TEST_STREAMS #define TEST_TEXTSTREAM #define TEST_THREADS @@ -87,11 +87,8 @@ // #define TEST_VOLUME --FIXME! (RN) #define TEST_WCHAR #define TEST_ZIP - #else // #if TEST_ALL - - #define TEST_FILENAME - + #define TEST_EXECUTE #endif // some tests are interactive, define this to run them @@ -103,33 +100,6 @@ #define TEST_INTERACTIVE 0 #endif -// ---------------------------------------------------------------------------- -// test class for container objects -// ---------------------------------------------------------------------------- - -#if defined(TEST_LIST) - -class Bar // Foo is already taken in the hash test -{ -public: - Bar(const wxString& name) : m_name(name) { ms_bars++; } - Bar(const Bar& bar) : m_name(bar.m_name) { ms_bars++; } - ~Bar() { ms_bars--; } - - static size_t GetNumber() { return ms_bars; } - - const wxChar *GetName() const { return m_name; } - -private: - wxString m_name; - - static size_t ms_bars; -}; - -size_t Bar::ms_bars = 0; - -#endif // defined(TEST_LIST) - // ============================================================================ // implementation // ============================================================================ @@ -153,46 +123,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 // ---------------------------------------------------------------------------- @@ -206,7 +136,7 @@ static void TestCharset() static void ShowCmdLine(const wxCmdLineParser& parser) { - wxString s = _T("Input files: "); + wxString s = _T("Command line parsed successfully:\nInput files: "); size_t count = parser.GetParamCount(); for ( size_t param = 0; param < count; param++ ) @@ -220,6 +150,7 @@ static void ShowCmdLine(const wxCmdLineParser& parser) wxString strVal; long lVal; + double dVal; wxDateTime dt; if ( parser.Found(_T("o"), &strVal) ) s << _T("Output file:\t") << strVal << '\n'; @@ -227,6 +158,8 @@ static void ShowCmdLine(const wxCmdLineParser& parser) s << _T("Input dir:\t") << strVal << '\n'; if ( parser.Found(_T("s"), &lVal) ) s << _T("Size:\t") << lVal << '\n'; + if ( parser.Found(_T("f"), &dVal) ) + s << _T("Double:\t") << dVal << '\n'; if ( parser.Found(_T("d"), &dt) ) s << _T("Date:\t") << dt.FormatISODate() << '\n'; if ( parser.Found(_T("project_name"), &strVal) ) @@ -274,7 +207,7 @@ static void TestCmdLineConvert() #ifdef __UNIX__ static const wxChar *ROOTDIR = _T("/"); static const wxChar *TESTDIR = _T("/usr/local/share"); -#elif defined(__WXMSW__) +#elif defined(__WXMSW__) || defined(__DOS__) || defined(__OS2__) static const wxChar *ROOTDIR = _T("c:\\"); static const wxChar *TESTDIR = _T("d:\\"); #else @@ -301,6 +234,8 @@ static void TestDirEnumHelper(wxDir& dir, wxPuts(wxEmptyString); } +#if TEST_ALL + static void TestDirEnum() { wxPuts(_T("*** Testing wxDir::GetFirst/GetNext ***")); @@ -356,6 +291,8 @@ static void TestDirEnum() TestDirEnumHelper(dirNo); } +#endif // TEST_ALL + class DirPrintTraverser : public wxDirTraverser { public: @@ -406,6 +343,8 @@ static void TestDirTraverse() dir.Traverse(traverser, wxEmptyString, wxDIR_DIRS | wxDIR_HIDDEN); } +#if TEST_ALL + static void TestDirExists() { wxPuts(_T("*** Testing wxDir::Exists() ***")); @@ -439,13 +378,15 @@ static void TestDirExists() } } +#endif // TEST_ALL + #endif // TEST_DIR // ---------------------------------------------------------------------------- // wxDllLoader // ---------------------------------------------------------------------------- -#ifdef TEST_DLLLOADER +#ifdef TEST_DYNLIB #include "wx/dynlib.h" @@ -456,13 +397,13 @@ static void TestDllLoad() static const wxChar *FUNC_NAME = _T("lstrlenA"); #elif defined(__UNIX__) // weird: using just libc.so does *not* work! - static const wxChar *LIB_NAME = _T("/lib/libc-2.0.7.so"); + static const wxChar *LIB_NAME = _T("/lib/libc.so.6"); static const wxChar *FUNC_NAME = _T("strlen"); #else #error "don't know how to test wxDllLoader on this platform" #endif - wxPuts(_T("*** testing wxDllLoader ***\n")); + wxPuts(_T("*** testing basic wxDynamicLibrary functions ***\n")); wxDynamicLibrary lib(LIB_NAME); if ( !lib.IsLoaded() ) @@ -471,7 +412,7 @@ static void TestDllLoad() } else { - typedef int (*wxStrlenType)(const char *); + typedef int (wxSTDCALL *wxStrlenType)(const char *); wxStrlenType pfnStrlen = (wxStrlenType)lib.GetSymbol(FUNC_NAME); if ( !pfnStrlen ) { @@ -480,6 +421,9 @@ static void TestDllLoad() } else { + wxPrintf(_T("Calling %s dynamically loaded from %s "), + FUNC_NAME, LIB_NAME); + if ( pfnStrlen("foo") != 3 ) { wxPrintf(_T("ERROR: loaded function is not wxStrlen()!\n")); @@ -489,10 +433,58 @@ static void TestDllLoad() wxPuts(_T("... ok")); } } + +#ifdef __WXMSW__ + static const wxChar *FUNC_NAME_AW = _T("lstrlen"); + + typedef int (wxSTDCALL *wxStrlenTypeAorW)(const wxChar *); + wxStrlenTypeAorW + pfnStrlenAorW = (wxStrlenTypeAorW)lib.GetSymbolAorW(FUNC_NAME_AW); + if ( !pfnStrlenAorW ) + { + wxPrintf(_T("ERROR: function '%s' wasn't found in '%s'.\n"), + FUNC_NAME_AW, LIB_NAME); + } + else + { + if ( pfnStrlenAorW(_T("foobar")) != 6 ) + { + wxPrintf(_T("ERROR: loaded function is not wxStrlen()!\n")); + } + } +#endif // __WXMSW__ + } +} + +#if defined(__WXMSW__) || defined(__UNIX__) + +static void TestDllListLoaded() +{ + wxPuts(_T("*** testing wxDynamicLibrary::ListLoaded() ***\n")); + + puts("\nLoaded modules:"); + wxDynamicLibraryDetailsArray dlls = wxDynamicLibrary::ListLoaded(); + const size_t count = dlls.GetCount(); + for ( size_t n = 0; n < count; ++n ) + { + const wxDynamicLibraryDetails& details = dlls[n]; + printf("%-45s", (const char *)details.GetPath().mb_str()); + + void *addr; + size_t len; + if ( details.GetAddress(&addr, &len) ) + { + printf(" %08lx:%08lx", + (unsigned long)addr, (unsigned long)((char *)addr + len)); + } + + printf(" %s\n", (const char *)details.GetVersion().mb_str()); } } -#endif // TEST_DLLLOADER +#endif + +#endif // TEST_DYNLIB // ---------------------------------------------------------------------------- // wxGet/SetEnv @@ -544,11 +536,13 @@ static void TestExecute() wxPuts(_T("*** testing wxExecute ***")); #ifdef __UNIX__ - #define COMMAND "cat -n ../../Makefile" // "echo hi" + #define COMMAND "echo hi" + #define ASYNC_COMMAND "xclock" #define SHELL_COMMAND "echo hi from shell" - #define REDIRECT_COMMAND COMMAND // "date" + #define REDIRECT_COMMAND "cat -n Makefile" #elif defined(__WXMSW__) #define COMMAND "command.com /c echo hi" + #define ASYNC_COMMAND "notepad" #define SHELL_COMMAND "echo hi" #define REDIRECT_COMMAND COMMAND #else @@ -564,19 +558,22 @@ static void TestExecute() wxPrintf(_T("Testing wxExecute: ")); fflush(stdout); - if ( wxExecute(_T(COMMAND), true /* sync */) == 0 ) + if ( wxExecute(_T(COMMAND), wxEXEC_SYNC) == 0 ) wxPuts(_T("Ok.")); else wxPuts(_T("ERROR.")); -#if 0 // no, it doesn't work (yet?) wxPrintf(_T("Testing async wxExecute: ")); fflush(stdout); - if ( wxExecute(COMMAND) != 0 ) + int pid = wxExecute(ASYNC_COMMAND); + if ( pid != 0 ) + { wxPuts(_T("Ok (command launched).")); + if ( wxKill(pid) == -1 ) + wxPuts("ERROR: failed to kill child process."); + } else wxPuts(_T("ERROR.")); -#endif // 0 wxPrintf(_T("Testing wxExecute with redirection:\n")); wxArrayString output; @@ -586,10 +583,25 @@ static void TestExecute() } else { - size_t count = output.GetCount(); - for ( size_t n = 0; n < count; n++ ) + // don't show too much output, MAX_LINES is enough + static const unsigned MAX_LINES = 20; + + const unsigned count = output.size(); + for ( unsigned n = 0; + n < (count > MAX_LINES ? MAX_LINES/2 : count); + n++ ) { - wxPrintf(_T("\t%s\n"), output[n].c_str()); + wxPrintf("%04u:\t%s\n", n + 1, output[n]); + } + + if ( count > MAX_LINES ) + { + wxPrintf("... skipping %u lines...\n", count - MAX_LINES); + + for ( unsigned n = count - MAX_LINES/2; n < count; n++ ) + { + wxPrintf("%04u:\t%s\n", n + 1, output[n]); + } } wxPuts(_T("Ok.")); @@ -619,12 +631,12 @@ static void TestFileRead() wxPuts(_T("File dump:\n----------")); - static const off_t len = 1024; + static const size_t len = 1024; wxChar buf[len]; for ( ;; ) { - off_t nRead = file.Read(buf, len); - if ( nRead == wxInvalidOffset ) + size_t nRead = file.Read(buf, len); + if ( nRead == (size_t)wxInvalidOffset ) { wxPrintf(_T("Failed to read the file.")); break; @@ -731,6 +743,24 @@ static void TestFileCopy() wxPuts(wxEmptyString); } +static void TestTempFile() +{ + wxPuts(_T("*** wxTempFile test ***")); + + wxTempFile tmpFile; + if ( tmpFile.Open(_T("test2")) && tmpFile.Write(_T("the answer is 42")) ) + { + if ( tmpFile.Commit() ) + wxPuts(_T("File committed.")); + else + wxPuts(_T("ERROR: could't commit temp file.")); + + wxRemoveFile(_T("test2")); + } + + wxPuts(wxEmptyString); +} + #endif // TEST_FILE // ---------------------------------------------------------------------------- @@ -845,116 +875,6 @@ static void DumpFileName(const wxChar *desc, const wxFileName& fn) } #endif -static struct FileNameInfo -{ - const wxChar *fullname; - const wxChar *volume; - const wxChar *path; - const wxChar *name; - const wxChar *ext; - bool isAbsolute; - wxPathFormat format; -} filenames[] = -{ - // Unix file names - { _T("/usr/bin/ls"), _T(""), _T("/usr/bin"), _T("ls"), _T(""), true, wxPATH_UNIX }, - { _T("/usr/bin/"), _T(""), _T("/usr/bin"), _T(""), _T(""), true, wxPATH_UNIX }, - { _T("~/.zshrc"), _T(""), _T("~"), _T(".zshrc"), _T(""), true, wxPATH_UNIX }, - { _T("../../foo"), _T(""), _T("../.."), _T("foo"), _T(""), false, wxPATH_UNIX }, - { _T("foo.bar"), _T(""), _T(""), _T("foo"), _T("bar"), false, wxPATH_UNIX }, - { _T("~/foo.bar"), _T(""), _T("~"), _T("foo"), _T("bar"), true, wxPATH_UNIX }, - { _T("/foo"), _T(""), _T("/"), _T("foo"), _T(""), true, wxPATH_UNIX }, - { _T("Mahogany-0.60/foo.bar"), _T(""), _T("Mahogany-0.60"), _T("foo"), _T("bar"), false, wxPATH_UNIX }, - { _T("/tmp/wxwin.tar.bz"), _T(""), _T("/tmp"), _T("wxwin.tar"), _T("bz"), true, wxPATH_UNIX }, - - // Windows file names - { _T("foo.bar"), _T(""), _T(""), _T("foo"), _T("bar"), false, wxPATH_DOS }, - { _T("\\foo.bar"), _T(""), _T("\\"), _T("foo"), _T("bar"), false, wxPATH_DOS }, - { _T("c:foo.bar"), _T("c"), _T(""), _T("foo"), _T("bar"), false, wxPATH_DOS }, - { _T("c:\\foo.bar"), _T("c"), _T("\\"), _T("foo"), _T("bar"), true, wxPATH_DOS }, - { _T("c:\\Windows\\command.com"), _T("c"), _T("\\Windows"), _T("command"), _T("com"), true, wxPATH_DOS }, - { _T("\\\\server\\foo.bar"), _T("server"), _T("\\"), _T("foo"), _T("bar"), true, wxPATH_DOS }, - { _T("\\\\server\\dir\\foo.bar"), _T("server"), _T("\\dir"), _T("foo"), _T("bar"), true, wxPATH_DOS }, - - // wxFileName support for Mac file names is broken currently -#if 0 - // Mac file names - { _T("Volume:Dir:File"), _T("Volume"), _T("Dir"), _T("File"), _T(""), true, wxPATH_MAC }, - { _T("Volume:Dir:Subdir:File"), _T("Volume"), _T("Dir:Subdir"), _T("File"), _T(""), true, wxPATH_MAC }, - { _T("Volume:"), _T("Volume"), _T(""), _T(""), _T(""), true, wxPATH_MAC }, - { _T(":Dir:File"), _T(""), _T("Dir"), _T("File"), _T(""), false, wxPATH_MAC }, - { _T(":File.Ext"), _T(""), _T(""), _T("File"), _T(".Ext"), false, wxPATH_MAC }, - { _T("File.Ext"), _T(""), _T(""), _T("File"), _T(".Ext"), false, wxPATH_MAC }, -#endif // 0 - - // VMS file names - { _T("device:[dir1.dir2.dir3]file.txt"), _T("device"), _T("dir1.dir2.dir3"), _T("file"), _T("txt"), true, wxPATH_VMS }, - { _T("file.txt"), _T(""), _T(""), _T("file"), _T("txt"), false, wxPATH_VMS }, -}; - -static void TestFileNameConstruction() -{ - wxPuts(_T("*** testing wxFileName construction ***")); - - for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) - { - const FileNameInfo& fni = filenames[n]; - - wxFileName fn(fni.fullname, fni.format); - - wxString fullname = fn.GetFullPath(fni.format); - if ( fullname != fni.fullname ) - { - wxPrintf(_T("ERROR: fullname should be '%s'\n"), fni.fullname); - } - - bool isAbsolute = fn.IsAbsolute(fni.format); - wxPrintf(_T("'%s' is %s (%s)\n\t"), - fullname.c_str(), - isAbsolute ? "absolute" : "relative", - isAbsolute == fni.isAbsolute ? "ok" : "ERROR"); - - if ( !fn.Normalize(wxPATH_NORM_ALL, wxEmptyString, fni.format) ) - { - wxPuts(_T("ERROR (couldn't be normalized)")); - } - else - { - wxPrintf(_T("normalized: '%s'\n"), fn.GetFullPath(fni.format).c_str()); - } - } - - wxPuts(wxEmptyString); -} - -static void TestFileNameSplit() -{ - wxPuts(_T("*** testing wxFileName splitting ***")); - - for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) - { - const FileNameInfo& fni = filenames[n]; - wxString volume, path, name, ext; - wxFileName::SplitPath(fni.fullname, - &volume, &path, &name, &ext, fni.format); - - wxPrintf(_T("%s -> volume = '%s', path = '%s', name = '%s', ext = '%s'"), - fni.fullname, - volume.c_str(), path.c_str(), name.c_str(), ext.c_str()); - - if ( volume != fni.volume ) - wxPrintf(_T(" (ERROR: volume = '%s')"), fni.volume); - if ( path != fni.path ) - wxPrintf(_T(" (ERROR: path = '%s')"), fni.path); - if ( name != fni.name ) - wxPrintf(_T(" (ERROR: name = '%s')"), fni.name); - if ( ext != fni.ext ) - wxPrintf(_T(" (ERROR: ext = '%s')"), fni.ext); - - wxPuts(wxEmptyString); - } -} - static void TestFileNameTemp() { wxPuts(_T("*** testing wxFileName temp file creation ***")); @@ -993,70 +913,6 @@ static void TestFileNameTemp() } } -static void TestFileNameMakeRelative() -{ - wxPuts(_T("*** testing wxFileName::MakeRelativeTo() ***")); - - for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) - { - const FileNameInfo& fni = filenames[n]; - - wxFileName fn(fni.fullname, fni.format); - - // choose the base dir of the same format - wxString base; - switch ( fni.format ) - { - case wxPATH_UNIX: - base = _T("/usr/bin/"); - break; - - case wxPATH_DOS: - base = _T("c:\\"); - break; - - case wxPATH_MAC: - case wxPATH_VMS: - // TODO: I don't know how this is supposed to work there - continue; - - case wxPATH_NATIVE: // make gcc happy - default: - wxFAIL_MSG( _T("unexpected path format") ); - } - - wxPrintf(_T("'%s' relative to '%s': "), - fn.GetFullPath(fni.format).c_str(), base.c_str()); - - if ( !fn.MakeRelativeTo(base, fni.format) ) - { - wxPuts(_T("unchanged")); - } - else - { - wxPrintf(_T("'%s'\n"), fn.GetFullPath(fni.format).c_str()); - } - } -} - -static void TestFileNameMakeAbsolute() -{ - 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(), ... @@ -1085,8 +941,8 @@ static void TestFileNameCwd() #ifdef TEST_FILETIME -#include -#include +#include "wx/filename.h" +#include "wx/datetime.h" static void TestFileGetTimes() { @@ -1123,400 +979,20 @@ static void TestFileSetTimes() #endif // TEST_FILETIME // ---------------------------------------------------------------------------- -// wxHashMap +// wxLocale // ---------------------------------------------------------------------------- -#ifdef TEST_HASHMAP - -#include "wx/hashmap.h" - -// test compilation of basic map types -WX_DECLARE_HASH_MAP( int*, int*, wxPointerHash, wxPointerEqual, myPtrHashMap ); -WX_DECLARE_HASH_MAP( long, long, wxIntegerHash, wxIntegerEqual, myLongHashMap ); -WX_DECLARE_HASH_MAP( unsigned long, unsigned, wxIntegerHash, wxIntegerEqual, - myUnsignedHashMap ); -WX_DECLARE_HASH_MAP( unsigned int, unsigned, wxIntegerHash, wxIntegerEqual, - myTestHashMap1 ); -WX_DECLARE_HASH_MAP( int, unsigned, wxIntegerHash, wxIntegerEqual, - myTestHashMap2 ); -WX_DECLARE_HASH_MAP( short, unsigned, wxIntegerHash, wxIntegerEqual, - myTestHashMap3 ); -WX_DECLARE_HASH_MAP( unsigned short, unsigned, wxIntegerHash, wxIntegerEqual, - myTestHashMap4 ); +#ifdef TEST_LOCALE -// same as: -// WX_DECLARE_HASH_MAP( wxString, wxString, wxStringHash, wxStringEqual, -// myStringHashMap ); -WX_DECLARE_STRING_HASH_MAP(wxString, myStringHashMap); +#include "wx/intl.h" +#include "wx/utils.h" // for wxSetEnv -typedef myStringHashMap::iterator Itor; +static wxLocale gs_localeDefault(wxLANGUAGE_ENGLISH); -static void TestHashMap() +// find the name of the language from its value +static const wxChar *GetLangName(int lang) { - wxPuts(_T("*** Testing wxHashMap ***\n")); - myStringHashMap sh(0); // as small as possible - wxString buf; - size_t i; - const size_t count = 10000; - - // init with some data - for( i = 0; i < count; ++i ) - { - buf.Printf(wxT("%d"), i ); - sh[buf] = wxT("A") + buf + wxT("C"); - } - - // test that insertion worked - if( sh.size() != count ) - { - wxPrintf(_T("*** ERROR: %u ELEMENTS, SHOULD BE %u ***\n"), sh.size(), count); - } - - for( i = 0; i < count; ++i ) - { - buf.Printf(wxT("%d"), i ); - if( sh[buf] != wxT("A") + buf + wxT("C") ) - { - wxPrintf(_T("*** ERROR INSERTION BROKEN! STOPPING NOW! ***\n")); - return; - } - } - - // check that iterators work - Itor it; - for( i = 0, it = sh.begin(); it != sh.end(); ++it, ++i ) - { - if( i == count ) - { - wxPrintf(_T("*** ERROR ITERATORS DO NOT TERMINATE! STOPPING NOW! ***\n")); - return; - } - - if( it->second != sh[it->first] ) - { - wxPrintf(_T("*** ERROR ITERATORS BROKEN! STOPPING NOW! ***\n")); - return; - } - } - - if( sh.size() != i ) - { - wxPrintf(_T("*** ERROR: %u ELEMENTS ITERATED, SHOULD BE %u ***\n"), i, count); - } - - // test copy ctor, assignment operator - myStringHashMap h1( sh ), h2( 0 ); - h2 = sh; - - for( i = 0, it = sh.begin(); it != sh.end(); ++it, ++i ) - { - if( h1[it->first] != it->second ) - { - wxPrintf(_T("*** ERROR: COPY CTOR BROKEN %s ***\n"), it->first.c_str()); - } - - if( h2[it->first] != it->second ) - { - wxPrintf(_T("*** ERROR: OPERATOR= BROKEN %s ***\n"), it->first.c_str()); - } - } - - // other tests - for( i = 0; i < count; ++i ) - { - buf.Printf(wxT("%d"), i ); - size_t sz = sh.size(); - - // test find() and erase(it) - if( i < 100 ) - { - it = sh.find( buf ); - if( it != sh.end() ) - { - sh.erase( it ); - - if( sh.find( buf ) != sh.end() ) - { - wxPrintf(_T("*** ERROR: FOUND DELETED ELEMENT %u ***\n"), i); - } - } - else - wxPrintf(_T("*** ERROR: CANT FIND ELEMENT %u ***\n"), i); - } - else - // test erase(key) - { - size_t c = sh.erase( buf ); - if( c != 1 ) - wxPrintf(_T("*** ERROR: SHOULD RETURN 1 ***\n")); - - if( sh.find( buf ) != sh.end() ) - { - wxPrintf(_T("*** ERROR: FOUND DELETED ELEMENT %u ***\n"), i); - } - } - - // count should decrease - if( sh.size() != sz - 1 ) - { - wxPrintf(_T("*** ERROR: COUNT DID NOT DECREASE ***\n")); - } - } - - wxPrintf(_T("*** Finished testing wxHashMap ***\n")); -} - -#endif // TEST_HASHMAP - -// ---------------------------------------------------------------------------- -// 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 -// ---------------------------------------------------------------------------- - -#ifdef TEST_LIST - -#include "wx/list.h" - -WX_DECLARE_LIST(Bar, wxListBars); -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxListBars); - -WX_DECLARE_LIST(int, wxListInt); -WX_DEFINE_LIST(wxListInt); - -static void TestList() -{ - wxPuts(_T("*** Testing wxList operations ***\n")); - { - wxListInt list1; - int dummy[5]; - int i; - - for ( i = 0; i < 5; ++i ) - list1.Append(dummy + i); - - if ( list1.GetCount() != 5 ) - wxPuts(_T("Wrong number of items in list\n")); - - if ( list1.Item(3)->GetData() != dummy + 3 ) - wxPuts(_T("Error in Item()\n")); - - if ( !list1.Find(dummy + 4) ) - wxPuts(_T("Error in Find()\n")); - - wxListInt::compatibility_iterator node = list1.GetFirst(); - i = 0; - - while (node) - { - if ( node->GetData() != dummy + i ) - wxPuts(_T("Error in compatibility_iterator\n")); - node = node->GetNext(); - ++i; - } - - if ( size_t(i) != list1.GetCount() ) - wxPuts(_T("Error in compatibility_iterator\n")); - - list1.Insert(dummy + 0); - list1.Insert(1, dummy + 1); - list1.Insert(list1.GetFirst()->GetNext()->GetNext(), dummy + 2); - - node = list1.GetFirst(); - i = 0; - - while (i < 3) - { - int* t = node->GetData(); - if ( t != dummy + i ) - wxPuts(_T("Error in Insert\n")); - node = node->GetNext(); - ++i; - } - } - - wxPuts(_T("*** Testing wxList operations finished ***\n")); - - wxPuts(_T("*** Testing std::list operations ***\n")); - - { - wxListInt list1; - wxListInt::iterator it, en; - wxListInt::reverse_iterator rit, ren; - int i; - for ( i = 0; i < 5; ++i ) - list1.push_back(i + &i); - - for ( it = list1.begin(), en = list1.end(), i = 0; - it != en; ++it, ++i ) - if ( *it != i + &i ) - wxPuts(_T("Error in iterator\n")); - - for ( rit = list1.rbegin(), ren = list1.rend(), i = 4; - rit != ren; ++rit, --i ) - if ( *rit != i + &i ) - wxPuts(_T("Error in reverse_iterator\n")); - - if ( *list1.rbegin() != *--list1.end() || - *list1.begin() != *--list1.rend() ) - wxPuts(_T("Error in iterator/reverse_iterator\n")); - if ( *list1.begin() != *--++list1.begin() || - *list1.rbegin() != *--++list1.rbegin() ) - wxPuts(_T("Error in iterator/reverse_iterator\n")); - - if ( list1.front() != &i || list1.back() != &i + 4 ) - wxPuts(_T("Error in front()/back()\n")); - - list1.erase(list1.begin()); - list1.erase(--list1.end()); - - for ( it = list1.begin(), en = list1.end(), i = 1; - it != en; ++it, ++i ) - if ( *it != i + &i ) - wxPuts(_T("Error in erase()\n")); - } - - wxPuts(_T("*** Testing std::list operations finished ***\n")); -} - -static void TestListCtor() -{ - wxPuts(_T("*** Testing wxList construction ***\n")); - - { - wxListBars list1; - list1.Append(new Bar(_T("first"))); - list1.Append(new Bar(_T("second"))); - - wxPrintf(_T("After 1st list creation: %u objects in the list, %u objects total.\n"), - list1.GetCount(), Bar::GetNumber()); - - wxListBars list2; - list2 = list1; - - wxPrintf(_T("After 2nd list creation: %u and %u objects in the lists, %u objects total.\n"), - list1.GetCount(), list2.GetCount(), Bar::GetNumber()); - -#if !wxUSE_STL - list1.DeleteContents(true); -#else - WX_CLEAR_LIST(wxListBars, list1); -#endif - } - - wxPrintf(_T("After list destruction: %u objects left.\n"), Bar::GetNumber()); -} - -#endif // TEST_LIST - -// ---------------------------------------------------------------------------- -// wxLocale -// ---------------------------------------------------------------------------- - -#ifdef TEST_LOCALE - -#include "wx/intl.h" -#include "wx/utils.h" // for wxSetEnv - -static wxLocale gs_localeDefault(wxLANGUAGE_ENGLISH); - -// find the name of the language from its value -static const wxChar *GetLangName(int lang) -{ - static const wxChar *languageNames[] = + static const wxChar *languageNames[] = { _T("DEFAULT"), _T("UNKNOWN"), @@ -1849,32 +1325,6 @@ static void TestMimeEnum() wxPuts(wxEmptyString); } -static void TestMimeOverride() -{ - wxPuts(_T("*** Testing wxMimeTypesManager additional files loading ***\n")); - - static const wxChar *mailcap = _T("/tmp/mailcap"); - static const wxChar *mimetypes = _T("/tmp/mime.types"); - - if ( wxFile::Exists(mailcap) ) - wxPrintf(_T("Loading mailcap from '%s': %s\n"), - mailcap, - wxTheMimeTypesManager->ReadMailcap(mailcap) ? _T("ok") : _T("ERROR")); - else - wxPrintf(_T("WARN: mailcap file '%s' doesn't exist, not loaded.\n"), - mailcap); - - if ( wxFile::Exists(mimetypes) ) - wxPrintf(_T("Loading mime.types from '%s': %s\n"), - mimetypes, - wxTheMimeTypesManager->ReadMimeTypes(mimetypes) ? _T("ok") : _T("ERROR")); - else - wxPrintf(_T("WARN: mime.types file '%s' doesn't exist, not loaded.\n"), - mimetypes); - - wxPuts(wxEmptyString); -} - static void TestMimeFilename() { wxPuts(_T("*** Testing MIME type from filename query ***\n")); @@ -1919,6 +1369,35 @@ static void TestMimeFilename() wxPuts(wxEmptyString); } +// these tests were broken by wxMimeTypesManager changes, temporarily disabling +#if 0 + +static void TestMimeOverride() +{ + wxPuts(_T("*** Testing wxMimeTypesManager additional files loading ***\n")); + + static const wxChar *mailcap = _T("/tmp/mailcap"); + static const wxChar *mimetypes = _T("/tmp/mime.types"); + + if ( wxFile::Exists(mailcap) ) + wxPrintf(_T("Loading mailcap from '%s': %s\n"), + mailcap, + wxTheMimeTypesManager->ReadMailcap(mailcap) ? _T("ok") : _T("ERROR")); + else + wxPrintf(_T("WARN: mailcap file '%s' doesn't exist, not loaded.\n"), + mailcap); + + if ( wxFile::Exists(mimetypes) ) + wxPrintf(_T("Loading mime.types from '%s': %s\n"), + mimetypes, + wxTheMimeTypesManager->ReadMimeTypes(mimetypes) ? _T("ok") : _T("ERROR")); + else + wxPrintf(_T("WARN: mime.types file '%s' doesn't exist, not loaded.\n"), + mimetypes); + + wxPuts(wxEmptyString); +} + static void TestMimeAssociate() { wxPuts(_T("*** Testing creation of filetype association ***\n")); @@ -1929,7 +1408,7 @@ static void TestMimeAssociate() _T(""), // print cmd _T("XYZ File"), // description _T(".xyz"), // extensions - NULL // end of extensions + wxNullPtr // end of extensions ); ftInfo.SetShortDesc(_T("XYZFile")); // used under Win32 only @@ -1947,8 +1426,84 @@ static void TestMimeAssociate() wxPuts(wxEmptyString); } +#endif // 0 + #endif // TEST_MIME +// ---------------------------------------------------------------------------- +// module dependencies feature +// ---------------------------------------------------------------------------- + +#ifdef TEST_MODULE + +#include "wx/module.h" + +class wxTestModule : public wxModule +{ +protected: + virtual bool OnInit() { wxPrintf(_T("Load module: %s\n"), GetClassInfo()->GetClassName()); return true; } + virtual void OnExit() { wxPrintf(_T("Unload module: %s\n"), GetClassInfo()->GetClassName()); } +}; + +class wxTestModuleA : public wxTestModule +{ +public: + wxTestModuleA(); +private: + DECLARE_DYNAMIC_CLASS(wxTestModuleA) +}; + +class wxTestModuleB : public wxTestModule +{ +public: + wxTestModuleB(); +private: + DECLARE_DYNAMIC_CLASS(wxTestModuleB) +}; + +class wxTestModuleC : public wxTestModule +{ +public: + wxTestModuleC(); +private: + DECLARE_DYNAMIC_CLASS(wxTestModuleC) +}; + +class wxTestModuleD : public wxTestModule +{ +public: + wxTestModuleD(); +private: + DECLARE_DYNAMIC_CLASS(wxTestModuleD) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxTestModuleC, wxModule) +wxTestModuleC::wxTestModuleC() +{ + AddDependency(CLASSINFO(wxTestModuleD)); +} + +IMPLEMENT_DYNAMIC_CLASS(wxTestModuleA, wxModule) +wxTestModuleA::wxTestModuleA() +{ + AddDependency(CLASSINFO(wxTestModuleB)); + AddDependency(CLASSINFO(wxTestModuleD)); +} + +IMPLEMENT_DYNAMIC_CLASS(wxTestModuleD, wxModule) +wxTestModuleD::wxTestModuleD() +{ +} + +IMPLEMENT_DYNAMIC_CLASS(wxTestModuleB, wxModule) +wxTestModuleB::wxTestModuleB() +{ + AddDependency(CLASSINFO(wxTestModuleD)); + AddDependency(CLASSINFO(wxTestModuleC)); +} + +#endif // TEST_MODULE + // ---------------------------------------------------------------------------- // misc information functions // ---------------------------------------------------------------------------- @@ -1957,6 +1512,7 @@ static void TestMimeAssociate() #include "wx/utils.h" +#if TEST_INTERACTIVE static void TestDiskInfo() { wxPuts(_T("*** Testing wxGetDiskSpace() ***")); @@ -1985,6 +1541,7 @@ static void TestDiskInfo() } } } +#endif // TEST_INTERACTIVE static void TestOsInfo() { @@ -1995,7 +1552,7 @@ static void TestOsInfo() wxPrintf(_T("Running under: %s, version %d.%d\n"), wxGetOsDescription().c_str(), major, minor); - wxPrintf(_T("%ld free bytes of memory left.\n"), wxGetFreeMemory()); + wxPrintf(_T("%ld free bytes of memory left.\n"), wxGetFreeMemory().ToLong()); wxPrintf(_T("Host name is %s (%s).\n"), wxGetHostName().c_str(), wxGetFullHostName().c_str()); @@ -2003,6 +1560,23 @@ static void TestOsInfo() wxPuts(wxEmptyString); } +static void TestPlatformInfo() +{ + wxPuts(_T("*** Testing wxPlatformInfo functions ***\n")); + + // get this platform + wxPlatformInfo plat; + + wxPrintf(_T("Operating system family name is: %s\n"), plat.GetOperatingSystemFamilyName().c_str()); + wxPrintf(_T("Operating system name is: %s\n"), plat.GetOperatingSystemIdName().c_str()); + wxPrintf(_T("Port ID name is: %s\n"), plat.GetPortIdName().c_str()); + wxPrintf(_T("Port ID short name is: %s\n"), plat.GetPortIdShortName().c_str()); + wxPrintf(_T("Architecture is: %s\n"), plat.GetArchName().c_str()); + wxPrintf(_T("Endianness is: %s\n"), plat.GetEndiannessName().c_str()); + + wxPuts(wxEmptyString); +} + static void TestUserInfo() { wxPuts(_T("*** Testing user info functions ***\n")); @@ -2112,26 +1686,6 @@ static void TestRegExInteractive() #endif // TEST_REGEX -// ---------------------------------------------------------------------------- -// database -// ---------------------------------------------------------------------------- - -#if !wxUSE_ODBC - #undef TEST_ODBC -#endif - -#ifdef TEST_ODBC - -#include - -static void TestDbOpen() -{ - HENV henv; - wxDb db(henv); -} - -#endif // TEST_ODBC - // ---------------------------------------------------------------------------- // printf() tests // ---------------------------------------------------------------------------- @@ -2534,7 +2088,7 @@ static void TestRegConfWrite() static void TestRegConfRead() { - wxConfig *config = new wxConfig(_T("myapp")); + wxRegConfig *config = new wxRegConfig(_T("myapp")); wxString str; long dummy; @@ -2681,9 +2235,9 @@ static void TestScopeGuard() 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'); + 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(); @@ -2891,7 +2445,8 @@ static bool TestFtpConnect() else { wxPrintf(_T("--- Connected to %s, current directory is '%s'\n"), - hostname, ftp.Pwd().c_str()); + hostname, ftp.Pwd().c_str()); + ftp.Close(); } return true; @@ -3161,6 +2716,115 @@ static void TestFtpUpload() #endif // TEST_FTP +// ---------------------------------------------------------------------------- +// stack backtrace +// ---------------------------------------------------------------------------- + +#ifdef TEST_STACKWALKER + +#if wxUSE_STACKWALKER + +#include "wx/stackwalk.h" + +class StackDump : public wxStackWalker +{ +public: + StackDump(const char *argv0) + : wxStackWalker(argv0) + { + } + + virtual void Walk(size_t skip = 1) + { + wxPuts(_T("Stack dump:")); + + wxStackWalker::Walk(skip); + } + +protected: + virtual void OnStackFrame(const wxStackFrame& frame) + { + printf("[%2d] ", (int) frame.GetLevel()); + + wxString name = frame.GetName(); + if ( !name.empty() ) + { + printf("%-20.40s", (const char*)name.mb_str()); + } + else + { + printf("0x%08lx", (unsigned long)frame.GetAddress()); + } + + if ( frame.HasSourceLocation() ) + { + printf("\t%s:%d", + (const char*)frame.GetFileName().mb_str(), + (int)frame.GetLine()); + } + + puts(""); + + wxString type, val; + for ( size_t n = 0; frame.GetParam(n, &type, &name, &val); n++ ) + { + printf("\t%s %s = %s\n", (const char*)type.mb_str(), + (const char*)name.mb_str(), + (const char*)val.mb_str()); + } + } +}; + +static void TestStackWalk(const char *argv0) +{ + wxPuts(_T("*** Testing wxStackWalker ***\n")); + + StackDump dump(argv0); + dump.Walk(); +} + +#endif // wxUSE_STACKWALKER + +#endif // TEST_STACKWALKER + +// ---------------------------------------------------------------------------- +// standard paths +// ---------------------------------------------------------------------------- + +#ifdef TEST_STDPATHS + +#include "wx/stdpaths.h" +#include "wx/wxchar.h" // wxPrintf + +static void TestStandardPaths() +{ + wxPuts(_T("*** Testing wxStandardPaths ***\n")); + + wxTheApp->SetAppName(_T("console")); + + wxStandardPathsBase& stdp = wxStandardPaths::Get(); + wxPrintf(_T("Config dir (sys):\t%s\n"), stdp.GetConfigDir().c_str()); + wxPrintf(_T("Config dir (user):\t%s\n"), stdp.GetUserConfigDir().c_str()); + wxPrintf(_T("Data dir (sys):\t\t%s\n"), stdp.GetDataDir().c_str()); + wxPrintf(_T("Data dir (sys local):\t%s\n"), stdp.GetLocalDataDir().c_str()); + wxPrintf(_T("Data dir (user):\t%s\n"), stdp.GetUserDataDir().c_str()); + wxPrintf(_T("Data dir (user local):\t%s\n"), stdp.GetUserLocalDataDir().c_str()); + wxPrintf(_T("Documents dir:\t\t%s\n"), stdp.GetDocumentsDir().c_str()); + wxPrintf(_T("Executable path:\t%s\n"), stdp.GetExecutablePath().c_str()); + wxPrintf(_T("Plugins dir:\t\t%s\n"), stdp.GetPluginsDir().c_str()); + wxPrintf(_T("Resources dir:\t\t%s\n"), stdp.GetResourcesDir().c_str()); + wxPrintf(_T("Localized res. dir:\t%s\n"), + stdp.GetLocalizedResourcesDir(_T("fr")).c_str()); + wxPrintf(_T("Message catalogs dir:\t%s\n"), + stdp.GetLocalizedResourcesDir + ( + _T("fr"), + wxStandardPaths::ResourceCat_Messages + ).c_str()); +} + +#endif // TEST_STDPATHS + // ---------------------------------------------------------------------------- // streams // ---------------------------------------------------------------------------- @@ -3180,11 +2844,13 @@ static void TestFileStream() fsOut.Write("foo", 3); } - wxFileInputStream fsIn(filename); - wxPrintf(_T("File stream size: %u\n"), fsIn.GetSize()); - while ( !fsIn.Eof() ) { - wxPutchar(fsIn.GetC()); + wxFileInputStream fsIn(filename); + wxPrintf(_T("File stream size: %u\n"), fsIn.GetSize()); + while ( !fsIn.Eof() ) + { + wxPutchar(fsIn.GetC()); + } } if ( !wxRemoveFile(filename) ) @@ -3234,7 +2900,7 @@ static void TestMemoryStream() #ifdef TEST_TIMER -#include "wx/timer.h" +#include "wx/stopwatch.h" #include "wx/utils.h" static void TestStopWatch() @@ -3287,6 +2953,52 @@ static void TestStopWatch() wxPuts(_T(", ok.")); } +#include "wx/timer.h" +#include "wx/evtloop.h" + +void TestTimer() +{ + wxPuts(_T("*** Testing wxTimer ***\n")); + + class MyTimer : public wxTimer + { + public: + MyTimer() : wxTimer() { m_num = 0; } + + virtual void Notify() + { + wxPrintf(_T("%d"), m_num++); + fflush(stdout); + + if ( m_num == 10 ) + { + wxPrintf(_T("... exiting the event loop")); + Stop(); + + wxEventLoop::GetActive()->Exit(0); + wxPuts(_T(", ok.")); + } + + fflush(stdout); + } + + private: + int m_num; + }; + + wxEventLoop loop; + + wxTimer timer1; + timer1.Start(100, true /* one shot */); + timer1.Stop(); + timer1.Start(100, true /* one shot */); + + MyTimer timer; + timer.Start(500); + + loop.Run(); +} + #endif // TEST_TIMER // ---------------------------------------------------------------------------- @@ -3495,7 +3207,7 @@ static void TestVCardRead() wxPrintf(_T("Full name from wxVCard API: %s\n"), value.c_str()); - // now show how to deal with multiply occuring properties + // now show how to deal with multiply occurring properties DumpVCardAddresses(vcard); DumpVCardPhoneNumbers(vcard); @@ -3723,7 +3435,11 @@ static void TestZipStreamRead() wxPuts(_T("*** Testing ZIP reading ***\n")); static const wxString filename = _T("foo"); - wxZipInputStream istr(TESTFILE_ZIP, filename); + wxFFileInputStream in(TESTFILE_ZIP); + wxZipInputStream istr(in); + wxZipEntry entry(filename); + istr.OpenEntry(entry); + wxPrintf(_T("Archive size: %u\n"), istr.GetSize()); wxPrintf(_T("Dumping the file '%s':\n"), filename.c_str()); @@ -3747,850 +3463,145 @@ static void DumpZipDirectory(wxFileSystem& fs, wxString dirname = fs.FindFirst(wildcard, wxDIR); while ( !dirname.empty() ) { - if ( !dirname.StartsWith(prefix + _T('/'), &dirname) ) - { - wxPrintf(_T("ERROR: unexpected wxFileSystem::FindNext result\n")); - - break; - } - - wxPrintf(_T("%s%s\n"), indent.c_str(), dirname.c_str()); - - DumpZipDirectory(fs, dirname, - indent + wxString(_T(' '), 4)); - - dirname = fs.FindNext(); - } - - wxString filename = fs.FindFirst(wildcard, wxFILE); - while ( !filename.empty() ) - { - if ( !filename.StartsWith(prefix, &filename) ) - { - wxPrintf(_T("ERROR: unexpected wxFileSystem::FindNext result\n")); - - break; - } - - wxPrintf(_T("%s%s\n"), indent.c_str(), filename.c_str()); - - filename = fs.FindNext(); - } -} - -static void TestZipFileSystem() -{ - wxPuts(_T("*** Testing ZIP file system ***\n")); - - wxFileSystem::AddHandler(new wxZipFSHandler); - wxFileSystem fs; - wxPrintf(_T("Dumping all files in the archive %s:\n"), TESTFILE_ZIP); - - DumpZipDirectory(fs, _T(""), wxString(_T(' '), 4)); -} - -#endif // TEST_ZIP - -// ---------------------------------------------------------------------------- -// date time -// ---------------------------------------------------------------------------- - -#ifdef TEST_DATETIME - -#include - -#include "wx/datetime.h" - -// the test data -struct Date -{ - wxDateTime::wxDateTime_t day; - wxDateTime::Month month; - int year; - wxDateTime::wxDateTime_t hour, min, sec; - double jdn; - wxDateTime::WeekDay wday; - time_t gmticks, ticks; - - void Init(const wxDateTime::Tm& tm) - { - day = tm.mday; - month = tm.mon; - year = tm.year; - hour = tm.hour; - min = tm.min; - sec = tm.sec; - jdn = 0.0; - gmticks = ticks = -1; - } - - wxDateTime DT() const - { return wxDateTime(day, month, year, hour, min, sec); } - - bool SameDay(const wxDateTime::Tm& tm) const - { - return day == tm.mday && month == tm.mon && year == tm.year; - } - - wxString Format() const - { - wxString s; - s.Printf(_T("%02d:%02d:%02d %10s %02d, %4d%s"), - hour, min, sec, - wxDateTime::GetMonthName(month).c_str(), - day, - abs(wxDateTime::ConvertYearToBC(year)), - year > 0 ? _T("AD") : _T("BC")); - return s; - } - - wxString FormatDate() const - { - wxString s; - s.Printf(_T("%02d-%s-%4d%s"), - day, - wxDateTime::GetMonthName(month, wxDateTime::Name_Abbr).c_str(), - abs(wxDateTime::ConvertYearToBC(year)), - year > 0 ? _T("AD") : _T("BC")); - return s; - } -}; - -static const Date testDates[] = -{ - { 1, wxDateTime::Jan, 1970, 00, 00, 00, 2440587.5, wxDateTime::Thu, 0, -3600 }, - { 7, wxDateTime::Feb, 2036, 00, 00, 00, 2464730.5, wxDateTime::Thu, -1, -1 }, - { 8, wxDateTime::Feb, 2036, 00, 00, 00, 2464731.5, wxDateTime::Fri, -1, -1 }, - { 1, wxDateTime::Jan, 2037, 00, 00, 00, 2465059.5, wxDateTime::Thu, -1, -1 }, - { 1, wxDateTime::Jan, 2038, 00, 00, 00, 2465424.5, wxDateTime::Fri, -1, -1 }, - { 21, wxDateTime::Jan, 2222, 00, 00, 00, 2532648.5, wxDateTime::Mon, -1, -1 }, - { 29, wxDateTime::May, 1976, 12, 00, 00, 2442928.0, wxDateTime::Sat, 202219200, 202212000 }, - { 29, wxDateTime::Feb, 1976, 00, 00, 00, 2442837.5, wxDateTime::Sun, 194400000, 194396400 }, - { 1, wxDateTime::Jan, 1900, 12, 00, 00, 2415021.0, wxDateTime::Mon, -1, -1 }, - { 1, wxDateTime::Jan, 1900, 00, 00, 00, 2415020.5, wxDateTime::Mon, -1, -1 }, - { 15, wxDateTime::Oct, 1582, 00, 00, 00, 2299160.5, wxDateTime::Fri, -1, -1 }, - { 4, wxDateTime::Oct, 1582, 00, 00, 00, 2299149.5, wxDateTime::Mon, -1, -1 }, - { 1, wxDateTime::Mar, 1, 00, 00, 00, 1721484.5, wxDateTime::Thu, -1, -1 }, - { 1, wxDateTime::Jan, 1, 00, 00, 00, 1721425.5, wxDateTime::Mon, -1, -1 }, - { 31, wxDateTime::Dec, 0, 00, 00, 00, 1721424.5, wxDateTime::Sun, -1, -1 }, - { 1, wxDateTime::Jan, 0, 00, 00, 00, 1721059.5, wxDateTime::Sat, -1, -1 }, - { 12, wxDateTime::Aug, -1234, 00, 00, 00, 1270573.5, wxDateTime::Fri, -1, -1 }, - { 12, wxDateTime::Aug, -4000, 00, 00, 00, 260313.5, wxDateTime::Sat, -1, -1 }, - { 24, wxDateTime::Nov, -4713, 00, 00, 00, -0.5, wxDateTime::Mon, -1, -1 }, -}; - -// this test miscellaneous static wxDateTime functions -static void TestTimeStatic() -{ - wxPuts(_T("\n*** wxDateTime static methods test ***")); - - // some info about the current date - int year = wxDateTime::GetCurrentYear(); - 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(); - 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); - - wxPrintf(_T("Year %d is %sa leap year (%s)\n"), - year, - is ? "" : "not ", - should == is ? "ok" : "ERROR"); - - wxASSERT( should == wxDateTime::IsLeapYear(year) ); - } -} - -// test constructing wxDateTime objects -static void TestTimeSet() -{ - wxPuts(_T("\n*** wxDateTime construction test ***")); - - for ( size_t n = 0; n < WXSIZEOF(testDates); n++ ) - { - const Date& d1 = testDates[n]; - wxDateTime dt = d1.DT(); - - Date d2; - d2.Init(dt.GetTm()); - - wxString s1 = d1.Format(), - s2 = d2.Format(); - - wxPrintf(_T("Date: %s == %s (%s)\n"), - s1.c_str(), s2.c_str(), - s1 == s2 ? _T("ok") : _T("ERROR")); - } -} - -// test time zones stuff -static void TestTimeZones() -{ - wxPuts(_T("\n*** wxDateTime timezone test ***")); - - wxDateTime now = wxDateTime::Now(); - - 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()); - - wxDateTime::Tm tm = now.GetTm(); - if ( wxDateTime(tm) != now ) - { - 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() -{ - wxPuts(_T("\n*** wxDateTime out-of-standard-range dates test ***")); - - static const wxChar *fmt = _T("%d-%b-%Y %H:%M:%S"); - - 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()); -} - -static void TestTimeTicks() -{ - wxPuts(_T("\n*** wxDateTime ticks test ***")); - - for ( size_t n = 0; n < WXSIZEOF(testDates); n++ ) - { - const Date& d = testDates[n]; - if ( d.ticks == -1 ) - continue; - - wxDateTime dt = d.DT(); - long ticks = (dt.GetValue() / 1000).ToLong(); - wxPrintf(_T("Ticks of %s:\t% 10ld"), d.Format().c_str(), ticks); - if ( ticks == d.ticks ) - { - wxPuts(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %ld, delta = %ld)\n"), - (long)d.ticks, (long)(ticks - d.ticks)); - } - - dt = d.DT().ToTimezone(wxDateTime::GMT0); - ticks = (dt.GetValue() / 1000).ToLong(); - wxPrintf(_T("GMtks of %s:\t% 10ld"), d.Format().c_str(), ticks); - if ( ticks == d.gmticks ) - { - wxPuts(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %ld, delta = %ld)\n"), - (long)d.gmticks, (long)(ticks - d.gmticks)); - } - } - - wxPuts(wxEmptyString); -} - -// test conversions to JDN &c -static void TestTimeJDN() -{ - wxPuts(_T("\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(); - - wxPrintf(_T("JDN of %s is:\t% 15.6f"), d.Format().c_str(), jdn); - if ( jdn == d.jdn ) - { - wxPuts(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %f, delta = %f)\n"), - d.jdn, jdn - d.jdn); - } - } -} - -// test week days computation -static void TestTimeWDays() -{ - wxPuts(_T("\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(); - wxPrintf(_T("%s is: %s"), - d.Format().c_str(), - wxDateTime::GetWeekDayName(wday).c_str()); - if ( wday == d.wday ) - { - wxPuts(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %s)\n"), - wxDateTime::GetWeekDayName(d.wday).c_str()); - } - } - - wxPuts(wxEmptyString); - - // 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 - - wxString Format() const - { - wxString s, which; - switch ( nWeek < -1 ? -nWeek : nWeek ) - { - case 1: which = _T("first"); break; - case 2: which = _T("second"); break; - case 3: which = _T("third"); break; - case 4: which = _T("fourth"); break; - case 5: which = _T("fifth"); break; - - case -1: which = _T("last"); break; - } - - if ( nWeek < -1 ) - { - which += _T(" from end"); - } - - s.Printf(_T("The %s %s of %s in %d"), - which.c_str(), - wxDateTime::GetWeekDayName(wday).c_str(), - wxDateTime::GetMonthName(month).c_str(), - year); - - return s; - } - }; - - // the array data was generated by the following python program - /* -from DateTime import * -from whrandom import * -from string import * - -monthNames = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ] -wdayNames = [ 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun' ] - -week = DateTimeDelta(7) - -for n in range(20): - year = randint(1900, 2100) - month = randint(1, 12) - day = randint(1, 28) - dt = DateTime(year, month, day) - wday = dt.day_of_week - - countFromEnd = choice([-1, 1]) - weekNum = 0; - - while dt.month is month: - dt = dt - countFromEnd * week - weekNum = weekNum + countFromEnd - - data = { 'day': rjust(`day`, 2), 'month': monthNames[month - 1], 'year': year, 'weekNum': rjust(`weekNum`, 2), 'wday': wdayNames[wday] } - - print "{ { %(day)s, wxDateTime::%(month)s, %(year)d }, %(weekNum)d, "\ - "wxDateTime::%(wday)s, wxDateTime::%(month)s, %(year)d }," % data - */ - - 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 wxChar *fmt = _T("%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); - - wxPrintf(_T("%s is %s"), wd.Format().c_str(), dt.Format(fmt).c_str()); - - const Date& d = wd.date; - if ( d.SameDay(dt.GetTm()) ) - { - wxPuts(_T(" (ok)")); - } - else - { - dt.Set(d.day, d.month, d.year); - - wxPrintf(_T(" (ERROR: should be %s)\n"), dt.Format(fmt).c_str()); - } - } -} - -// test the computation of (ISO) week numbers -static void TestTimeWNumber() -{ - wxPuts(_T("\n*** wxDateTime week number test ***")); - - struct WeekNumberTestData - { - Date date; // the date - wxDateTime::wxDateTime_t week; // the week number in the year - wxDateTime::wxDateTime_t wmon; // the week number in the month - wxDateTime::wxDateTime_t wmon2; // same but week starts with Sun - wxDateTime::wxDateTime_t dnum; // day number in the year - }; - - // data generated with the following python script: - /* -from DateTime import * -from whrandom import * -from string import * - -monthNames = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ] -wdayNames = [ 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun' ] - -def GetMonthWeek(dt): - weekNumMonth = dt.iso_week[1] - DateTime(dt.year, dt.month, 1).iso_week[1] + 1 - if weekNumMonth < 0: - weekNumMonth = weekNumMonth + 53 - return weekNumMonth - -def GetLastSundayBefore(dt): - if dt.iso_week[2] == 7: - return dt - else: - return dt - DateTimeDelta(dt.iso_week[2]) - -for n in range(20): - year = randint(1900, 2100) - month = randint(1, 12) - day = randint(1, 28) - dt = DateTime(year, month, day) - dayNum = dt.day_of_year - weekNum = dt.iso_week[1] - weekNumMonth = GetMonthWeek(dt) - - weekNumMonth2 = 0 - dtSunday = GetLastSundayBefore(dt) - - while dtSunday >= GetLastSundayBefore(DateTime(dt.year, dt.month, 1)): - weekNumMonth2 = weekNumMonth2 + 1 - dtSunday = dtSunday - DateTimeDelta(7) - - data = { 'day': rjust(`day`, 2), \ - 'month': monthNames[month - 1], \ - 'year': year, \ - 'weekNum': rjust(`weekNum`, 2), \ - 'weekNumMonth': weekNumMonth, \ - 'weekNumMonth2': weekNumMonth2, \ - 'dayNum': rjust(`dayNum`, 3) } - - print " { { %(day)s, "\ - "wxDateTime::%(month)s, "\ - "%(year)d }, "\ - "%(weekNum)s, "\ - "%(weekNumMonth)s, "\ - "%(weekNumMonth2)s, "\ - "%(dayNum)s }," % data - - */ - static const WeekNumberTestData weekNumberTestDates[] = - { - { { 27, wxDateTime::Dec, 1966 }, 52, 5, 5, 361 }, - { { 22, wxDateTime::Jul, 1926 }, 29, 4, 4, 203 }, - { { 22, wxDateTime::Oct, 2076 }, 43, 4, 4, 296 }, - { { 1, wxDateTime::Jul, 1967 }, 26, 1, 1, 182 }, - { { 8, wxDateTime::Nov, 2004 }, 46, 2, 2, 313 }, - { { 21, wxDateTime::Mar, 1920 }, 12, 3, 4, 81 }, - { { 7, wxDateTime::Jan, 1965 }, 1, 2, 2, 7 }, - { { 19, wxDateTime::Oct, 1999 }, 42, 4, 4, 292 }, - { { 13, wxDateTime::Aug, 1955 }, 32, 2, 2, 225 }, - { { 18, wxDateTime::Jul, 2087 }, 29, 3, 3, 199 }, - { { 2, wxDateTime::Sep, 2028 }, 35, 1, 1, 246 }, - { { 28, wxDateTime::Jul, 1945 }, 30, 5, 4, 209 }, - { { 15, wxDateTime::Jun, 1901 }, 24, 3, 3, 166 }, - { { 10, wxDateTime::Oct, 1939 }, 41, 3, 2, 283 }, - { { 3, wxDateTime::Dec, 1965 }, 48, 1, 1, 337 }, - { { 23, wxDateTime::Feb, 1940 }, 8, 4, 4, 54 }, - { { 2, wxDateTime::Jan, 1987 }, 1, 1, 1, 2 }, - { { 11, wxDateTime::Aug, 2079 }, 32, 2, 2, 223 }, - { { 2, wxDateTime::Feb, 2063 }, 5, 1, 1, 33 }, - { { 16, wxDateTime::Oct, 1942 }, 42, 3, 3, 289 }, - }; - - for ( size_t n = 0; n < WXSIZEOF(weekNumberTestDates); n++ ) - { - const WeekNumberTestData& wn = weekNumberTestDates[n]; - const Date& d = wn.date; - - wxDateTime dt = d.DT(); - - wxDateTime::wxDateTime_t - week = dt.GetWeekOfYear(wxDateTime::Monday_First), - wmon = dt.GetWeekOfMonth(wxDateTime::Monday_First), - wmon2 = dt.GetWeekOfMonth(wxDateTime::Sunday_First), - dnum = dt.GetDayOfYear(); - - wxPrintf(_T("%s: the day number is %d"), d.FormatDate().c_str(), dnum); - if ( dnum == wn.dnum ) - { - wxPrintf(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %d)"), wn.dnum); - } - - wxPrintf(_T(", week in month = %d"), wmon); - if ( wmon != wn.wmon ) - { - wxPrintf(_T(" (ERROR: should be %d)"), wn.wmon); - } - - wxPrintf(_T(" or %d"), wmon2); - if ( wmon2 == wn.wmon2 ) - { - wxPrintf(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %d)"), wn.wmon2); - } - - wxPrintf(_T(", week in year = %d"), week); - if ( week != wn.week ) - { - wxPrintf(_T(" (ERROR: should be %d)"), wn.week); - } - - wxPutchar(_T('\n')); - - wxDateTime dt2(1, wxDateTime::Jan, d.year); - dt2.SetToTheWeek(wn.week, dt.GetWeekDay()); - if ( dt2 != dt ) - { - Date d2; - d2.Init(dt2.GetTm()); - wxPrintf(_T("ERROR: SetToTheWeek() returned %s\n"), - d2.FormatDate().c_str()); - } - } -} - -// 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")); - - // 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 }, - }, + if ( !dirname.StartsWith(prefix + _T('/'), &dirname) ) { - { 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 }, + wxPrintf(_T("ERROR: unexpected wxFileSystem::FindNext result\n")); + + break; } - }; - int year; - for ( year = 1990; year < 2005; year++ ) - { - wxDateTime dtBegin = wxDateTime::GetBeginDST(year, wxDateTime::USA), - dtEnd = wxDateTime::GetEndDST(year, wxDateTime::USA); + wxPrintf(_T("%s%s\n"), indent.c_str(), dirname.c_str()); - wxPrintf(_T("DST period in the US for year %d: from %s to %s"), - year, dtBegin.Format().c_str(), dtEnd.Format().c_str()); + DumpZipDirectory(fs, dirname, + indent + wxString(_T(' '), 4)); - size_t n = year - 1990; - const Date& dBegin = datesDST[0][n]; - const Date& dEnd = datesDST[1][n]; + dirname = fs.FindNext(); + } - if ( dBegin.SameDay(dtBegin.GetTm()) && dEnd.SameDay(dtEnd.GetTm()) ) - { - wxPuts(_T(" (ok)")); - } - else + wxString filename = fs.FindFirst(wildcard, wxFILE); + while ( !filename.empty() ) + { + if ( !filename.StartsWith(prefix, &filename) ) { - wxPrintf(_T(" (ERROR: should be %s %d to %s %d)\n"), - wxDateTime::GetMonthName(dBegin.month).c_str(), dBegin.day, - wxDateTime::GetMonthName(dEnd.month).c_str(), dEnd.day); + wxPrintf(_T("ERROR: unexpected wxFileSystem::FindNext result\n")); + + break; } - } - wxPuts(wxEmptyString); + wxPrintf(_T("%s%s\n"), indent.c_str(), filename.c_str()); - for ( year = 1990; year < 2005; year++ ) - { - wxPrintf(_T("DST period in Europe for year %d: from %s to %s\n"), - year, - wxDateTime::GetBeginDST(year, wxDateTime::Country_EEC).Format().c_str(), - wxDateTime::GetEndDST(year, wxDateTime::Country_EEC).Format().c_str()); + filename = fs.FindNext(); } } -// test wxDateTime -> text conversion -static void TestTimeFormat() +static void TestZipFileSystem() { - wxPuts(_T("\n*** wxDateTime formatting test ***")); + wxPuts(_T("*** Testing ZIP file system ***\n")); - // 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 - }; + wxFileSystem::AddHandler(new wxZipFSHandler); + wxFileSystem fs; + wxPrintf(_T("Dumping all files in the archive %s:\n"), TESTFILE_ZIP); - static const struct - { - CompareKind compareKind; - const wxChar *format; - } formatTestFormats[] = - { - { CompareBoth, _T("---> %c") }, - { CompareDate, _T("Date is %A, %d of %B, in year %Y") }, - { CompareBoth, _T("Date is %x, time is %X") }, - { CompareTime, _T("Time is %H:%M:%S or %I:%M:%S %p") }, - { CompareNone, _T("The day of year: %j, the week of year: %W") }, - { CompareDate, _T("ISO date without separators: %Y%m%d") }, - }; + DumpZipDirectory(fs, _T(""), wxString(_T(' '), 4)); +} - 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 - }; +#endif // TEST_ZIP - // an extra test (as it doesn't depend on date, don't do it in the loop) - wxPrintf(_T("%s\n"), wxDateTime::Now().Format(_T("Our timezone is %Z")).c_str()); +// ---------------------------------------------------------------------------- +// date time +// ---------------------------------------------------------------------------- - for ( size_t d = 0; d < WXSIZEOF(formatTestDates) + 1; d++ ) - { - wxPuts(wxEmptyString); +#ifdef TEST_DATETIME - wxDateTime dt = d == 0 ? wxDateTime::Now() : formatTestDates[d - 1].DT(); - for ( size_t n = 0; n < WXSIZEOF(formatTestFormats); n++ ) - { - wxString s = dt.Format(formatTestFormats[n].format); - wxPrintf(_T("%s"), s.c_str()); +#include "wx/math.h" +#include "wx/datetime.h" - // what can we recover? - int kind = formatTestFormats[n].compareKind; +// this test miscellaneous static wxDateTime functions - // convert back - wxDateTime dt2; - const wxChar *result = dt2.ParseFormat(s, formatTestFormats[n].format); - if ( !result ) - { - // converion failed - should it have? - if ( kind == CompareNone ) - wxPuts(_T(" (ok)")); - else - wxPuts(_T(" (ERROR: conversion back failed)")); - } - else if ( *result ) - { - // should have parsed the entire string - wxPuts(_T(" (ERROR: conversion back stopped too soon)")); - } - else - { - bool equal = false; // suppress compilaer warning - switch ( kind ) - { - case CompareBoth: - equal = dt2 == dt; - break; +#if TEST_ALL - case CompareDate: - equal = dt.IsSameDate(dt2); - break; +static void TestTimeStatic() +{ + wxPuts(_T("\n*** wxDateTime static methods test ***")); - case CompareTime: - equal = dt.IsSameTime(dt2); - break; - } + // some info about the current date + int year = wxDateTime::GetCurrentYear(); + wxPrintf(_T("Current year %d is %sa leap one and has %d days.\n"), + year, + wxDateTime::IsLeapYear(year) ? "" : "not ", + wxDateTime::GetNumberOfDays(year)); - if ( !equal ) - { - wxPrintf(_T(" (ERROR: got back '%s' instead of '%s')\n"), - dt2.Format().c_str(), dt.Format().c_str()); - } - else - { - wxPuts(_T(" (ok)")); - } - } - } - } + wxDateTime::Month month = wxDateTime::GetCurrentMonth(); + 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)); } -// test text -> wxDateTime conversion -static void TestTimeParse() +// test time zones stuff +static void TestTimeZones() { - wxPuts(_T("\n*** wxDateTime parse test ***")); + wxPuts(_T("\n*** wxDateTime timezone test ***")); - struct ParseTestData - { - const wxChar *format; - Date date; - bool good; - }; + wxDateTime now = wxDateTime::Now(); - static const ParseTestData parseTestDates[] = - { - { _T("Sat, 18 Dec 1999 00:46:40 +0100"), { 18, wxDateTime::Dec, 1999, 00, 46, 40 }, true }, - { _T("Wed, 1 Dec 1999 05:17:20 +0300"), { 1, wxDateTime::Dec, 1999, 03, 17, 20 }, true }, - }; + 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()); - for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ ) + wxDateTime::Tm tm = now.GetTm(); + if ( wxDateTime(tm) != now ) { - const wxChar *format = parseTestDates[n].format; + wxPrintf(_T("ERROR: got %s instead of %s\n"), + wxDateTime(tm).Format().c_str(), now.Format().c_str()); + } +} - wxPrintf(_T("%s => "), format); +// test some minimal support for the dates outside the standard range +static void TestTimeRange() +{ + wxPuts(_T("\n*** wxDateTime out-of-standard-range dates test ***")); - wxDateTime dt; - if ( dt.ParseRfc822Date(format) ) - { - wxPrintf(_T("%s "), dt.Format().c_str()); + static const wxChar *fmt = _T("%d-%b-%Y %H:%M:%S"); - if ( parseTestDates[n].good ) - { - wxDateTime dtReal = parseTestDates[n].date.DT(); - if ( dt == dtReal ) - { - wxPuts(_T("(ok)")); - } - else - { - wxPrintf(_T("(ERROR: should be %s)\n"), dtReal.Format().c_str()); - } - } - else - { - wxPuts(_T("(ERROR: bad format)")); - } - } - else - { - wxPrintf(_T("bad format (%s)\n"), - parseTestDates[n].good ? "ERROR" : "ok"); - } + 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() { wxPuts(_T("\n*** interactive wxDateTime tests ***")); @@ -4630,6 +3641,10 @@ static void TestDateTimeInteractive() wxPuts(_T("\n*** done ***")); } +#endif // TEST_INTERACTIVE + +#if TEST_ALL + static void TestTimeMS() { wxPuts(_T("*** testing millisecond-resolution support in wxDateTime ***")); @@ -4645,7 +3660,7 @@ static void TestTimeMS() //for ( int j = 0; j < 10; j++ ) { wxString s; - s.Printf(_T("%g"), sqrt(i)); + s.Printf(_T("%g"), sqrt((float)i)); } if ( !(i % 100) ) @@ -4662,73 +3677,6 @@ static void TestTimeMS() wxPuts(_T("\n*** done ***")); } -static void TestTimeArithmetics() -{ - wxPuts(_T("\n*** testing arithmetic operations on wxDateTime ***")); - - static const struct ArithmData - { - ArithmData(const wxDateSpan& sp, const wxChar *nam) - : span(sp), name(nam) { } - - wxDateSpan span; - const wxChar *name; - } testArithmData[] = - { - ArithmData(wxDateSpan::Day(), _T("day")), - ArithmData(wxDateSpan::Week(), _T("week")), - ArithmData(wxDateSpan::Month(), _T("month")), - ArithmData(wxDateSpan::Year(), _T("year")), - ArithmData(wxDateSpan(1, 2, 3, 4), _T("year, 2 months, 3 weeks, 4 days")), - }; - - wxDateTime dt(29, wxDateTime::Dec, 1999), dt1, dt2; - - for ( size_t n = 0; n < WXSIZEOF(testArithmData); n++ ) - { - wxDateSpan span = testArithmData[n].span; - dt1 = dt + span; - dt2 = dt - span; - - const wxChar *name = testArithmData[n].name; - wxPrintf(_T("%s + %s = %s, %s - %s = %s\n"), - dt.FormatISODate().c_str(), name, dt1.FormatISODate().c_str(), - dt.FormatISODate().c_str(), name, dt2.FormatISODate().c_str()); - - wxPrintf(_T("Going back: %s"), (dt1 - span).FormatISODate().c_str()); - if ( dt1 - span == dt ) - { - wxPuts(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %s)\n"), dt.FormatISODate().c_str()); - } - - wxPrintf(_T("Going forward: %s"), (dt2 + span).FormatISODate().c_str()); - if ( dt2 + span == dt ) - { - wxPuts(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %s)\n"), dt.FormatISODate().c_str()); - } - - wxPrintf(_T("Double increment: %s"), (dt2 + 2*span).FormatISODate().c_str()); - if ( dt2 + 2*span == dt1 ) - { - wxPuts(_T(" (ok)")); - } - else - { - wxPrintf(_T(" (ERROR: should be %s)\n"), dt2.FormatISODate().c_str()); - } - - wxPuts(wxEmptyString); - } -} - static void TestTimeHolidays() { wxPuts(_T("\n*** testing wxDateTimeHolidayAuthority ***\n")); @@ -4798,6 +3746,8 @@ static void TestTimeSpanFormat() wxPuts(wxEmptyString); } +#endif // TEST_ALL + #endif // TEST_DATETIME // ---------------------------------------------------------------------------- @@ -5280,6 +4230,24 @@ static void TestSemaphore() int main(int argc, char **argv) { +#if wxUSE_UNICODE + wxChar **wxArgv = new wxChar *[argc + 1]; + + { + int n; + + for (n = 0; n < argc; n++ ) + { + wxMB2WXbuf warg = wxConvertMB2WX(argv[n]); + wxArgv[n] = wxStrdup(warg); + } + + wxArgv[n] = NULL; + } +#else // !wxUSE_UNICODE + #define wxArgv argv +#endif // wxUSE_UNICODE/!wxUSE_UNICODE + wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program"); wxInitializer initializer; @@ -5311,62 +4279,33 @@ int main(int argc, char **argv) } #endif // TEST_SNGLINST -#ifdef TEST_CHARSET - TestCharset(); -#endif // TEST_CHARSET - #ifdef TEST_CMDLINE TestCmdLineConvert(); #if wxUSE_CMDLINE_PARSER static const wxCmdLineEntryDesc cmdLineDesc[] = { - { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("show this help message"), + { wxCMD_LINE_SWITCH, "h", "help", "show this help message", wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, - { wxCMD_LINE_SWITCH, _T("v"), _T("verbose"), _T("be verbose") }, - { wxCMD_LINE_SWITCH, _T("q"), _T("quiet"), _T("be quiet") }, + { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" }, + { wxCMD_LINE_SWITCH, "q", "quiet", "be quiet" }, - { wxCMD_LINE_OPTION, _T("o"), _T("output"), _T("output file") }, - { wxCMD_LINE_OPTION, _T("i"), _T("input"), _T("input dir") }, - { wxCMD_LINE_OPTION, _T("s"), _T("size"), _T("output block size"), + { wxCMD_LINE_OPTION, "o", "output", "output file" }, + { wxCMD_LINE_OPTION, "i", "input", "input dir" }, + { wxCMD_LINE_OPTION, "s", "size", "output block size", wxCMD_LINE_VAL_NUMBER }, - { wxCMD_LINE_OPTION, _T("d"), _T("date"), _T("output file date"), + { wxCMD_LINE_OPTION, "d", "date", "output file date", wxCMD_LINE_VAL_DATE }, + { wxCMD_LINE_OPTION, "f", "double", "output double", + wxCMD_LINE_VAL_DOUBLE }, - { wxCMD_LINE_PARAM, NULL, NULL, _T("input file"), + { wxCMD_LINE_PARAM, NULL, NULL, "input file", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE }, { wxCMD_LINE_NONE } }; -#if wxUSE_UNICODE - wxChar **wargv = new wxChar *[argc + 1]; - - { - 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); - -#if wxUSE_UNICODE - { - for ( int n = 0; n < argc; n++ ) - free(wargv[n]); - - delete [] wargv; - } -#endif // wxUSE_UNICODE + wxCmdLineParser parser(cmdLineDesc, argc, wxArgv); parser.AddOption(_T("project_name"), _T(""), _T("full path to project file"), wxCMD_LINE_VAL_STRING, @@ -5398,9 +4337,10 @@ int main(int argc, char **argv) TestDirTraverse(); #endif // TEST_DIR -#ifdef TEST_DLLLOADER +#ifdef TEST_DYNLIB TestDllLoad(); -#endif // TEST_DLLLOADER + TestDllListLoaded(); +#endif // TEST_DYNLIB #ifdef TEST_ENVIRON TestEnvironment(); @@ -5414,11 +4354,6 @@ int main(int argc, char **argv) TestFileConfRead(); #endif // TEST_FILECONF -#ifdef TEST_LIST - TestListCtor(); - TestList(); -#endif // TEST_LIST - #ifdef TEST_LOCALE TestDefaultLang(); #endif // TEST_LOCALE @@ -5451,13 +4386,10 @@ int main(int argc, char **argv) TestFileRead(); TestTextFileRead(); TestFileCopy(); + TestTempFile(); #endif // TEST_FILE #ifdef TEST_FILENAME - TestFileNameConstruction(); - TestFileNameMakeRelative(); - TestFileNameMakeAbsolute(); - TestFileNameSplit(); TestFileNameTemp(); TestFileNameCwd(); TestFileNameDirManip(); @@ -5482,7 +4414,7 @@ int main(int argc, char **argv) TestFtpMisc(); TestFtpFileSize(); TestFtpUpload(); - #endif + #endif // TEST_ALL #if TEST_INTERACTIVE TestFtpInteractive(); @@ -5495,32 +4427,23 @@ int main(int argc, char **argv) #endif #endif // TEST_FTP -#ifdef TEST_HASHMAP - TestHashMap(); -#endif // TEST_HASHMAP - -#ifdef TEST_HASHSET - TestHashSet(); -#endif // TEST_HASHSET - #ifdef TEST_MIME - wxLog::AddTraceMask(_T("mime")); - #if TEST_ALL - TestMimeEnum(); - TestMimeOverride(); - TestMimeAssociate(); - #endif + //wxLog::AddTraceMask(_T("mime")); + TestMimeEnum(); +#if 0 + TestMimeOverride(); + TestMimeAssociate(); +#endif TestMimeFilename(); #endif // TEST_MIME #ifdef TEST_INFO_FUNCTIONS - #if TEST_ALL - TestOsInfo(); - TestUserInfo(); + TestOsInfo(); + TestPlatformInfo(); + TestUserInfo(); - #if TEST_INTERACTIVE - TestDiskInfo(); - #endif + #if TEST_INTERACTIVE + TestDiskInfo(); #endif #endif // TEST_INFO_FUNCTIONS @@ -5528,10 +4451,6 @@ int main(int argc, char **argv) TestPathList(); #endif // TEST_PATHLIST -#ifdef TEST_ODBC - TestDbOpen(); -#endif // TEST_ODBC - #ifdef TEST_PRINTF TestPrintf(); #endif // TEST_PRINTF @@ -5589,23 +4508,16 @@ int main(int argc, char **argv) #ifdef TEST_TIMER TestStopWatch(); + TestTimer(); #endif // TEST_TIMER #ifdef TEST_DATETIME #if TEST_ALL - TestTimeSet(); TestTimeStatic(); TestTimeRange(); TestTimeZones(); - TestTimeTicks(); - TestTimeJDN(); TestTimeDST(); - TestTimeWDays(); - TestTimeWNumber(); - TestTimeParse(); - TestTimeArithmetics(); TestTimeHolidays(); - TestTimeFormat(); TestTimeSpanFormat(); TestTimeMS(); @@ -5621,6 +4533,16 @@ int main(int argc, char **argv) TestScopeGuard(); #endif +#ifdef TEST_STACKWALKER +#if wxUSE_STACKWALKER + TestStackWalk(argv[0]); +#endif +#endif // TEST_STACKWALKER + +#ifdef TEST_STDPATHS + TestStandardPaths(); +#endif + #ifdef TEST_USLEEP wxPuts(_T("Sleeping for 3 seconds... z-z-z-z-z...")); wxUsleep(3000); @@ -5645,8 +4567,16 @@ int main(int argc, char **argv) TestZipFileSystem(); #endif // TEST_ZIP +#if wxUSE_UNICODE + { + for ( int n = 0; n < argc; n++ ) + free(wxArgv[n]); + + delete [] wxArgv; + } +#endif // wxUSE_UNICODE + wxUnusedVar(argc); wxUnusedVar(argv); return 0; } -