X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60ce696e26a9351bb600e71a45d01d37cdf61628..2361ce822f82cd4964066319b2253562bf4de84b:/samples/console/console.cpp?ds=sidebyside diff --git a/samples/console/console.cpp b/samples/console/console.cpp index e67580588a..5a8015c785 100644 --- a/samples/console/console.cpp +++ b/samples/console/console.cpp @@ -83,6 +83,7 @@ #define TEST_THREADS #define TEST_TIMER // #define TEST_VCARD -- don't enable this (VZ) + #define TEST_VOLUME #define TEST_WCHAR #define TEST_ZIP #define TEST_ZLIB @@ -90,7 +91,7 @@ #undef TEST_ALL static const bool TEST_ALL = TRUE; #else - #define TEST_THREADS + #define TEST_DIR static const bool TEST_ALL = FALSE; #endif @@ -99,7 +100,7 @@ #ifdef TEST_INTERACTIVE #undef TEST_INTERACTIVE - static const bool TEST_INTERACTIVE = FALSE; + static const bool TEST_INTERACTIVE = TRUE; #else static const bool TEST_INTERACTIVE = FALSE; #endif @@ -114,6 +115,7 @@ 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; } @@ -183,11 +185,11 @@ static void TestCharset() for ( size_t n = 0; n < WXSIZEOF(charsets); n++ ) { - wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(charsets[n]); + wxFontEncoding enc = wxFontMapper::Get()->CharsetToEncoding(charsets[n]); wxPrintf(_T("Charset: %s\tEncoding: %s (%s)\n"), charsets[n], - wxTheFontMapper->GetEncodingName(enc).c_str(), - wxTheFontMapper->GetEncodingDescription(enc).c_str()); + wxFontMapper::Get()->GetEncodingName(enc).c_str(), + wxFontMapper::Get()->GetEncodingDescription(enc).c_str()); } } @@ -305,7 +307,19 @@ static void TestDirEnum() { puts("*** Testing wxDir::GetFirst/GetNext ***"); - wxDir dir(wxGetCwd()); + wxString cwd = wxGetCwd(); + if ( wxDir::Exists(cwd) ) + { + printf("ERROR: current directory '%s' doesn't exist?\n", cwd.c_str()); + return; + } + + wxDir dir(cwd); + if ( !dir.IsOpened() ) + { + printf("ERROR: failed to open current directory '%s'.\n", cwd.c_str()); + return; + } puts("Enumerating everything in current directory:"); TestDirEnumHelper(dir); @@ -393,6 +407,38 @@ static void TestDirTraverse() dir.Traverse(traverser, _T(""), wxDIR_DIRS | wxDIR_HIDDEN); } +static void TestDirExists() +{ + wxPuts(_T("*** Testing wxDir::Exists() ***")); + + static const char *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++ ) + { + printf(_T("%-40s: %s\n"), + dirnames[n], + wxDir::Exists(dirnames[n]) ? _T("exists") : _T("doesn't exist")); + } +} + #endif // TEST_DIR // ---------------------------------------------------------------------------- @@ -767,8 +813,28 @@ static void DumpFileName(const wxFileName& fn) wxString vol, path, name, ext; wxFileName::SplitPath(full, &vol, &path, &name, &ext); - wxPrintf(_T("Filename '%s' -> vol '%s', path '%s', name '%s', ext '%s'\n"), + wxPrintf(_T("'%s'-> vol '%s', path '%s', name '%s', ext '%s'\n"), full.c_str(), vol.c_str(), path.c_str(), name.c_str(), ext.c_str()); + + wxFileName::SplitPath(full, &path, &name, &ext); + wxPrintf(_T("or\t\t-> path '%s', name '%s', ext '%s'\n"), + path.c_str(), name.c_str(), ext.c_str()); + + wxPrintf(_T("path is also:\t'%s'\n"), fn.GetPath().c_str()); + wxPrintf(_T("with volume: \t'%s'\n"), + fn.GetPath(wxPATH_GET_VOLUME).c_str()); + wxPrintf(_T("with separator:\t'%s'\n"), + fn.GetPath(wxPATH_GET_SEPARATOR).c_str()); + wxPrintf(_T("with both: \t'%s'\n"), + fn.GetPath(wxPATH_GET_SEPARATOR | wxPATH_GET_VOLUME).c_str()); + + wxPuts(_T("The directories in the path are:")); + wxArrayString dirs = fn.GetDirs(); + size_t count = dirs.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + wxPrintf(_T("\t%u: %s\n"), n, dirs[n].c_str()); + } } static struct FileNameInfo @@ -801,6 +867,8 @@ static struct FileNameInfo { _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 }, + // 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 }, @@ -808,6 +876,7 @@ static struct FileNameInfo { _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 }, @@ -830,7 +899,7 @@ static void TestFileNameConstruction() printf("ERROR: fullname should be '%s'\n", fni.fullname); } - bool isAbsolute = fn.IsAbsolute(); + bool isAbsolute = fn.IsAbsolute(fni.format); printf("'%s' is %s (%s)\n\t", fullname.c_str(), isAbsolute ? "absolute" : "relative", @@ -883,17 +952,25 @@ static void TestFileNameTemp() static const char *tmpprefixes[] = { + "", "foo", - "/tmp/foo", "..", "../bar", +#ifdef __UNIX__ + "/tmp/foo", "/tmp/foo/bar", // this one must be an error +#endif // __UNIX__ }; for ( size_t n = 0; n < WXSIZEOF(tmpprefixes); n++ ) { wxString path = wxFileName::CreateTempFileName(tmpprefixes[n]); - if ( !path.empty() ) + if ( path.empty() ) + { + // "error" is not in upper case because it may be ok + printf("Prefix '%s'\t-> error\n", tmpprefixes[n]); + } + else { printf("Prefix '%s'\t-> temp file '%s'\n", tmpprefixes[n], path.c_str()); @@ -982,8 +1059,8 @@ static void TestFileGetTimes() { wxFileName fn(_T("testdata.fc")); - wxDateTime dtAccess, dtMod, dtChange; - if ( !fn.GetTimes(&dtAccess, &dtMod, &dtChange) ) + wxDateTime dtAccess, dtMod, dtCreate; + if ( !fn.GetTimes(&dtAccess, &dtMod, &dtCreate) ) { wxPrintf(_T("ERROR: GetTimes() failed.\n")); } @@ -992,9 +1069,9 @@ static void TestFileGetTimes() static const wxChar *fmt = _T("%Y-%b-%d %H:%M:%S"); wxPrintf(_T("File times for '%s':\n"), fn.GetFullPath().c_str()); - wxPrintf(_T("Access: \t%s\n"), dtAccess.Format(fmt).c_str()); - wxPrintf(_T("Mod/creation:\t%s\n"), dtMod.Format(fmt).c_str()); - wxPrintf(_T("Change: \t%s\n"), dtChange.Format(fmt).c_str()); + wxPrintf(_T("Creation: \t%s\n"), dtCreate.Format(fmt).c_str()); + wxPrintf(_T("Last read: \t%s\n"), dtAccess.Format(fmt).c_str()); + wxPrintf(_T("Last write: \t%s\n"), dtMod.Format(fmt).c_str()); } } @@ -1702,9 +1779,9 @@ static void TestMimeAssociate() _T("application/x-xyz"), _T("xyzview '%s'"), // open cmd _T(""), // print cmd - _T("XYZ File") // description - _T(".xyz"), // extensions - NULL // end of extensions + _T("XYZ File"), // description + _T(".xyz"), // extensions + NULL // end of extensions ); ftInfo.SetShortDesc(_T("XYZFile")); // used under Win32 only @@ -1947,8 +2024,15 @@ static void TestDivision() // multiplication will not overflow) wxLongLong ll = MAKE_LL((rand() >> 12), rand(), rand(), rand()); - // get a random long (not wxLongLong for now) to divide it with - long l = 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; @@ -2350,6 +2434,10 @@ static void TestRegExInteractive() // database // ---------------------------------------------------------------------------- +#if !wxUSE_ODBC + #undef TEST_ODBC +#endif + #ifdef TEST_ODBC #include @@ -3013,18 +3101,28 @@ static void TestStopWatch() puts("*** Testing wxStopWatch ***\n"); wxStopWatch sw; - printf("Sleeping 3 seconds..."); + sw.Pause(); + printf("Initially paused, after 2 seconds time is..."); + fflush(stdout); + wxSleep(2); + printf("\t%ldms\n", sw.Time()); + + printf("Resuming stopwatch and sleeping 3 seconds..."); + fflush(stdout); + sw.Resume(); wxSleep(3); printf("\telapsed time: %ldms\n", sw.Time()); sw.Pause(); - printf("Sleeping 2 more seconds..."); + printf("Pausing agan and sleeping 2 more seconds..."); + fflush(stdout); wxSleep(2); printf("\telapsed time: %ldms\n", sw.Time()); sw.Resume(); - printf("And 3 more seconds..."); - wxSleep(3); + printf("Finally resuming and sleeping 2 more seconds..."); + fflush(stdout); + wxSleep(2); printf("\telapsed time: %ldms\n", sw.Time()); wxStopWatch sw2; @@ -3042,6 +3140,7 @@ static void TestStopWatch() } putchar('.'); + fflush(stdout); } puts(", ok."); @@ -3291,6 +3390,65 @@ static void TestVCardWrite() #endif // TEST_VCARD +// ---------------------------------------------------------------------------- +// wxVolume tests +// ---------------------------------------------------------------------------- + +#if !defined(__WIN32__) || !wxUSE_FSVOLUME + #undef TEST_VOLUME +#endif + +#ifdef TEST_VOLUME + +#include "wx/volume.h" + +static const wxChar *volumeKinds[] = +{ + _T("floppy"), + _T("hard disk"), + _T("CD-ROM"), + _T("DVD-ROM"), + _T("network volume"), + _T("other volume"), +}; + +static void TestFSVolume() +{ + wxPuts(_T("*** Testing wxFSVolume class ***")); + + wxArrayString volumes = wxFSVolume::GetVolumes(); + size_t count = volumes.GetCount(); + + if ( !count ) + { + wxPuts(_T("ERROR: no mounted volumes?")); + return; + } + + wxPrintf(_T("%u mounted volumes found:\n"), count); + + for ( size_t n = 0; n < count; n++ ) + { + wxFSVolume vol(volumes[n]); + if ( !vol.IsOk() ) + { + wxPuts(_T("ERROR: couldn't create volume")); + continue; + } + + wxPrintf(_T("%u: %s (%s), %s, %s, %s\n"), + n + 1, + vol.GetDisplayName().c_str(), + vol.GetName().c_str(), + volumeKinds[vol.GetKind()], + vol.IsWritable() ? _T("rw") : _T("ro"), + vol.GetFlags() & wxFS_VOL_REMOVABLE ? _T("removable") + : _T("fixed")); + } +} + +#endif // TEST_VOLUME + // ---------------------------------------------------------------------------- // wide char (Unicode) support // ---------------------------------------------------------------------------- @@ -3302,21 +3460,21 @@ static void TestVCardWrite() #include "wx/encconv.h" #include "wx/buffer.h" +static const char textInUtf8[] = +{ + 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, + 176, 208, 180, 208, 190, 208, 178, 208, 176, 208, 187, 32, 208, 188, + 208, 181, 208, 189, 209, 143, 32, 209, 129, 208, 178, 208, 190, 208, + 181, 208, 185, 32, 208, 186, 209, 128, 209, 131, 209, 130, 208, 181, + 208, 185, 209, 136, 208, 181, 208, 185, 32, 208, 189, 208, 190, 208, + 178, 208, 190, 209, 129, 209, 130, 209, 140, 209, 142, 0 +}; + static void TestUtf8() { puts("*** Testing UTF8 support ***\n"); - static const char textInUtf8[] = - { - 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, - 176, 208, 180, 208, 190, 208, 178, 208, 176, 208, 187, 32, 208, 188, - 208, 181, 208, 189, 209, 143, 32, 209, 129, 208, 178, 208, 190, 208, - 181, 208, 185, 32, 208, 186, 209, 128, 209, 131, 209, 130, 208, 181, - 208, 185, 209, 136, 208, 181, 208, 185, 32, 208, 189, 208, 190, 208, - 178, 208, 190, 209, 129, 209, 130, 209, 140, 209, 142, 0 - }; - char buf[1024]; wchar_t wbuf[1024]; if ( wxConvUTF8.MB2WC(wbuf, textInUtf8, WXSIZEOF(textInUtf8)) <= 0 ) @@ -3325,22 +3483,49 @@ static void TestUtf8() } else { - // using wxEncodingConverter -#if 0 - wxEncodingConverter ec; - ec.Init(wxFONTENCODING_UNICODE, wxFONTENCODING_KOI8); - ec.Convert(wbuf, buf); -#else // using wxCSConv wxCSConv conv(_T("koi8-r")); if ( conv.WC2MB(buf, wbuf, 0 /* not needed wcslen(wbuf) */) <= 0 ) { puts("ERROR: conversion to KOI8-R failed."); } else -#endif + { + printf("The resulting string (in KOI8-R): %s\n", buf); + } + } - printf("The resulting string (in koi8-r): %s\n", 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); + } + + puts(""); +} + +static void TestEncodingConverter() +{ + wxPuts(_T("*** Testing wxEncodingConverter ***\n")); + + // using wxEncodingConverter should give the same result as above + char buf[1024]; + wchar_t wbuf[1024]; + if ( wxConvUTF8.MB2WC(wbuf, textInUtf8, WXSIZEOF(textInUtf8)) <= 0 ) + { + puts("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); + } + + puts(""); } #endif // TEST_WCHAR @@ -3440,16 +3625,16 @@ static void TestZipFileSystem() #include "wx/wfstream.h" static const wxChar *FILENAME_GZ = _T("test.gz"); -static const char *TEST_DATA = "hello and hello again"; +static const char *TEST_DATA = "hello and hello and hello and hello and hello"; static void TestZlibStreamWrite() { puts("*** Testing Zlib stream reading ***\n"); wxFileOutputStream fileOutStream(FILENAME_GZ); - wxZlibOutputStream ostr(fileOutStream, 0); + wxZlibOutputStream ostr(fileOutStream); printf("Compressing the test string... "); - ostr.Write(TEST_DATA, sizeof(TEST_DATA)); + ostr.Write(TEST_DATA, strlen(TEST_DATA) + 1); if ( !ostr ) { puts("(ERROR: failed)"); @@ -3694,7 +3879,7 @@ static void TestTimeTicks() else { printf(" (ERROR: should be %ld, delta = %ld)\n", - d.ticks, ticks - d.ticks); + (long)d.ticks, (long)(ticks - d.ticks)); } dt = d.DT().ToTimezone(wxDateTime::GMT0); @@ -3707,7 +3892,7 @@ static void TestTimeTicks() else { printf(" (ERROR: should be %ld, delta = %ld)\n", - d.gmticks, ticks - d.gmticks); + (long)d.gmticks, (long)(ticks - d.gmticks)); } } @@ -4527,7 +4712,7 @@ static void TestTimeCompatibility() static size_t gs_counter = (size_t)-1; static wxCriticalSection gs_critsect; -static wxCondition gs_cond; +static wxSemaphore gs_cond; class MyJoinableThread : public wxThread { @@ -4615,7 +4800,7 @@ void MyDetachedThread::OnExit() wxCriticalSectionLocker lock(gs_critsect); if ( !--gs_counter && !m_cancelled ) - gs_cond.Signal(); + gs_cond.Post(); } static void TestDetachedThreads() @@ -4754,8 +4939,9 @@ static void TestThreadDelete() class MyWaitingThread : public wxThread { public: - MyWaitingThread(wxCondition *condition) + MyWaitingThread( wxMutex *mutex, wxCondition *condition ) { + m_mutex = mutex; m_condition = condition; Create(); @@ -4766,12 +4952,14 @@ public: printf("Thread %lu has started running.\n", GetId()); fflush(stdout); - gs_cond.Signal(); + gs_cond.Post(); printf("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()); fflush(stdout); @@ -4780,17 +4968,19 @@ public: } private: + wxMutex *m_mutex; wxCondition *m_condition; }; static void TestThreadConditions() { - wxCondition condition; + 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()); + //wxLogTrace("thread", "Local condition var is %08x, gs_cond = %08x", + // condition.GetId(), gs_cond.GetId()); // create and launch threads MyWaitingThread *threads[10]; @@ -4798,7 +4988,7 @@ static void TestThreadConditions() size_t n; for ( n = 0; n < WXSIZEOF(threads); n++ ) { - threads[n] = new MyWaitingThread(&condition); + threads[n] = new MyWaitingThread( &mutex, &condition ); } for ( n = 0; n < WXSIZEOF(threads); n++ ) @@ -4844,6 +5034,102 @@ static void TestThreadConditions() 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 // ---------------------------------------------------------------------------- @@ -4852,25 +5138,48 @@ static void TestThreadConditions() #ifdef TEST_ARRAYS -static void PrintArray(const char* name, const wxArrayString& array) -{ - printf("Dump of the array '%s'\n", name); +#include "wx/dynarray.h" - 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()); - } -} +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); -static void PrintArray(const char* name, const wxArrayInt& array) +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] = %d\n", name, n, array[n]); + printf("\t%s[%u] = '%s'\n", name, n, array[n].c_str()); } } @@ -4880,45 +5189,63 @@ int wxCMPFUNC_CONV StringLenCompare(const wxString& first, return first.length() - second.length(); } -int wxCMPFUNC_CONV IntCompare(int *first, - int *second) -{ - return *first - *second; -} - -int wxCMPFUNC_CONV IntRevCompare(int *first, - int *second) -{ - return *second - *first; -} - -static void TestArrayOfInts() -{ - puts("*** Testing wxArrayInt ***\n"); - - wxArrayInt a; - a.Add(1); - a.Add(17); - a.Add(5); - a.Add(3); - - puts("Initially:"); - PrintArray("a", a); - - puts("After sort:"); - a.Sort(IntCompare); - PrintArray("a", a); - - puts("After reverse sort:"); - a.Sort(IntRevCompare); - PrintArray("a", a); +#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); \ } -#include "wx/dynarray.h" - -WX_DECLARE_OBJARRAY(Bar, ArrayBars); -#include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(ArrayBars); +TestArrayOf(UShort); +TestArrayOf(Int); static void TestArrayOfObjects() { @@ -4926,17 +5253,23 @@ static void TestArrayOfObjects() { ArrayBars bars; - Bar bar("second bar"); + 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); + 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", @@ -5348,6 +5681,8 @@ static void TestStringMatch() int main(int argc, char **argv) { + wxApp::CheckBuildOptions(wxBuildOptions()); + wxInitializer initializer; if ( !initializer ) { @@ -5453,7 +5788,7 @@ int main(int argc, char **argv) wxArrayString a1; a1.Add("tiger"); a1.Add("cat"); - a1.Add("lion"); + a1.Add("lion", 3); a1.Add("dog"); a1.Add("human"); a1.Add("ape"); @@ -5468,8 +5803,8 @@ int main(int argc, char **argv) wxSortedArrayString a3(a1); PrintArray("a3", a3); - puts("*** After deleting a string from a1"); - a1.Remove(2); + puts("*** After deleting three strings from a1"); + a1.Remove(2,3); PrintArray("a1", a1); PrintArray("a2", a2); @@ -5493,14 +5828,14 @@ int main(int argc, char **argv) PrintArray("a1", a1); TestArrayOfObjects(); + TestArrayOfUShorts(); } - else - { - TestArrayOfInts(); - } + + TestArrayOfInts(); #endif // TEST_ARRAYS #ifdef TEST_DIR + TestDirExists(); if ( TEST_ALL ) { TestDirEnum(); @@ -5565,6 +5900,7 @@ int main(int argc, char **argv) { wxFileName fn; fn.Assign("c:\\foo", "bar.baz"); + fn.Assign("/u/os9-port/Viewer/tvision/WEI2HZ-3B3-14_05-04-00MSC1.asc"); DumpFileName(fn); } @@ -5583,6 +5919,7 @@ int main(int argc, char **argv) #ifdef TEST_FILETIME TestFileGetTimes(); + if ( 0 ) TestFileSetTimes(); #endif // TEST_FILETIME @@ -5654,7 +5991,9 @@ int main(int argc, char **argv) { TestOsInfo(); TestUserInfo(); - TestDiskInfo(); + + if ( TEST_INTERACTIVE ) + TestDiskInfo(); } #endif // TEST_INFO_FUNCTIONS @@ -5711,9 +6050,11 @@ int main(int argc, char **argv) TestJoinableThreads(); TestThreadSuspend(); TestThreadDelete(); + TestThreadConditions(); + TestThreadExec(); } - TestThreadConditions(); + TestSemaphore(); #endif // TEST_THREADS #ifdef TEST_TIMER @@ -5756,8 +6097,13 @@ int main(int argc, char **argv) TestVCardWrite(); #endif // TEST_VCARD +#ifdef TEST_VOLUME + TestFSVolume(); +#endif // TEST_VOLUME + #ifdef TEST_WCHAR TestUtf8(); + TestEncodingConverter(); #endif // TEST_WCHAR #ifdef TEST_ZIP