Initial checkin of the wxFrame support added by Aleks G.

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

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index bf00e4a65c09e50e91efa828e2ff9021f1af995d..59d0bda4c0f2e4dbe41ea50efe9101fd0257ad28 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -44,8 +44,8 @@
 //#define TEST_EXECUTE
 //#define TEST_FILE
 //#define TEST_FILECONF
 //#define TEST_EXECUTE
 //#define TEST_FILE
 //#define TEST_FILECONF

-#define TEST_FILENAME
-//#define TEST_FTP
+//#define TEST_FILENAME
+#define TEST_FTP

 //#define TEST_HASH
 //#define TEST_LIST
 //#define TEST_LOG
 //#define TEST_HASH
 //#define TEST_LIST
 //#define TEST_LOG


@@ -596,21 +596,31 @@ static void TestFileConfRead()
 
 #include <wx/filename.h>
 
 
 #include <wx/filename.h>
 

+static struct FileNameInfo
+{
+    const wxChar *fullname;
+    const wxChar *path;
+    const wxChar *name;
+    const wxChar *ext;
+} 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") },
+};
+

 static void TestFileNameConstruction()
 {
     puts("*** testing wxFileName construction ***");
 
 static void TestFileNameConstruction()
 {
     puts("*** testing wxFileName construction ***");
 

-    static const wxChar *filenames[] =
-    {
-        _T("/usr/bin/ls"),
-        _T("/usr/bin/"),
-        _T("~/.zshrc"),
-        _T("../../foo"),
-    };
-

     for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
     {
     for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
     {

-        wxFileName fn(filenames[n], wxPATH_UNIX);
+        wxFileName fn(filenames[n].fullname, wxPATH_UNIX);

 
         printf("Filename: '%s'\t", fn.GetFullPath().c_str());
         if ( !fn.Normalize(wxPATH_NORM_ALL, _T(""), wxPATH_UNIX) )
 
         printf("Filename: '%s'\t", fn.GetFullPath().c_str());
         if ( !fn.Normalize(wxPATH_NORM_ALL, _T(""), wxPATH_UNIX) )


@@ -626,6 +636,30 @@ static void TestFileNameConstruction()
     puts("");
 }
 
     puts("");
 }
 

+static void TestFileNameSplit()
+{
+    puts("*** testing wxFileName splitting ***");
+
+    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);
+
+        printf("%s -> path = '%s', name = '%s', ext = '%s'",
+               fni.fullname, path.c_str(), name.c_str(), ext.c_str());
+        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 TestFileNameComparison()
 {
     // TODO!
 static void TestFileNameComparison()
 {
     // TODO!


@@ -779,6 +813,8 @@ static wxMimeTypesManager g_mimeManager;
 
 static void TestMimeEnum()
 {
 
 static void TestMimeEnum()
 {

+    wxPuts(_T("*** Testing wxMimeTypesManager::EnumAllFileTypes() ***\n"));
+

     wxArrayString mimetypes;
 
     size_t count = g_mimeManager.EnumAllFileTypes(mimetypes);
     wxArrayString mimetypes;
 
     size_t count = g_mimeManager.EnumAllFileTypes(mimetypes);


@@ -874,24 +910,24 @@ static void TestMimeAssociate()
 {
     wxPuts(_T("*** Testing creation of filetype association ***\n"));
 
 {
     wxPuts(_T("*** Testing creation of filetype association ***\n"));
 

-    wxFileType *ft = g_mimeManager.Associate
-                     (
-                        _T(".xyz"),
-                        _T("application/x-xyz"),
-                        _T("XYZFile"), // filetype (MSW only)
-                        _T("XYZ File") // description (Unix only)
-                     );
+    wxFileTypeInfo ftInfo(
+                            _T("application/x-xyz"),
+                            _T("xyzview '%s'"), // open cmd
+                            _T(""),             // print cmd
+                            _T("XYZ File")  // description
+                            _T(".xyz"),     // extensions
+                            NULL            // end of extensions
+                         );
+    ftInfo.SetShortDesc(_T("XYZFile")); // used under Win32 only
+
+    wxFileType *ft = g_mimeManager.Associate(ftInfo);

     if ( !ft )
     {
         wxPuts(_T("ERROR: failed to create association!"));
     }
     else
     {
     if ( !ft )
     {
         wxPuts(_T("ERROR: failed to create association!"));
     }
     else
     {

-        if ( !ft->SetOpenCommand(_T("myprogram")) )
-        {
-            wxPuts(_T("ERROR: failed to set open command!"));
-        }
-
+        // TODO: read it back

         delete ft;
     }
 }
         delete ft;
     }
 }


@@ -1472,85 +1508,78 @@ static void TestSocketClient()
 
 #endif // TEST_SOCKETS
 
 
 #endif // TEST_SOCKETS
 

+// ----------------------------------------------------------------------------
+// FTP
+// ----------------------------------------------------------------------------
+

 #ifdef TEST_FTP
 
 #include <wx/protocol/ftp.h>
 
 #ifdef TEST_FTP
 
 #include <wx/protocol/ftp.h>
 

-static void TestProtocolFtp()
+static wxFTP ftp;
+
+#define FTP_ANONYMOUS
+
+#ifdef FTP_ANONYMOUS
+    static const char *directory = "/pub";
+    static const char *filename = "welcome.msg";
+#else
+    static const char *directory = "/etc";
+    static const char *filename = "issue";
+#endif
+
+static bool TestFtpConnect()

 {
 {

-    puts("*** Testing wxFTP download ***\n");
+    puts("*** Testing FTP connect ***");

 
 

-    wxFTP ftp;
-#if 1
+#ifdef FTP_ANONYMOUS

     static const char *hostname = "ftp.wxwindows.org";
     static const char *hostname = "ftp.wxwindows.org";

-    static const char *directory = "pub";

 
     printf("--- Attempting to connect to %s:21 anonymously...\n", hostname);
 
     printf("--- Attempting to connect to %s:21 anonymously...\n", hostname);

-#else
+#else // !FTP_ANONYMOUS

     static const char *hostname = "localhost";
     static const char *hostname = "localhost";

-    static const char *user = "zeitlin";
-    static const char *directory = "/tmp";

 
 

+    char user[256];
+    fgets(user, WXSIZEOF(user), stdin);
+    user[strlen(user) - 1] = '\0'; // chop off '\n'

     ftp.SetUser(user);
     ftp.SetUser(user);

-    ftp.SetPassword("password");
+
+    char password[256];
+    printf("Password for %s: ", password);
+    fgets(password, WXSIZEOF(password), stdin);
+    password[strlen(password) - 1] = '\0'; // chop off '\n'
+    ftp.SetPassword(password);

 
     printf("--- Attempting to connect to %s:21 as %s...\n", hostname, user);
 
     printf("--- Attempting to connect to %s:21 as %s...\n", hostname, user);

-#endif
+#endif // FTP_ANONYMOUS/!FTP_ANONYMOUS

 
     if ( !ftp.Connect(hostname) )
     {
         printf("ERROR: failed to connect to %s\n", hostname);
 
     if ( !ftp.Connect(hostname) )
     {
         printf("ERROR: failed to connect to %s\n", hostname);

+
+        return FALSE;

     }
     else
     {
         printf("--- Connected to %s, current directory is '%s'\n",
                hostname, ftp.Pwd().c_str());
     }
     else
     {
         printf("--- Connected to %s, current directory is '%s'\n",
                hostname, ftp.Pwd().c_str());

+    }

 
 

-        // test CWD
-        if ( !ftp.ChDir(directory) )
-        {
-            printf("ERROR: failed to cd to %s\n", directory);
-        }
-
-        // test NLIST and LIST
-        wxArrayString files;
-        if ( !ftp.GetFilesList(files) )
-        {
-            puts("ERROR: failed to get NLIST of files");
-        }
-        else
-        {
-            printf("Brief list of files under '%s':\n", ftp.Pwd().c_str());
-            size_t count = files.GetCount();
-            for ( size_t n = 0; n < count; n++ )
-            {
-                printf("\t%s\n", files[n].c_str());
-            }
-            puts("End of the file list");
-        }
-
-        if ( !ftp.GetDirList(files) )
-        {
-            puts("ERROR: failed to get LIST of files");
-        }
-        else
-        {
-            printf("Detailed list of files under '%s':\n", ftp.Pwd().c_str());
-            size_t count = files.GetCount();
-            for ( size_t n = 0; n < count; n++ )
-            {
-                printf("\t%s\n", files[n].c_str());
-            }
-            puts("End of the file list");
-        }
-
-        if ( !ftp.ChDir(_T("..")) )
-        {
-            puts("ERROR: failed to cd to ..");
-        }
+    return TRUE;
+}

 
 

-        // test RETR
-        static const char *filename = "welcome.msg";
+// test (fixed?) wxFTP bug with wu-ftpd >= 2.6.0?
+static void TestFtpWuFtpd()
+{
+    wxFTP ftp;
+    static const char *hostname = "ftp.eudora.com";
+    if ( !ftp.Connect(hostname) )
+    {
+        printf("ERROR: failed to connect to %s\n", hostname);
+    }
+    else
+    {
+        static const char *filename = "eudora/pubs/draft-gellens-submit-09.txt";

         wxInputStream *in = ftp.GetInputStream(filename);
         if ( !in )
         {
         wxInputStream *in = ftp.GetInputStream(filename);
         if ( !in )
         {


@@ -1568,85 +1597,237 @@ static void TestProtocolFtp()
             }
             else
             {
             }
             else
             {

-                printf("\nContents of %s:\n%s\n", filename, data);
+                printf("Successfully retrieved the file.\n");

             }
 
             delete [] data;
             delete in;
         }
             }
 
             delete [] data;
             delete in;
         }

+    }
+}
+
+static void TestFtpList()
+{
+    puts("*** Testing wxFTP file listing ***\n");
+
+    // test CWD
+    if ( !ftp.ChDir(directory) )
+    {
+        printf("ERROR: failed to cd to %s\n", directory);
+    }
+
+    printf("Current directory is '%s'\n", ftp.Pwd().c_str());

 
 

-        // test some other FTP commands
-        if ( ftp.SendCommand("STAT") != '2' )
+    // test NLIST and LIST
+    wxArrayString files;
+    if ( !ftp.GetFilesList(files) )
+    {
+        puts("ERROR: failed to get NLIST of files");
+    }
+    else
+    {
+        printf("Brief list of files under '%s':\n", ftp.Pwd().c_str());
+        size_t count = files.GetCount();
+        for ( size_t n = 0; n < count; n++ )

         {
         {

-            puts("ERROR: STAT failed");
+            printf("\t%s\n", files[n].c_str());

         }
         }

-        else
+        puts("End of the file list");
+    }
+
+    if ( !ftp.GetDirList(files) )
+    {
+        puts("ERROR: failed to get LIST of files");
+    }
+    else
+    {
+        printf("Detailed list of files under '%s':\n", ftp.Pwd().c_str());
+        size_t count = files.GetCount();
+        for ( size_t n = 0; n < count; n++ )

         {
         {

-            printf("STAT returned:\n\n%s\n", ftp.GetLastResult().c_str());
+            printf("\t%s\n", files[n].c_str());

         }
         }

+        puts("End of the file list");
+    }

 
 

-        if ( ftp.SendCommand("HELP SITE") != '2' )
+    if ( !ftp.ChDir(_T("..")) )
+    {
+        puts("ERROR: failed to cd to ..");
+    }
+
+    printf("Current directory is '%s'\n", ftp.Pwd().c_str());
+}
+
+static void TestFtpDownload()
+{
+    puts("*** Testing wxFTP download ***\n");
+
+    // test RETR
+    wxInputStream *in = ftp.GetInputStream(filename);
+    if ( !in )
+    {
+        printf("ERROR: couldn't get input stream for %s\n", filename);
+    }
+    else
+    {
+        size_t size = in->StreamSize();
+        printf("Reading file %s (%u bytes)...", filename, size);
+        fflush(stdout);
+
+        char *data = new char[size];
+        if ( !in->Read(data, size) )

         {
         {

-            puts("ERROR: HELP SITE failed");
+            puts("ERROR: read error");

         }
         else
         {
         }
         else
         {

-            printf("The list of site-specific commands:\n\n%s\n",
-                   ftp.GetLastResult().c_str());
+            printf("\nContents of %s:\n%s\n", filename, data);

         }
         }

+
+        delete [] data;
+        delete in;

     }
 }
 
     }
 }
 

-static void TestProtocolFtpUpload()
+static void TestFtpFileSize()

 {
 {

-    puts("*** Testing wxFTP uploading ***\n");
+    puts("*** Testing FTP SIZE command ***");

 
 

-    static const char *hostname = "localhost";
+    if ( !ftp.ChDir(directory) )
+    {
+        printf("ERROR: failed to cd to %s\n", directory);
+    }

 
 

-    printf("--- Attempting to connect to %s:21...\n", hostname);
+    printf("Current directory is '%s'\n", ftp.Pwd().c_str());

 
 

-    wxFTP ftp;
-    ftp.SetUser("zeitlin");
-    ftp.SetPassword("password");
-    if ( !ftp.Connect(hostname) )
+    if ( ftp.FileExists(filename) )

     {
     {

-        printf("ERROR: failed to connect to %s\n", hostname);
+        int size = ftp.GetFileSize(filename);
+        if ( size == -1 )
+            printf("ERROR: couldn't get size of '%s'\n", filename);
+        else
+            printf("Size of '%s' is %d bytes.\n", filename, size);

     }
     else
     {
     }
     else
     {

-        printf("--- Connected to %s, current directory is '%s'\n",
-               hostname, ftp.Pwd().c_str());
+        printf("ERROR: '%s' doesn't exist\n", filename);
+    }
+}

 
 

-        // upload a file
-        static const char *file1 = "test1";
-        static const char *file2 = "test2";
-        wxOutputStream *out = ftp.GetOutputStream(file1);
-        if ( out )
-        {
-            printf("--- Uploading to %s ---\n", file1);
-            out->Write("First hello", 11);
-            delete out;
-        }
+static void TestFtpMisc()
+{
+    puts("*** Testing miscellaneous wxFTP functions ***");
+
+    if ( ftp.SendCommand("STAT") != '2' )
+    {
+        puts("ERROR: STAT failed");
+    }
+    else
+    {
+        printf("STAT returned:\n\n%s\n", ftp.GetLastResult().c_str());
+    }
+
+    if ( ftp.SendCommand("HELP SITE") != '2' )
+    {
+        puts("ERROR: HELP SITE failed");
+    }
+    else
+    {
+        printf("The list of site-specific commands:\n\n%s\n",
+               ftp.GetLastResult().c_str());
+    }
+}
+
+static void TestFtpInteractive()
+{
+    puts("\n*** Interactive wxFTP test ***");
+
+    char buf[128];
+
+    for ( ;; )
+    {
+        printf("Enter FTP command: ");
+        if ( !fgets(buf, WXSIZEOF(buf), stdin) )
+            break;
+
+        // kill the last '\n'
+        buf[strlen(buf) - 1] = 0;

 
 

-        // send a command to check the remote file
-        if ( ftp.SendCommand(wxString("STAT ") + file1) != '2' )
+        // special handling of LIST and NLST as they require data connection
+        wxString start(buf, 4);
+        start.MakeUpper();
+        if ( start == "LIST" || start == "NLST" )

         {
         {

-            printf("ERROR: STAT %s failed\n", file1);
+            wxString wildcard;
+            if ( strlen(buf) > 4 )
+                wildcard = buf + 5;
+
+            wxArrayString files;
+            if ( !ftp.GetList(files, wildcard, start == "LIST") )
+            {
+                printf("ERROR: failed to get %s of files\n", start.c_str());
+            }
+            else
+            {
+                printf("--- %s of '%s' under '%s':\n",
+                       start.c_str(), wildcard.c_str(), ftp.Pwd().c_str());
+                size_t count = files.GetCount();
+                for ( size_t n = 0; n < count; n++ )
+                {
+                    printf("\t%s\n", files[n].c_str());
+                }
+                puts("--- End of the file list");
+            }

         }
         }

-        else
+        else // !list

         {
         {

-            printf("STAT %s returned:\n\n%s\n",
-                   file1, ftp.GetLastResult().c_str());
-        }
+            char ch = ftp.SendCommand(buf);
+            printf("Command %s", ch ? "succeeded" : "failed");
+            if ( ch )
+            {
+                printf(" (return code %c)", ch);
+            }

 
 

-        out = ftp.GetOutputStream(file2);
-        if ( out )
-        {
-            printf("--- Uploading to %s ---\n", file1);
-            out->Write("Second hello", 12);
-            delete out;
+            printf(", server reply:\n%s\n\n", ftp.GetLastResult().c_str());

         }
     }
         }
     }

+
+    puts("\n*** done ***");
+}
+
+static void TestFtpUpload()
+{
+    puts("*** Testing wxFTP uploading ***\n");
+
+    // upload a file
+    static const char *file1 = "test1";
+    static const char *file2 = "test2";
+    wxOutputStream *out = ftp.GetOutputStream(file1);
+    if ( out )
+    {
+        printf("--- Uploading to %s ---\n", file1);
+        out->Write("First hello", 11);
+        delete out;
+    }
+
+    // send a command to check the remote file
+    if ( ftp.SendCommand(wxString("STAT ") + file1) != '2' )
+    {
+        printf("ERROR: STAT %s failed\n", file1);
+    }
+    else
+    {
+        printf("STAT %s returned:\n\n%s\n",
+               file1, ftp.GetLastResult().c_str());
+    }
+
+    out = ftp.GetOutputStream(file2);
+    if ( out )
+    {
+        printf("--- Uploading to %s ---\n", file1);
+        out->Write("Second hello", 12);
+        delete out;
+    }

 }
 
 #endif // TEST_FTP
 }
 
 #endif // TEST_FTP


@@ -2884,7 +3065,7 @@ static void TestTimeParse()
     }
 }
 
     }
 }
 

