no, we shouldn't inconditionally add the separator at the end even if wxPATH_GET_SEPA...

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

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 8d363fc5f9f65b133f9433474301e795476a3eb0..5a8015c7857113d4192083a2da46b2737232ccb1 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_DIR
 
     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
 
 // ----------------------------------------------------------------------------
@@ -783,6 +827,14 @@ static void DumpFileName(const wxFileName& fn)
              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
@@ -2382,6 +2434,10 @@ static void TestRegExInteractive()
 // database
 // ----------------------------------------------------------------------------
 
+#if !wxUSE_ODBC
+    #undef TEST_ODBC
+#endif
+
 #ifdef TEST_ODBC
 
 #include <wx/db.h>
@@ -3338,7 +3394,7 @@ static void TestVCardWrite()
 // wxVolume tests
 // ----------------------------------------------------------------------------
 
-#if !wxUSE_FSVOLUME
+#if !defined(__WIN32__) || !wxUSE_FSVOLUME
     #undef TEST_VOLUME
 #endif
 
@@ -3569,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)");
@@ -3823,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);
@@ -3836,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));
         }
     }
 
@@ -5625,6 +5681,8 @@ static void TestStringMatch()
 
 int main(int argc, char **argv)
 {
+    wxApp::CheckBuildOptions(wxBuildOptions());
+
     wxInitializer initializer;
     if ( !initializer )
     {
@@ -5777,6 +5835,7 @@ int main(int argc, char **argv)
 #endif // TEST_ARRAYS
 
 #ifdef TEST_DIR
+    TestDirExists();
     if ( TEST_ALL )
     {
         TestDirEnum();
@@ -5837,10 +5896,11 @@ int main(int argc, char **argv)
 #endif // TEST_FILE
 
 #ifdef TEST_FILENAME
-    if ( 0 )
+    if ( 1 )
     {
         wxFileName fn;
         fn.Assign("c:\\foo", "bar.baz");
+        fn.Assign("/u/os9-port/Viewer/tvision/WEI2HZ-3B3-14_05-04-00MSC1.asc");
 
         DumpFileName(fn);
     }
@@ -5859,6 +5919,7 @@ int main(int argc, char **argv)
 
 #ifdef TEST_FILETIME
     TestFileGetTimes();
+    if ( 0 )
     TestFileSetTimes();
 #endif // TEST_FILETIME