#define TEST_LONGLONG
#define TEST_MIME
#define TEST_PATHLIST
+ #define TEST_ODBC
#define TEST_REGCONF
#define TEST_REGEX
#define TEST_REGISTRY
#undef TEST_ALL
static const bool TEST_ALL = TRUE;
#else
- #define TEST_THREADS
+ #define TEST_ARRAYS
static const bool TEST_ALL = FALSE;
#endif
myTestHashMap3 );
WX_DECLARE_HASH_MAP( unsigned short, unsigned, wxIntegerHash, wxIntegerEqual,
myTestHashMap4 );
-WX_DECLARE_HASH_MAP( wxString, wxString, wxStringHash, wxStringEqual,
- myStringHashMap );
+
+// same as:
+// WX_DECLARE_HASH_MAP( wxString, wxString, wxStringHash, wxStringEqual,
+// myStringHashMap );
+WX_DECLARE_STRING_HASH_MAP(wxString, myStringHashMap);
typedef myStringHashMap::iterator Itor;
printf("*** Finished testing wxHashMap ***\n");
}
-#endif TEST_HASHMAP
+#endif // TEST_HASHMAP
// ----------------------------------------------------------------------------
// wxList
#endif // TEST_REGEX
+// ----------------------------------------------------------------------------
+// database
+// ----------------------------------------------------------------------------
+
+#ifdef TEST_ODBC
+
+#include <wx/db.h>
+
+static void TestDbOpen()
+{
+ HENV henv;
+ wxDb db(henv);
+}
+
+#endif // TEST_ODBC
+
// ----------------------------------------------------------------------------
// registry and related stuff
// ----------------------------------------------------------------------------
puts("");
}
-// wxCondition test code
-// ----------------------------------------------------------------------------
-
class MyWaitingThread : public wxThread
{
public:
virtual ExitCode Entry()
{
- printf("Thread %lu has started running.", GetId());
+ printf("Thread %lu has started running.\n", GetId());
fflush(stdout);
gs_cond.Signal();
{
wxCondition condition;
+ // otherwise its difficult to understand which log messages pertain to
+ // which condition
+ wxLogTrace("thread", "Local condition var is %08x, gs_cond = %08x",
+ condition.GetId(), gs_cond.GetId());
+
// create and launch threads
- MyWaitingThread *threads[2];
+ MyWaitingThread *threads[10];
size_t n;
for ( n = 0; n < WXSIZEOF(threads); n++ )
}
// wait until all threads run
- printf("Main thread is waiting for the threads to start: ");
+ puts("Main thread is waiting for the other threads to start");
fflush(stdout);
size_t nRunning = 0;
{
gs_cond.Wait();
- putchar('.');
- fflush(stdout);
-
nRunning++;
+
+ printf("Main thread: %u already running\n", nRunning);
+ fflush(stdout);
}
- puts("\nMain thread: all threads started up.");
+ puts("Main thread: all threads started up.");
fflush(stdout);
- // now wake them up
-#if 0
+ wxThread::Sleep(500);
+
+#if 1
+ // now wake one of them up
printf("Main thread: about to signal the condition.\n");
fflush(stdout);
condition.Signal();
-#endif // 0
+#endif
+
+ wxThread::Sleep(200);
+ // wake all the (remaining) threads up, so that they can exit
printf("Main thread: about to broadcast the condition.\n");
fflush(stdout);
condition.Broadcast();
- // give them time to terminate (dirty)
- wxThread::Sleep(300);
+ // give them time to terminate (dirty!)
+ wxThread::Sleep(500);
}
#endif // TEST_THREADS
#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());
- }
-}
+#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(Short, short);
+DefineCompare(Int, int);
+
+// test compilation of all macros
+WX_DEFINE_ARRAY(short, wxArrayShort);
+WX_DEFINE_SORTED_ARRAY(short, wxSortedArrayShortNoCmp);
+WX_DEFINE_SORTED_ARRAY_CMP(short, ShortCompareValues, wxSortedArrayShort);
+WX_DEFINE_SORTED_ARRAY_CMP(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());
}
}
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); \
+ a.Add(5); \
+ a.Add(3); \
+ \
+ 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(Short);
+TestArrayOf(Int);
static void TestArrayOfObjects()
{
PrintArray("a1", a1);
TestArrayOfObjects();
+ TestArrayOfShorts();
}
- else
- {
- TestArrayOfInts();
- }
+
+ TestArrayOfInts();
#endif // TEST_ARRAYS
#ifdef TEST_DIR
TestFtpWuFtpd();
#endif // TEST_FTP
-#ifdef TEST_THREADS
- int nCPUs = wxThread::GetCPUCount();
- printf("This system has %d CPUs\n", nCPUs);
- if ( nCPUs != -1 )
- wxThread::SetConcurrency(nCPUs);
-
- if ( 0 )
- {
- TestDetachedThreads();
- TestJoinableThreads();
- TestThreadSuspend();
- TestThreadDelete();
- }
-
- TestThreadConditions();
-#endif // TEST_THREADS
-
#ifdef TEST_LONGLONG
// seed pseudo random generator
srand((unsigned)time(NULL));
#ifdef TEST_MIME
wxLog::AddTraceMask(_T("mime"));
- if ( 1 )
+ if ( TEST_ALL )
{
TestMimeEnum();
TestMimeOverride();
TestMimeFilename();
}
- else
- TestMimeAssociate();
+
+ TestMimeAssociate();
#endif // TEST_MIME
#ifdef TEST_INFO_FUNCTIONS
TestPathList();
#endif // TEST_PATHLIST
+#ifdef TEST_ODBC
+ TestDbOpen();
+#endif // TEST_ODBC
+
#ifdef TEST_REGCONF
TestRegConfWrite();
#endif // TEST_REGCONF
TestMemoryStream();
#endif // TEST_STREAMS
+#ifdef TEST_THREADS
+ int nCPUs = wxThread::GetCPUCount();
+ printf("This system has %d CPUs\n", nCPUs);
+ if ( nCPUs != -1 )
+ wxThread::SetConcurrency(nCPUs);
+
+ if ( TEST_ALL )
+ {
+ TestDetachedThreads();
+ TestJoinableThreads();
+ TestThreadSuspend();
+ TestThreadDelete();
+ }
+
+ TestThreadConditions();
+#endif // TEST_THREADS
+
#ifdef TEST_TIMER
TestStopWatch();
#endif // TEST_TIMER
projects / wxWidgets.git / blobdiff