-static void TestInteractive()
+static void TestDateTimeInteractive()

 {
     puts("\n*** interactive wxDateTime tests ***");
 
 {
     puts("\n*** interactive wxDateTime tests ***");
 


@@ -3963,9 +4144,10 @@ int main(int argc, char **argv)
 #endif // TEST_FILE
 
 #ifdef TEST_FILENAME
 #endif // TEST_FILE
 
 #ifdef TEST_FILENAME

-    TestFileNameConstruction();
+    TestFileNameSplit();

     if ( 0 )
     {
     if ( 0 )
     {

+        TestFileNameConstruction();

         TestFileNameCwd();
         TestFileNameComparison();
         TestFileNameOperations();
         TestFileNameCwd();
         TestFileNameComparison();
         TestFileNameOperations();


@@ -4017,13 +4199,14 @@ int main(int argc, char **argv)
 
 #ifdef TEST_MIME
     wxLog::AddTraceMask(_T("mime"));
 
 #ifdef TEST_MIME
     wxLog::AddTraceMask(_T("mime"));

-    if ( 0 )
+    if ( 1 )

     {
         TestMimeEnum();
         TestMimeOverride();
         TestMimeFilename();
     }
     {
         TestMimeEnum();
         TestMimeOverride();
         TestMimeFilename();
     }

-    TestMimeAssociate();
+    else
+        TestMimeAssociate();

 #endif // TEST_MIME
 
 #ifdef TEST_INFO_FUNCTIONS
 #endif // TEST_MIME
 
 #ifdef TEST_INFO_FUNCTIONS


@@ -4046,10 +4229,24 @@ int main(int argc, char **argv)
 #endif // TEST_SOCKETS
 
 #ifdef TEST_FTP
 #endif // TEST_SOCKETS
 
 #ifdef TEST_FTP

-    wxLog::AddTraceMask(_T("ftp"));
-    TestProtocolFtp();
+    wxLog::AddTraceMask(FTP_TRACE_MASK);
+    if ( TestFtpConnect() )
+    {
+            TestFtpFileSize();
+        if ( 0 )
+        {
+            TestFtpList();
+            TestFtpDownload();
+            TestFtpMisc();
+            TestFtpUpload();
+        }
+        if ( 0 )
+        TestFtpInteractive();
+    }
+    //else: connecting to the FTP server failed
+

     if ( 0 )
     if ( 0 )

-    TestProtocolFtpUpload();
+        TestFtpWuFtpd();

 #endif // TEST_FTP
 
 #ifdef TEST_STREAMS
 #endif // TEST_FTP
 
 #ifdef TEST_STREAMS


@@ -4061,7 +4258,7 @@ int main(int argc, char **argv)
 #endif // TEST_TIMER
 
 #ifdef TEST_DATETIME
 #endif // TEST_TIMER
 
 #ifdef TEST_DATETIME

-    if ( 0 )
+    if ( 1 )

     {
         TestTimeSet();
         TestTimeStatic();
     {
         TestTimeSet();
         TestTimeStatic();


@@ -4081,7 +4278,7 @@ int main(int argc, char **argv)
         TestTimeZoneBug();
     }
     if ( 0 )
         TestTimeZoneBug();
     }
     if ( 0 )

-        TestInteractive();
+        TestDateTimeInteractive();

 #endif // TEST_DATETIME
 
 #ifdef TEST_VCARD
 #endif // TEST_DATETIME
 
 #ifdef TEST_VCARD