blind fix for latest mingw32 3.1

[wxWidgets.git] / samples / console / console.cpp

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 03a237b9b1c5652df6a9d97dbef98ef748694d2f..c1e61a1bda473537b349b2635de4b5ebdb1ea503 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -91,7 +91,7 @@
     #undef TEST_ALL
     static const bool TEST_ALL = TRUE;
 #else
-    #define TEST_ARRAYS
+    #define TEST_MIME
 
     static const bool TEST_ALL = FALSE;
 #endif
@@ -307,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);
@@ -395,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
 
 // ----------------------------------------------------------------------------
@@ -822,6 +866,7 @@ static struct FileNameInfo
     { _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
@@ -1695,6 +1740,7 @@ static void TestMimeFilename()
         _T("readme.txt"),
         _T("document.pdf"),
         _T("image.gif"),
+        _T("picture.jpeg"),
     };
 
     for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
@@ -2390,6 +2436,10 @@ static void TestRegExInteractive()
 // database
 // ----------------------------------------------------------------------------
 
+#if !wxUSE_ODBC
+    #undef TEST_ODBC
+#endif
+
 #ifdef TEST_ODBC
 
 #include <wx/db.h>
@@ -3346,7 +3396,7 @@ static void TestVCardWrite()
 // wxVolume tests
 // ----------------------------------------------------------------------------
 
-#if !wxUSE_FSVOLUME
+#if !defined(__WIN32__) || !wxUSE_FSVOLUME
     #undef TEST_VOLUME
 #endif
 
@@ -3577,16 +3627,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)");
@@ -3831,7 +3881,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);
@@ -3844,7 +3894,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));
         }
     }
 
@@ -5035,18 +5085,18 @@ public:
 
     virtual ExitCode Entry()
     {
-        wxPrintf(_T("%s: Thread %d starting to wait for semaphore...\n"),
-                 wxDateTime::Now().FormatTime().c_str(), m_i);
+        wxPrintf(_T("%s: Thread #%d (%ld) starting to wait for semaphore...\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());
 
         m_sem->Wait();
 
-        wxPrintf(_T("%s: Thread %d acquired the semaphore.\n"),
-                 wxDateTime::Now().FormatTime().c_str(), m_i);
+        wxPrintf(_T("%s: Thread #%d (%ld) acquired the semaphore.\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());
 
         Sleep(1000);
 
-        wxPrintf(_T("%s: Thread %d releasing the semaphore.\n"),
-                 wxDateTime::Now().FormatTime().c_str(), m_i);
+        wxPrintf(_T("%s: Thread #%d (%ld) releasing the semaphore.\n"),
+                 wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());
 
         m_sem->Post();
 
@@ -5787,6 +5837,7 @@ int main(int argc, char **argv)
 #endif // TEST_ARRAYS
 
 #ifdef TEST_DIR
+    TestDirExists();
     if ( TEST_ALL )
     {
         TestDirEnum();
@@ -5847,7 +5898,7 @@ int main(int argc, char **argv)
 #endif // TEST_FILE
 
 #ifdef TEST_FILENAME
-    if ( 1 )
+    if ( 0 )
     {
         wxFileName fn;
         fn.Assign("c:\\foo", "bar.baz");
@@ -5856,6 +5907,7 @@ int main(int argc, char **argv)
         DumpFileName(fn);
     }
 
+    TestFileNameConstruction();
     if ( TEST_ALL )
     {
         TestFileNameConstruction();
@@ -5931,10 +5983,9 @@ int main(int argc, char **argv)
     {
         TestMimeEnum();
         TestMimeOverride();
-        TestMimeFilename();
+        TestMimeAssociate();
     }
-
-    TestMimeAssociate();
+    TestMimeFilename();
 #endif // TEST_MIME
 
 #ifdef TEST_INFO_FUNCTIONS