// conditional compilation
// ----------------------------------------------------------------------------
+/*
+ A note about all these conditional compilation macros: this file is used
+ both as a test suite for various non-GUI wxWindows classes and as a
+ scratchpad for quick tests. So there are two compilation modes: if you
+ define TEST_ALL all tests are run, otherwise you may enable the individual
+ tests individually in the "#else" branch below.
+ */
+
// what to test (in alphabetic order)? uncomment the line below to do all tests
-//#define TEST_ALL
+// #define TEST_ALL
#ifdef TEST_ALL
#define TEST_ARRAYS
#define TEST_CHARSET
#define TEST_FILETIME
#define TEST_FTP
#define TEST_HASH
+ #define TEST_HASHMAP
#define TEST_INFO_FUNCTIONS
#define TEST_LIST
#define TEST_LOCALE
#define TEST_WCHAR
#define TEST_ZIP
#define TEST_ZLIB
+
+ #undef TEST_ALL
+ static const bool TEST_ALL = TRUE;
#else
- #define TEST_CMDLINE
+ #define TEST_THREADS
+
+ static const bool TEST_ALL = FALSE;
#endif
-#ifdef TEST_SNGLINST
- #include "wx/snglinst.h"
-#endif // TEST_SNGLINST
+// some tests are interactive, define this to run them
+#ifdef TEST_INTERACTIVE
+ #undef TEST_INTERACTIVE
+
+ static const bool TEST_INTERACTIVE = FALSE;
+#else
+ static const bool TEST_INTERACTIVE = FALSE;
+#endif
// ----------------------------------------------------------------------------
// test class for container objects
printf("\targc = %u\n", count);
for ( size_t arg = 0; arg < count; arg++ )
{
- printf("\targv[%u] = %s\n", arg, args[arg]);
+ printf("\targv[%u] = %s\n", arg, args[arg].c_str());
}
}
}
#include "wx/filename.h"
+static void DumpFileName(const wxFileName& fn)
+{
+ wxString full = fn.GetFullPath();
+
+ 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"),
+ full.c_str(), vol.c_str(), path.c_str(), name.c_str(), ext.c_str());
+}
+
static struct FileNameInfo
{
const wxChar *fullname;
+ const wxChar *volume;
const wxChar *path;
const wxChar *name;
const wxChar *ext;
+ bool isAbsolute;
+ wxPathFormat format;
} filenames[] =
{
- { _T("/usr/bin/ls"), _T("/usr/bin"), _T("ls"), _T("") },
- { _T("/usr/bin/"), _T("/usr/bin"), _T(""), _T("") },
- { _T("~/.zshrc"), _T("~"), _T(".zshrc"), _T("") },
- { _T("../../foo"), _T("../.."), _T("foo"), _T("") },
- { _T("foo.bar"), _T(""), _T("foo"), _T("bar") },
- { _T("~/foo.bar"), _T("~"), _T("foo"), _T("bar") },
- { _T("Mahogany-0.60/foo.bar"), _T("Mahogany-0.60"), _T("foo"), _T("bar") },
- { _T("/tmp/wxwin.tar.bz"), _T("/tmp"), _T("wxwin.tar"), _T("bz") },
+ // 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 },
+
+ // 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 },
+
+ // 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()
for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
{
- wxFileName fn(filenames[n].fullname, wxPATH_UNIX);
+ const FileNameInfo& fni = filenames[n];
+
+ wxFileName fn(fni.fullname, fni.format);
- printf("Filename: '%s'\t", fn.GetFullPath().c_str());
- if ( !fn.Normalize(wxPATH_NORM_ALL, _T(""), wxPATH_UNIX) )
+ wxString fullname = fn.GetFullPath(fni.format);
+ if ( fullname != fni.fullname )
+ {
+ printf("ERROR: fullname should be '%s'\n", fni.fullname);
+ }
+
+ bool isAbsolute = fn.IsAbsolute();
+ printf("'%s' is %s (%s)\n\t",
+ fullname.c_str(),
+ isAbsolute ? "absolute" : "relative",
+ isAbsolute == fni.isAbsolute ? "ok" : "ERROR");
+
+ if ( !fn.Normalize(wxPATH_NORM_ALL, _T(""), fni.format) )
{
puts("ERROR (couldn't be normalized)");
}
else
{
- printf("normalized: '%s'\n", fn.GetFullPath().c_str());
+ printf("normalized: '%s'\n", fn.GetFullPath(fni.format).c_str());
}
}
for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
{
- const FileNameInfo &fni = filenames[n];
- wxString path, name, ext;
- wxFileName::SplitPath(fni.fullname, &path, &name, &ext);
+ const FileNameInfo& fni = filenames[n];
+ wxString volume, path, name, ext;
+ wxFileName::SplitPath(fni.fullname,
+ &volume, &path, &name, &ext, fni.format);
- printf("%s -> path = '%s', name = '%s', ext = '%s'",
- fni.fullname, path.c_str(), name.c_str(), ext.c_str());
+ printf("%s -> volume = '%s', path = '%s', name = '%s', ext = '%s'",
+ fni.fullname,
+ volume.c_str(), path.c_str(), name.c_str(), ext.c_str());
+
+ if ( volume != fni.volume )
+ printf(" (ERROR: volume = '%s')", fni.volume);
if ( path != fni.path )
printf(" (ERROR: path = '%s')", fni.path);
if ( name != fni.name )
printf(" (ERROR: name = '%s')", fni.name);
if ( ext != fni.ext )
printf(" (ERROR: ext = '%s')", fni.ext);
+
puts("");
}
+}
- puts("");
+static void TestFileNameTemp()
+{
+ puts("*** testing wxFileName temp file creation ***");
+
+ static const char *tmpprefixes[] =
+ {
+ "foo",
+ "/tmp/foo",
+ "..",
+ "../bar",
+ "/tmp/foo/bar", // this one must be an error
+ };
+
+ for ( size_t n = 0; n < WXSIZEOF(tmpprefixes); n++ )
+ {
+ wxString path = wxFileName::CreateTempFileName(tmpprefixes[n]);
+ if ( !path.empty() )
+ {
+ printf("Prefix '%s'\t-> temp file '%s'\n",
+ tmpprefixes[n], path.c_str());
+
+ if ( !wxRemoveFile(path) )
+ {
+ wxLogWarning("Failed to remove temp file '%s'", path.c_str());
+ }
+ }
+ }
+}
+
+static void TestFileNameMakeRelative()
+{
+ puts("*** testing wxFileName::MakeRelativeTo() ***");
+
+ for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
+ {
+ const FileNameInfo& fni = filenames[n];
+
+ wxFileName fn(fni.fullname, fni.format);
+
+ // choose the base dir of the same format
+ wxString base;
+ switch ( fni.format )
+ {
+ case wxPATH_UNIX:
+ base = "/usr/bin/";
+ break;
+
+ case wxPATH_DOS:
+ base = "c:\\";
+ break;
+
+ case wxPATH_MAC:
+ case wxPATH_VMS:
+ // TODO: I don't know how this is supposed to work there
+ continue;
+
+ case wxPATH_NATIVE: // make gcc happy
+ default:
+ wxFAIL_MSG( "unexpected path format" );
+ }
+
+ printf("'%s' relative to '%s': ",
+ fn.GetFullPath(fni.format).c_str(), base.c_str());
+
+ if ( !fn.MakeRelativeTo(base, fni.format) )
+ {
+ puts("unchanged");
+ }
+ else
+ {
+ printf("'%s'\n", fn.GetFullPath(fni.format).c_str());
+ }
+ }
}
static void TestFileNameComparison()
{
wxFileName fn(_T("testdata.fc"));
- wxDateTime dtAccess, dtMod, dtChange;
if ( !fn.Touch() )
{
wxPrintf(_T("ERROR: Touch() failed.\n"));
#endif // TEST_HASH
+// ----------------------------------------------------------------------------
+// wxHashMap
+// ----------------------------------------------------------------------------
+
+#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 );
+WX_DECLARE_HASH_MAP( wxString, wxString, wxStringHash, wxStringEqual,
+ myStringHashMap );
+
+typedef myStringHashMap::iterator Itor;
+
+static void TestHashMap()
+{
+ puts("*** 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 )
+ {
+ printf("*** 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") )
+ {
+ printf("*** 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 )
+ {
+ printf("*** ERROR ITERATORS DO NOT TERMINATE! STOPPING NOW! ***\n");
+ return;
+ }
+
+ if( it->second != sh[it->first] )
+ {
+ printf("*** ERROR ITERATORS BROKEN! STOPPING NOW! ***\n");
+ return;
+ }
+ }
+
+ if( sh.size() != i )
+ {
+ printf("*** 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 )
+ {
+ printf("*** ERROR: COPY CTOR BROKEN %s ***\n", it->first.c_str());
+ }
+
+ if( h2[it->first] != it->second )
+ {
+ printf("*** ERROR: OPERATOR= BROKEN %s ***\n", it->first.c_str());
+ }
+ }
+
+ // 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() )
+ {
+ printf("*** ERROR: FOUND DELETED ELEMENT %u ***\n", i);
+ }
+ }
+ else
+ printf("*** ERROR: CANT FIND ELEMENT %u ***\n", i);
+ }
+ else
+ // test erase(key)
+ {
+ size_t c = sh.erase( buf );
+ if( c != 1 )
+ printf("*** ERROR: SHOULD RETURN 1 ***\n");
+
+ if( sh.find( buf ) != sh.end() )
+ {
+ printf("*** ERROR: FOUND DELETED ELEMENT %u ***\n", i);
+ }
+ }
+
+ // count should decrease
+ if( sh.size() != sz - 1 )
+ {
+ printf("*** ERROR: COUNT DID NOT DECREASE ***\n");
+ }
+ }
+
+ printf("*** Finished testing wxHashMap ***\n");
+}
+
+#endif TEST_HASHMAP
+
// ----------------------------------------------------------------------------
// wxList
// ----------------------------------------------------------------------------
{
static const char *languageNames[] =
{
- "DEFAULT",
- "UNKNOWN",
+ "DEFAULT",
+ "UNKNOWN",
"ABKHAZIAN",
"AFAR",
"AFRIKAANS",
};
const wxChar *pattern = _T("([a-z]+)[^0-9]*([0-9]+)");
- wxRegEx re = pattern;
+ wxRegEx re(pattern);
wxPrintf(_T("Using pattern '%s' for replacement.\n"), pattern);
gs_cond.Signal();
}
-void TestDetachedThreads()
+static void TestDetachedThreads()
{
puts("\n*** Testing detached threads ***");
puts("");
}
-void TestJoinableThreads()
+static void TestJoinableThreads()
{
puts("\n*** Testing a joinable thread (a loooong calculation...) ***");
(unsigned long)thread.Wait());
}
-void TestThreadSuspend()
+static void TestThreadSuspend()
{
puts("\n*** Testing thread suspend/resume functions ***");
puts("");
}
-void TestThreadDelete()
+static void TestThreadDelete()
{
// As above, using Sleep() is only for testing here - we must use some
// synchronisation object instead to ensure that the thread is still
puts("");
}
+// wxCondition test code
+// ----------------------------------------------------------------------------
+
+class MyWaitingThread : public wxThread
+{
+public:
+ MyWaitingThread(wxCondition *condition)
+ {
+ m_condition = condition;
+
+ Create();
+ }
+
+ virtual ExitCode Entry()
+ {
+ printf("Thread %lu has started running.", GetId());
+ fflush(stdout);
+
+ gs_cond.Signal();
+
+ printf("Thread %lu starts to wait...\n", GetId());
+ fflush(stdout);
+
+ m_condition->Wait();
+
+ printf("Thread %lu finished to wait, exiting.\n", GetId());
+ fflush(stdout);
+
+ return 0;
+ }
+
+private:
+ wxCondition *m_condition;
+};
+
+static void TestThreadConditions()
+{
+ wxCondition condition;
+
+ // create and launch threads
+ MyWaitingThread *threads[2];
+
+ size_t n;
+ for ( n = 0; n < WXSIZEOF(threads); n++ )
+ {
+ threads[n] = new MyWaitingThread(&condition);
+ }
+
+ for ( n = 0; n < WXSIZEOF(threads); n++ )
+ {
+ threads[n]->Run();
+ }
+
+ // wait until all threads run
+ printf("Main thread is waiting for the threads to start: ");
+ fflush(stdout);
+
+ size_t nRunning = 0;
+ while ( nRunning < WXSIZEOF(threads) )
+ {
+ gs_cond.Wait();
+
+ putchar('.');
+ fflush(stdout);
+
+ nRunning++;
+ }
+
+ puts("\nMain thread: all threads started up.");
+ fflush(stdout);
+
+ // now wake them up
+#if 0
+ printf("Main thread: about to signal the condition.\n");
+ fflush(stdout);
+ condition.Signal();
+#endif // 0
+
+ printf("Main thread: about to broadcast the condition.\n");
+ fflush(stdout);
+ condition.Broadcast();
+
+ // give them time to terminate (dirty)
+ wxThread::Sleep(300);
+}
+
#endif // TEST_THREADS
// ----------------------------------------------------------------------------
// entry point
// ----------------------------------------------------------------------------
+#ifdef TEST_SNGLINST
+ #include "wx/snglinst.h"
+#endif // TEST_SNGLINST
+
int main(int argc, char **argv)
{
wxInitializer initializer;
#endif // TEST_CMDLINE
#ifdef TEST_STRINGS
- if ( 0 )
+ if ( TEST_ALL )
{
TestPChar();
TestString();
TestStringTokenizer();
TestStringReplace();
}
- TestStringMatch();
+ else
+ {
+ TestStringMatch();
+ }
#endif // TEST_STRINGS
#ifdef TEST_ARRAYS
- if ( 0 )
+ if ( TEST_ALL )
{
- wxArrayString a1;
- a1.Add("tiger");
- a1.Add("cat");
- a1.Add("lion");
- a1.Add("dog");
- a1.Add("human");
- a1.Add("ape");
+ wxArrayString a1;
+ a1.Add("tiger");
+ a1.Add("cat");
+ a1.Add("lion");
+ a1.Add("dog");
+ a1.Add("human");
+ a1.Add("ape");
- puts("*** Initially:");
+ puts("*** Initially:");
- PrintArray("a1", a1);
+ PrintArray("a1", a1);
- wxArrayString a2(a1);
- PrintArray("a2", a2);
+ wxArrayString a2(a1);
+ PrintArray("a2", a2);
- wxSortedArrayString a3(a1);
- PrintArray("a3", a3);
+ wxSortedArrayString a3(a1);
+ PrintArray("a3", a3);
- puts("*** After deleting a string from a1");
- a1.Remove(2);
+ puts("*** After deleting a string from a1");
+ a1.Remove(2);
- PrintArray("a1", a1);
- PrintArray("a2", a2);
- PrintArray("a3", a3);
+ PrintArray("a1", a1);
+ PrintArray("a2", a2);
+ PrintArray("a3", a3);
- puts("*** After reassigning a1 to a2 and a3");
- a3 = a2 = a1;
- PrintArray("a2", a2);
- PrintArray("a3", a3);
+ puts("*** After reassigning a1 to a2 and a3");
+ a3 = a2 = a1;
+ PrintArray("a2", a2);
+ PrintArray("a3", a3);
- puts("*** After sorting a1");
- a1.Sort();
- PrintArray("a1", a1);
+ puts("*** After sorting a1");
+ a1.Sort();
+ PrintArray("a1", a1);
- puts("*** After sorting a1 in reverse order");
- a1.Sort(TRUE);
- PrintArray("a1", a1);
+ puts("*** After sorting a1 in reverse order");
+ a1.Sort(TRUE);
+ PrintArray("a1", a1);
- puts("*** After sorting a1 by the string length");
- a1.Sort(StringLenCompare);
- PrintArray("a1", a1);
+ puts("*** After sorting a1 by the string length");
+ a1.Sort(StringLenCompare);
+ PrintArray("a1", a1);
- TestArrayOfObjects();
+ TestArrayOfObjects();
+ }
+ else
+ {
+ TestArrayOfInts();
}
- TestArrayOfInts();
#endif // TEST_ARRAYS
#ifdef TEST_DIR
- if ( 0 )
+ if ( TEST_ALL )
+ {
TestDirEnum();
- TestDirTraverse();
+ TestDirTraverse();
+ }
#endif // TEST_DIR
#ifdef TEST_DLLLOADER
#endif // TEST_LOG
#ifdef TEST_FILE
- if ( 0 )
+ if ( TEST_ALL )
{
TestFileRead();
TestTextFileRead();
+ TestFileCopy();
}
- TestFileCopy();
#endif // TEST_FILE
#ifdef TEST_FILENAME
- TestFileNameSplit();
- if ( 0 )
+ if ( 1 )
+ {
+ wxFileName fn;
+ fn.Assign("c:\\foo", "bar.baz");
+
+ DumpFileName(fn);
+ }
+
+ if ( TEST_ALL )
{
TestFileNameConstruction();
+ TestFileNameMakeRelative();
+ TestFileNameSplit();
+ TestFileNameTemp();
TestFileNameCwd();
TestFileNameComparison();
TestFileNameOperations();
wxLog::AddTraceMask(FTP_TRACE_MASK);
if ( TestFtpConnect() )
{
- TestFtpFileSize();
- if ( 0 )
+ if ( TEST_ALL )
{
TestFtpList();
TestFtpDownload();
TestFtpMisc();
+ TestFtpFileSize();
TestFtpUpload();
}
- if ( 0 )
- TestFtpInteractive();
+
+ if ( TEST_INTERACTIVE )
+ TestFtpInteractive();
}
//else: connecting to the FTP server failed
if ( nCPUs != -1 )
wxThread::SetConcurrency(nCPUs);
- if ( argc > 1 && argv[1][0] == 't' )
- wxLog::AddTraceMask("thread");
-
- if ( 1 )
+ if ( 0 )
+ {
TestDetachedThreads();
- if ( 1 )
TestJoinableThreads();
- if ( 1 )
TestThreadSuspend();
- if ( 1 )
TestThreadDelete();
+ }
+ TestThreadConditions();
#endif // TEST_THREADS
#ifdef TEST_LONGLONG
{
TestSpeed();
}
- if ( 0 )
+
+ if ( TEST_ALL )
{
TestMultiplication();
TestDivision();
TestLongLongConversion();
TestBitOperations();
TestLongLongComparison();
+ TestLongLongPrint();
}
- TestLongLongPrint();
#endif // TEST_LONGLONG
#ifdef TEST_HASH
TestHash();
#endif // TEST_HASH
+#ifdef TEST_HASHMAP
+ TestHashMap();
+#endif // TEST_HASHMAP
+
#ifdef TEST_MIME
wxLog::AddTraceMask(_T("mime"));
if ( 1 )
#endif // TEST_MIME
#ifdef TEST_INFO_FUNCTIONS
- TestDiskInfo();
- if ( 0 )
+ if ( TEST_ALL )
{
TestOsInfo();
TestUserInfo();
+ TestDiskInfo();
}
#endif // TEST_INFO_FUNCTIONS
#ifdef TEST_REGEX
// TODO: write a real test using src/regex/tests file
- if ( 0 )
+ if ( TEST_ALL )
{
TestRegExCompile();
TestRegExMatch();
TestRegExSubmatch();
- TestRegExInteractive();
+ TestRegExReplacement();
+
+ if ( TEST_INTERACTIVE )
+ TestRegExInteractive();
}
- TestRegExReplacement();
#endif // TEST_REGEX
#ifdef TEST_REGISTRY
- if ( 0 )
- TestRegistryRead();
+ TestRegistryRead();
TestRegistryAssociation();
#endif // TEST_REGISTRY
#ifdef TEST_SOCKETS
- if ( 0 )
- {
- TestSocketServer();
- }
- TestSocketClient();
+ TestSocketServer();
+ TestSocketClient();
#endif // TEST_SOCKETS
#ifdef TEST_STREAMS
- if ( 0 )
TestFileStream();
TestMemoryStream();
#endif // TEST_STREAMS
#endif // TEST_TIMER
#ifdef TEST_DATETIME
- if ( 0 )
+ if ( TEST_ALL )
{
TestTimeSet();
TestTimeStatic();
TestTimeArithmetics();
TestTimeHolidays();
TestTimeFormat();
+ TestTimeSpanFormat();
TestTimeMS();
TestTimeZoneBug();
}
- TestTimeSpanFormat();
- if ( 0 )
+
+ if ( TEST_INTERACTIVE )
TestDateTimeInteractive();
#endif // TEST_DATETIME
#endif // TEST_USLEEP
#ifdef TEST_VCARD
- if ( 0 )
TestVCardRead();
TestVCardWrite();
#endif // TEST_VCARD
#endif // TEST_WCHAR
#ifdef TEST_ZIP
- if ( 0 )
- TestZipStreamRead();
+ TestZipStreamRead();
TestZipFileSystem();
#endif // TEST_ZIP
#ifdef TEST_ZLIB
- if ( 0 )
TestZlibStreamWrite();
TestZlibStreamRead();
#endif // TEST_ZLIB
projects / wxWidgets.git / blobdiff