]> git.saurik.com Git - wxWidgets.git/commitdiff
move console sample's interactive tests to two different CppUnit testsuites: Interact...
authorFrancesco Montorsi <f18m_cpp217828@yahoo.it>
Mon, 21 Jun 2010 21:03:47 +0000 (21:03 +0000)
committerFrancesco Montorsi <f18m_cpp217828@yahoo.it>
Mon, 21 Jun 2010 21:03:47 +0000 (21:03 +0000)
Leave in the console sample only a barebone console application (i.e. a real example).

Closes #11960

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

13 files changed:
samples/console/console.cpp
tests/Makefile.in
tests/interactive/input.cpp [new file with mode: 0644]
tests/interactive/output.cpp [new file with mode: 0644]
tests/makefile.bcc
tests/makefile.gcc
tests/makefile.vc
tests/makefile.wat
tests/test.bkl
tests/test_test.dsp
tests/test_vc7_test.vcproj
tests/test_vc8_test.vcproj
tests/test_vc9_test.vcproj

index f82d1b7c28894eb73d132ae0536c1940a9dff7aa..b8b624de18a5499b9fab2627994f19e9bd24d6ad 100644 (file)
@@ -9,57 +9,6 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-// IMPORTANT NOTE FOR WXWIDGETS USERS:
-// If you're a wxWidgets user and you're looking at this file to learn how to
-// structure a wxWidgets console application, then you don't have much to learn.
-// This application is used more for testing rather than as sample but
-// basically the following simple block is enough for you to start your
-// own console application:
-
-/*
-    int main(int argc, char **argv)
-    {
-        wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program");
-
-        wxInitializer initializer;
-        if ( !initializer )
-        {
-            fprintf(stderr, "Failed to initialize the wxWidgets library, aborting.");
-            return -1;
-        }
-
-        static const wxCmdLineEntryDesc cmdLineDesc[] =
-        {
-            { wxCMD_LINE_SWITCH, "h", "help", "show this help message",
-                wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
-            // ... your other command line options here...
-
-            { wxCMD_LINE_NONE }
-        };
-
-        wxCmdLineParser parser(cmdLineDesc, argc, wxArgv);
-        switch ( parser.Parse() )
-        {
-            case -1:
-                wxLogMessage(wxT("Help was given, terminating."));
-                break;
-
-            case 0:
-                // everything is ok; proceed
-                break;
-
-            default:
-                wxLogMessage(wxT("Syntax error detected, aborting."));
-                break;
-        }
-
-        // do something useful here
-
-        return 0;
-    }
-*/
-
-
 // ============================================================================
 // declarations
 // ============================================================================
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
-
-#include "wx/defs.h"
-
-#include <stdio.h>
-
-#include "wx/string.h"
-#include "wx/file.h"
-#include "wx/filename.h"
-#include "wx/app.h"
-#include "wx/log.h"
-#include "wx/apptrait.h"
-#include "wx/platinfo.h"
-#include "wx/wxchar.h"
-
-// without this pragma, the stupid compiler precompiles #defines below so that
-// changing them doesn't "take place" later!
-#ifdef __VISUALC__
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+#ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
-// ----------------------------------------------------------------------------
-// conditional compilation
-// ----------------------------------------------------------------------------
-
-/*
-   A note about all these conditional compilation macros: this file is used
-   both as a test suite for various non-GUI wxWidgets 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)? Define TEST_ALL to 0 to do a single
-// test, define it to 1 to do all tests.
-#define TEST_ALL 1
-
-// some tests are interactive, define this to run them
-#define TEST_INTERACTIVE 1
-
-#if TEST_ALL
-    #define TEST_DATETIME
-    #define TEST_VOLUME
-    #define TEST_STDPATHS
-    #define TEST_STACKWALKER
-    #define TEST_FTP
-    #define TEST_SNGLINST
-    #define TEST_REGEX
-    #define TEST_INFO_FUNCTIONS
-    #define TEST_MIME
-    #define TEST_DYNLIB
-#else // #if TEST_ALL
+// for all others, include the necessary headers (this file is usually all you
+// need because it includes almost all "standard" wxWidgets headers)
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
 #endif
 
+#include <wx/app.h>
+#include <wx/cmdline.h>
+
 // ============================================================================
 // implementation
 // ============================================================================
 
-// ----------------------------------------------------------------------------
-// wxDllLoader
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_DYNLIB
-
-#include "wx/dynlib.h"
-
-#if defined(__WXMSW__) || defined(__UNIX__)
-
-static void TestDllListLoaded()
+static const wxCmdLineEntryDesc cmdLineDesc[] =
 {
-    wxPuts(wxT("*** testing wxDynamicLibrary::ListLoaded() ***\n"));
-
-    wxPuts("Loaded modules:");
-    wxDynamicLibraryDetailsArray dlls = wxDynamicLibrary::ListLoaded();
-    const size_t count = dlls.GetCount();
-    for ( size_t n = 0; n < count; ++n )
-    {
-        const wxDynamicLibraryDetails& details = dlls[n];
-        printf("%-45s", (const char *)details.GetPath().mb_str());
-
-        void *addr wxDUMMY_INITIALIZE(NULL);
-        size_t len wxDUMMY_INITIALIZE(0);
-        if ( details.GetAddress(&addr, &len) )
-        {
-            printf(" %08lx:%08lx",
-                   (unsigned long)addr, (unsigned long)((char *)addr + len));
-        }
-
-        printf(" %s\n", (const char *)details.GetVersion().mb_str());
-    }
-    
-    wxPuts(wxEmptyString);
-}
-
-#endif
-
-#endif // TEST_DYNLIB
+    { wxCMD_LINE_SWITCH, "h", "help", "show this help message",
+        wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
+    { wxCMD_LINE_SWITCH, "d", "dummy", "a dummy switch" },
+    // ... your other command line options here...
 
-// ----------------------------------------------------------------------------
-// MIME types
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_MIME
-
-#include "wx/mimetype.h"
-
-static void TestMimeEnum()
-{
-    wxPuts(wxT("*** Testing wxMimeTypesManager::EnumAllFileTypes() ***\n"));
-
-    wxArrayString mimetypes;
-
-    size_t count = wxTheMimeTypesManager->EnumAllFileTypes(mimetypes);
-
-    wxPrintf(wxT("*** All %u known filetypes: ***\n"), count);
-
-    wxArrayString exts;
-    wxString desc;
-
-    for ( size_t n = 0; n < count; n++ )
-    {
-        wxFileType *filetype =
-            wxTheMimeTypesManager->GetFileTypeFromMimeType(mimetypes[n]);
-        if ( !filetype )
-        {
-            wxPrintf(wxT("   nothing known about the filetype '%s'!\n"),
-                   mimetypes[n].c_str());
-            continue;
-        }
-
-        filetype->GetDescription(&desc);
-        filetype->GetExtensions(exts);
-
-        filetype->GetIcon(NULL);
-
-        wxString extsAll;
-        for ( size_t e = 0; e < exts.GetCount(); e++ )
-        {
-            if ( e > 0 )
-                extsAll << wxT(", ");
-            extsAll += exts[e];
-        }
-
-        wxPrintf(wxT("   %s: %s (%s)\n"),
-               mimetypes[n].c_str(), desc.c_str(), extsAll.c_str());
-    }
-
-    wxPuts(wxEmptyString);
-}
-
-static void TestMimeFilename()
-{
-    wxPuts(wxT("*** Testing MIME type from filename query ***\n"));
-
-    static const wxChar *filenames[] =
-    {
-        wxT("readme.txt"),
-        wxT("document.pdf"),
-        wxT("image.gif"),
-        wxT("picture.jpeg"),
-    };
-
-    for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
-    {
-        const wxString fname = filenames[n];
-        wxString ext = fname.AfterLast(wxT('.'));
-        wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
-        if ( !ft )
-        {
-            wxPrintf(wxT("WARNING: extension '%s' is unknown.\n"), ext.c_str());
-        }
-        else
-        {
-            wxString desc;
-            if ( !ft->GetDescription(&desc) )
-                desc = wxT("<no description>");
-
-            wxString cmd;
-            if ( !ft->GetOpenCommand(&cmd,
-                                     wxFileType::MessageParameters(fname, wxEmptyString)) )
-                cmd = wxT("<no command available>");
-            else
-                cmd = wxString(wxT('"')) + cmd + wxT('"');
-
-            wxPrintf(wxT("To open %s (%s) run:\n   %s\n"),
-                     fname.c_str(), desc.c_str(), cmd.c_str());
-
-            delete ft;
-        }
-    }
-
-    wxPuts(wxEmptyString);
-}
-
-static void TestMimeAssociate()
-{
-    wxPuts(wxT("*** Testing creation of filetype association ***\n"));
-
-    wxFileTypeInfo ftInfo(
-                            wxT("application/x-xyz"),
-                            wxT("xyzview '%s'"), // open cmd
-                            wxT(""),             // print cmd
-                            wxT("XYZ File"),     // description
-                            wxT(".xyz"),         // extensions
-                            wxNullPtr           // end of extensions
-                         );
-    ftInfo.SetShortDesc(wxT("XYZFile")); // used under Win32 only
-
-    wxFileType *ft = wxTheMimeTypesManager->Associate(ftInfo);
-    if ( !ft )
-    {
-        wxPuts(wxT("ERROR: failed to create association!"));
-    }
-    else
-    {
-        // TODO: read it back
-        delete ft;
-    }
-
-    wxPuts(wxEmptyString);
-}
-
-#endif // TEST_MIME
-
-
-// ----------------------------------------------------------------------------
-// misc information functions
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_INFO_FUNCTIONS
-
-#include "wx/utils.h"
+    { wxCMD_LINE_NONE }
+};
 
-#if TEST_INTERACTIVE
-static void TestDiskInfo()
+int main(int argc, char **argv)
 {
-    wxPuts(wxT("*** Testing wxGetDiskSpace() ***"));
+    wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program");
 
-    for ( ;; )
+    wxInitializer initializer;
+    if ( !initializer )
     {
-        wxChar pathname[128];
-        wxPrintf(wxT("Enter a directory name (press ENTER or type 'quit' to escape): "));
-        if ( !wxFgets(pathname, WXSIZEOF(pathname), stdin) )
-            break;
-
-        // kill the last '\n'
-        pathname[wxStrlen(pathname) - 1] = 0;
-        
-        if (pathname[0] == '\0' || wxStrcmp(pathname, "quit") == 0)
-            break;
-
-        wxLongLong total, free;
-        if ( !wxGetDiskSpace(pathname, &total, &free) )
-        {
-            wxPuts(wxT("ERROR: wxGetDiskSpace failed."));
-        }
-        else
-        {
-            wxPrintf(wxT("%sKb total, %sKb free on '%s'.\n"),
-                    (total / 1024).ToString().c_str(),
-                    (free / 1024).ToString().c_str(),
-                    pathname);
-        }
-        
-        wxPuts("\n");
+        fprintf(stderr, "Failed to initialize the wxWidgets library, aborting.");
+        return -1;
     }
 
-    wxPuts("\n");
-}
-#endif // TEST_INTERACTIVE
-
-static void TestOsInfo()
-{
-    wxPuts(wxT("*** Testing OS info functions ***\n"));
-
-    int major, minor;
-    wxGetOsVersion(&major, &minor);
-    wxPrintf(wxT("Running under: %s, version %d.%d\n"),
-            wxGetOsDescription().c_str(), major, minor);
-
-    wxPrintf(wxT("%ld free bytes of memory left.\n"), wxGetFreeMemory().ToLong());
-
-    wxPrintf(wxT("Host name is %s (%s).\n"),
-           wxGetHostName().c_str(), wxGetFullHostName().c_str());
-
-    wxPuts(wxEmptyString);
-}
-
-static void TestPlatformInfo()
-{
-    wxPuts(wxT("*** Testing wxPlatformInfo functions ***\n"));
-
-    // get this platform
-    wxPlatformInfo plat;
-
-    wxPrintf(wxT("Operating system family name is: %s\n"), plat.GetOperatingSystemFamilyName().c_str());
-    wxPrintf(wxT("Operating system name is: %s\n"), plat.GetOperatingSystemIdName().c_str());
-    wxPrintf(wxT("Port ID name is: %s\n"), plat.GetPortIdName().c_str());
-    wxPrintf(wxT("Port ID short name is: %s\n"), plat.GetPortIdShortName().c_str());
-    wxPrintf(wxT("Architecture is: %s\n"), plat.GetArchName().c_str());
-    wxPrintf(wxT("Endianness is: %s\n"), plat.GetEndiannessName().c_str());
-
-    wxPuts(wxEmptyString);
-}
-
-static void TestUserInfo()
-{
-    wxPuts(wxT("*** Testing user info functions ***\n"));
-
-    wxPrintf(wxT("User id is:\t%s\n"), wxGetUserId().c_str());
-    wxPrintf(wxT("User name is:\t%s\n"), wxGetUserName().c_str());
-    wxPrintf(wxT("Home dir is:\t%s\n"), wxGetHomeDir().c_str());
-    wxPrintf(wxT("Email address:\t%s\n"), wxGetEmailAddress().c_str());
-
-    wxPuts(wxEmptyString);
-}
-
-#endif // TEST_INFO_FUNCTIONS
-
-// ----------------------------------------------------------------------------
-// regular expressions
-// ----------------------------------------------------------------------------
-
-#if defined TEST_REGEX && TEST_INTERACTIVE
-
-#include "wx/regex.h"
-
-static void TestRegExInteractive()
-{
-    wxPuts(wxT("*** Testing RE interactively ***"));
-
-    for ( ;; )
+    wxCmdLineParser parser(cmdLineDesc, argc, argv);
+    switch ( parser.Parse() )
     {
-        wxChar pattern[128];
-        wxPrintf(wxT("Enter a pattern (press ENTER or type 'quit' to escape): "));
-        if ( !wxFgets(pattern, WXSIZEOF(pattern), stdin) )
+        case -1:
+            // help was given, terminating
             break;
 
-        // kill the last '\n'
-        pattern[wxStrlen(pattern) - 1] = 0;
-
-        if (pattern[0] == '\0' || wxStrcmp(pattern, "quit") == 0)
-            break;
-            
-        wxRegEx re;
-        if ( !re.Compile(pattern) )
-        {
-            continue;
-        }
-
-        wxChar text[128];
-        for ( ;; )
-        {
-            wxPrintf(wxT("Enter text to match: "));
-            if ( !wxFgets(text, WXSIZEOF(text), stdin) )
-                break;
-
-            // kill the last '\n'
-            text[wxStrlen(text) - 1] = 0;
-
-            if ( !re.Matches(text) )
-            {
-                wxPrintf(wxT("No match.\n"));
-            }
-            else
+        case 0:
+            // everything is ok; proceed
+            if (parser.Found("d"))
             {
-                wxPrintf(wxT("Pattern matches at '%s'\n"), re.GetMatch(text).c_str());
+                wxPrintf("Dummy switch was given...\n");
 
-                size_t start, len;
-                for ( size_t n = 1; ; n++ )
+                while (1)
                 {
-                    if ( !re.GetMatch(&start, &len, n) )
-                    {
+                    wxChar input[128];
+                    wxPrintf("Try to guess the magic number (type 'quit' to escape): ");
+                    if ( !wxFgets(input, WXSIZEOF(input), stdin) )
                         break;
-                    }
-
-                    wxPrintf(wxT("Subexpr %u matched '%s'\n"),
-                             n, wxString(text + start, len).c_str());
-                }
-            }
-        }
-        
-        wxPuts("\n");
-    }
-}
-
-#endif // TEST_REGEX
-
-// ----------------------------------------------------------------------------
-// FTP
-// ----------------------------------------------------------------------------
-
-#if defined(TEST_FTP) && TEST_INTERACTIVE
-
-#include "wx/protocol/ftp.h"
-#include "wx/protocol/log.h"
-
-#define FTP_ANONYMOUS
-static wxFTP *ftp;
-
-#ifdef FTP_ANONYMOUS
-    static const wxChar *hostname = wxT("ftp.wxwidgets.org");
-#else
-    static const wxChar *hostname = "localhost";
-#endif
-
-static void TestFtpInteractive()
-{
-    wxPuts(wxT("\n*** Interactive wxFTP test ***"));
-
-#ifdef FTP_ANONYMOUS
-    wxPrintf(wxT("--- Attempting to connect to %s:21 anonymously...\n"), hostname);
-#else // !FTP_ANONYMOUS
-    wxChar user[256];
-    wxFgets(user, WXSIZEOF(user), stdin);
-    user[wxStrlen(user) - 1] = '\0'; // chop off '\n'
-    ftp->SetUser(user);
-
-    wxChar password[256];
-    wxPrintf(wxT("Password for %s: "), password);
-    wxFgets(password, WXSIZEOF(password), stdin);
-    password[wxStrlen(password) - 1] = '\0'; // chop off '\n'
-    ftp->SetPassword(password);
 
-    wxPrintf(wxT("--- Attempting to connect to %s:21 as %s...\n"), hostname, user);
-#endif // FTP_ANONYMOUS/!FTP_ANONYMOUS
-
-    if ( !ftp->Connect(hostname) )
-    {
-        wxPrintf(wxT("ERROR: failed to connect to %s\n"), hostname);
-
-        return;
-    }
-    else
-    {
-        wxPrintf(wxT("--- Connected to %s, current directory is '%s'\n"),
-                 hostname, ftp->Pwd().c_str());
-    }
-    
-    wxChar buf[128];
-    for ( ;; )
-    {
-        wxPrintf(wxT("Enter FTP command (press ENTER or type 'quit' to escape): "));
-        if ( !wxFgets(buf, WXSIZEOF(buf), stdin) )
-            break;
-
-        // kill the last '\n'
-        buf[wxStrlen(buf) - 1] = 0;
+                    // kill the last '\n'
+                    input[wxStrlen(input) - 1] = 0;
+                    
+                    if (wxStrcmp(input, "quit") == 0)
+                        break;
 
-        if (buf[0] == '\0' || wxStrcmp(buf, "quit") == 0)
-            break;
-            
-        // special handling of LIST and NLST as they require data connection
-        wxString start(buf, 4);
-        start.MakeUpper();
-        if ( start == wxT("LIST") || start == wxT("NLST") )
-        {
-            wxString wildcard;
-            if ( wxStrlen(buf) > 4 )
-                wildcard = buf + 5;
+                    long val;
+                    if (!wxString(input).ToLong(&val))
+                    {
+                        wxPrintf("Invalid number...\n");
+                        continue;
+                    }
 
-            wxArrayString files;
-            if ( !ftp->GetList(files, wildcard, start == wxT("LIST")) )
-            {
-                wxPrintf(wxT("ERROR: failed to get %s of files\n"), start.c_str());
-            }
-            else
-            {
-                wxPrintf(wxT("--- %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++ )
-                {
-                    wxPrintf(wxT("\t%s\n"), files[n].c_str());
+                    if (val == 42)
+                        wxPrintf("You guessed!\n");
+                    else
+                        wxPrintf("Bad luck!\n");
                 }
-                wxPuts(wxT("--- End of the file list"));
-            }
-        }
-        else // !list
-        {
-            wxChar ch = ftp->SendCommand(buf);
-            wxPrintf(wxT("Command %s"), ch ? wxT("succeeded") : wxT("failed"));
-            if ( ch )
-            {
-                wxPrintf(wxT(" (return code %c)"), ch);
             }
-
-            wxPrintf(wxT(", server reply:\n%s\n\n"), ftp->GetLastResult().c_str());
-        }
-    }
-
-    wxPuts(wxT("\n"));
-}
-#endif // TEST_FTP
-
-// ----------------------------------------------------------------------------
-// stack backtrace
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_STACKWALKER
-
-#if wxUSE_STACKWALKER
-
-#include "wx/stackwalk.h"
-
-class StackDump : public wxStackWalker
-{
-public:
-    StackDump(const char *argv0)
-        : wxStackWalker(argv0)
-    {
-    }
-
-    virtual void Walk(size_t skip = 1, size_t maxdepth = wxSTACKWALKER_MAX_DEPTH)
-    {
-        wxPuts(wxT("Stack dump:"));
-
-        wxStackWalker::Walk(skip, maxdepth);
-    }
-
-protected:
-    virtual void OnStackFrame(const wxStackFrame& frame)
-    {
-        printf("[%2d] ", (int) frame.GetLevel());
-
-        wxString name = frame.GetName();
-        if ( !name.empty() )
-        {
-            printf("%-20.40s", (const char*)name.mb_str());
-        }
-        else
-        {
-            printf("0x%08lx", (unsigned long)frame.GetAddress());
-        }
-
-        if ( frame.HasSourceLocation() )
-        {
-            printf("\t%s:%d",
-                   (const char*)frame.GetFileName().mb_str(),
-                   (int)frame.GetLine());
-        }
-
-        puts("");
-
-        wxString type, val;
-        for ( size_t n = 0; frame.GetParam(n, &type, &name, &val); n++ )
-        {
-            printf("\t%s %s = %s\n", (const char*)type.mb_str(),
-                                     (const char*)name.mb_str(),
-                                     (const char*)val.mb_str());
-        }
-    }
-};
-
-static void TestStackWalk(const char *argv0)
-{
-    wxPuts(wxT("*** Testing wxStackWalker ***"));
-
-    StackDump dump(argv0);
-    dump.Walk();
-    
-    wxPuts("\n");
-}
-
-#endif // wxUSE_STACKWALKER
-
-#endif // TEST_STACKWALKER
-
-// ----------------------------------------------------------------------------
-// standard paths
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_STDPATHS
-
-#include "wx/stdpaths.h"
-#include "wx/wxchar.h"      // wxPrintf
-
-static void TestStandardPaths()
-{
-    wxPuts(wxT("*** Testing wxStandardPaths ***"));
-
-    wxTheApp->SetAppName(wxT("console"));
-
-    wxStandardPathsBase& stdp = wxStandardPaths::Get();
-    wxPrintf(wxT("Config dir (sys):\t%s\n"), stdp.GetConfigDir().c_str());
-    wxPrintf(wxT("Config dir (user):\t%s\n"), stdp.GetUserConfigDir().c_str());
-    wxPrintf(wxT("Data dir (sys):\t\t%s\n"), stdp.GetDataDir().c_str());
-    wxPrintf(wxT("Data dir (sys local):\t%s\n"), stdp.GetLocalDataDir().c_str());
-    wxPrintf(wxT("Data dir (user):\t%s\n"), stdp.GetUserDataDir().c_str());
-    wxPrintf(wxT("Data dir (user local):\t%s\n"), stdp.GetUserLocalDataDir().c_str());
-    wxPrintf(wxT("Documents dir:\t\t%s\n"), stdp.GetDocumentsDir().c_str());
-    wxPrintf(wxT("Executable path:\t%s\n"), stdp.GetExecutablePath().c_str());
-    wxPrintf(wxT("Plugins dir:\t\t%s\n"), stdp.GetPluginsDir().c_str());
-    wxPrintf(wxT("Resources dir:\t\t%s\n"), stdp.GetResourcesDir().c_str());
-    wxPrintf(wxT("Localized res. dir:\t%s\n"),
-             stdp.GetLocalizedResourcesDir(wxT("fr")).c_str());
-    wxPrintf(wxT("Message catalogs dir:\t%s\n"),
-             stdp.GetLocalizedResourcesDir
-                  (
-                    wxT("fr"),
-                    wxStandardPaths::ResourceCat_Messages
-                  ).c_str());
-                  
-    wxPuts("\n");
-}
-
-#endif // TEST_STDPATHS
-
-// ----------------------------------------------------------------------------
-// wxVolume tests
-// ----------------------------------------------------------------------------
-
-#if !defined(__WIN32__) || !wxUSE_FSVOLUME
-    #undef TEST_VOLUME
-#endif
-
-#ifdef TEST_VOLUME
-
-#include "wx/volume.h"
-
-static const wxChar *volumeKinds[] =
-{
-    wxT("floppy"),
-    wxT("hard disk"),
-    wxT("CD-ROM"),
-    wxT("DVD-ROM"),
-    wxT("network volume"),
-    wxT("other volume"),
-};
-
-static void TestFSVolume()
-{
-    wxPuts(wxT("*** Testing wxFSVolume class ***"));
-
-    wxArrayString volumes = wxFSVolume::GetVolumes();
-    size_t count = volumes.GetCount();
-
-    if ( !count )
-    {
-        wxPuts(wxT("ERROR: no mounted volumes?"));
-        return;
-    }
-
-    wxPrintf(wxT("%u mounted volumes found:\n"), count);
-
-    for ( size_t n = 0; n < count; n++ )
-    {
-        wxFSVolume vol(volumes[n]);
-        if ( !vol.IsOk() )
-        {
-            wxPuts(wxT("ERROR: couldn't create volume"));
-            continue;
-        }
-
-        wxPrintf(wxT("%u: %s (%s), %s, %s, %s\n"),
-                 n + 1,
-                 vol.GetDisplayName().c_str(),
-                 vol.GetName().c_str(),
-                 volumeKinds[vol.GetKind()],
-                 vol.IsWritable() ? wxT("rw") : wxT("ro"),
-                 vol.GetFlags() & wxFS_VOL_REMOVABLE ? wxT("removable")
-                                                     : wxT("fixed"));
-    }
-    
-    wxPuts("\n");
-}
-
-#endif // TEST_VOLUME
-
-// ----------------------------------------------------------------------------
-// date time
-// ----------------------------------------------------------------------------
-
-#ifdef TEST_DATETIME
-
-#include "wx/math.h"
-#include "wx/datetime.h"
-
-#if TEST_INTERACTIVE
-
-static void TestDateTimeInteractive()
-{
-    wxPuts(wxT("\n*** interactive wxDateTime tests ***"));
-
-    wxChar buf[128];
-
-    for ( ;; )
-    {
-        wxPrintf(wxT("Enter a date (press ENTER or type 'quit' to escape): "));
-        if ( !wxFgets(buf, WXSIZEOF(buf), stdin) )
             break;
 
-        // kill the last '\n'
-        buf[wxStrlen(buf) - 1] = 0;
-        
-        if ( buf[0] == '\0' || wxStrcmp(buf, "quit") == 0 )
+        default:
             break;
-
-        wxDateTime dt;
-        const wxChar *p = dt.ParseDate(buf);
-        if ( !p )
-        {
-            wxPrintf(wxT("ERROR: failed to parse the date '%s'.\n"), buf);
-
-            continue;
-        }
-        else if ( *p )
-        {
-            wxPrintf(wxT("WARNING: parsed only first %u characters.\n"), p - buf);
-        }
-
-        wxPrintf(wxT("%s: day %u, week of month %u/%u, week of year %u\n"),
-                 dt.Format(wxT("%b %d, %Y")).c_str(),
-                 dt.GetDayOfYear(),
-                 dt.GetWeekOfMonth(wxDateTime::Monday_First),
-                 dt.GetWeekOfMonth(wxDateTime::Sunday_First),
-                 dt.GetWeekOfYear(wxDateTime::Monday_First));
-    }
-    
-    wxPuts("\n");
-}
-
-#endif // TEST_INTERACTIVE
-#endif // TEST_DATETIME
-
-// ----------------------------------------------------------------------------
-// single instance
-// ----------------------------------------------------------------------------
-
-#if defined(TEST_SNGLINST) && TEST_INTERACTIVE
-
-#include "wx/snglinst.h"
-
-static bool TestSingleIstance()
-{
-    wxPuts(wxT("\n*** Testing wxSingleInstanceChecker ***"));
-
-    wxSingleInstanceChecker checker;
-    if ( checker.Create(wxT(".wxconsole.lock")) )
-    {
-        if ( checker.IsAnotherRunning() )
-        {
-            wxPrintf(wxT("Another instance of the program is running, exiting.\n"));
-
-            return false;
-        }
-
-        // wait some time to give time to launch another instance
-        wxPuts(wxT("If you try to run another instance of this program now, it won't start."));
-        wxPrintf(wxT("Press \"Enter\" to exit wxSingleInstanceChecker test and proceed..."));
-        wxFgetc(stdin);
-    }
-    else // failed to create
-    {
-        wxPrintf(wxT("Failed to init wxSingleInstanceChecker.\n"));
     }
-    
-    wxPuts("\n");
-    
-    return true;
-}
-#endif // defined(TEST_SNGLINST) && TEST_INTERACTIVE
-
-
-// ----------------------------------------------------------------------------
-// entry point
-// ----------------------------------------------------------------------------
-
-int main(int argc, char **argv)
-{
-    wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program");
-
-    wxInitializer initializer;
-    if ( !initializer )
-    {
-        fprintf(stderr, "Failed to initialize the wxWidgets library, aborting.");
-
-        return -1;
-    }
-
-
-    // run all non-interactive tests:
-    // ------------------------------
-
-#ifdef TEST_DYNLIB
-    TestDllListLoaded();
-#endif // TEST_DYNLIB
-
-#ifdef TEST_MIME
-    TestMimeEnum();
-    TestMimeAssociate();
-    TestMimeFilename();
-#endif // TEST_MIME
-
-#ifdef TEST_INFO_FUNCTIONS
-    TestOsInfo();
-    TestPlatformInfo();
-    TestUserInfo();
-#endif // TEST_INFO_FUNCTIONS
-
-#ifdef TEST_PRINTF
-    TestPrintf();
-#endif // TEST_PRINTF
-
-#ifdef TEST_STACKWALKER
-#if wxUSE_STACKWALKER
-    TestStackWalk(argv[0]);
-#endif
-#endif // TEST_STACKWALKER
-
-#ifdef TEST_STDPATHS
-    TestStandardPaths();
-#endif
-
-#ifdef TEST_VOLUME
-    TestFSVolume();
-#endif // TEST_VOLUME
-
-
-    // run all interactive tests:
-    // --------------------------
-
-#if TEST_INTERACTIVE
-
-    wxPuts(wxT("***************** INTERACTIVE TESTS *****************\n"));
-    
-#ifdef TEST_SNGLINST
-    if (!TestSingleIstance())
-        return 1;
-#endif // TEST_SNGLINST
-
-#ifdef TEST_FTP
-    wxLog::AddTraceMask(FTP_TRACE_MASK);
-
-    // wxFTP cannot be a static variable as its ctor needs to access
-    // wxWidgets internals after it has been initialized
-    ftp = new wxFTP;
-    ftp->SetLog(new wxProtocolLog(FTP_TRACE_MASK));
-    TestFtpInteractive();
-    delete ftp;
-#endif // TEST_FTP
-
-#ifdef TEST_INFO_FUNCTIONS
-    TestDiskInfo();
-#endif // TEST_INFO_FUNCTIONS
-
-#if defined TEST_REGEX
-    TestRegExInteractive();
-#endif // defined TEST_REGEX
-
-#ifdef TEST_DATETIME
-    TestDateTimeInteractive();
-#endif // TEST_DATETIME
 
-#endif  // TEST_INTERACTIVE
+    // do something useful here
 
-    wxUnusedVar(argc);
-    wxUnusedVar(argv);
     return 0;
 }
index 233fd60181a27ff3abe88ce54b9cde55fd1c741f..d26a68fd06dfb38984ea0f85c9eb00a720187c0c 100644 (file)
@@ -79,6 +79,8 @@ TEST_OBJECTS =  \
        test_formatconvertertest.o \
        test_fswatchertest.o \
        test_hashes.o \
+       test_output.o \
+       test_input.o \
        test_intltest.o \
        test_lists.o \
        test_logtest.o \
@@ -441,6 +443,12 @@ test_fswatchertest.o: $(srcdir)/fswatcher/fswatchertest.cpp $(TEST_ODEP)
 test_hashes.o: $(srcdir)/hashes/hashes.cpp $(TEST_ODEP)
        $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/hashes/hashes.cpp
 
+test_output.o: $(srcdir)/interactive/output.cpp $(TEST_ODEP)
+       $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/interactive/output.cpp
+
+test_input.o: $(srcdir)/interactive/input.cpp $(TEST_ODEP)
+       $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/interactive/input.cpp
+
 test_intltest.o: $(srcdir)/intl/intltest.cpp $(TEST_ODEP)
        $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/intl/intltest.cpp
 
diff --git a/tests/interactive/input.cpp b/tests/interactive/input.cpp
new file mode 100644 (file)
index 0000000..f4575c9
--- /dev/null
@@ -0,0 +1,378 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/interactive/input.cpp
+// Purpose:     Miscellaneous tests requiring user input
+// Author:      Francesco Montorsi (extracted from console sample)
+// Created:     2010-06-21
+// RCS-ID:      $Id$
+// Copyright:   (c) 2010 wxWidgets team
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// ----------------------------------------------------------------------------
+// conditional compilation
+// ----------------------------------------------------------------------------
+
+#define TEST_SNGLINST
+#define TEST_FTP
+#define TEST_INFO_FUNCTIONS
+#define TEST_REGEX
+#define TEST_DATETIME
+
+// ----------------------------------------------------------------------------
+// test class
+// ----------------------------------------------------------------------------
+
+class InteractiveInputTestCase : public CppUnit::TestCase
+{
+public:
+    InteractiveInputTestCase() { }
+
+private:
+    CPPUNIT_TEST_SUITE( InteractiveInputTestCase );
+        CPPUNIT_TEST( TestSingleIstance );
+        CPPUNIT_TEST( TestFtpInteractive );
+        CPPUNIT_TEST( TestDiskInfo );
+        CPPUNIT_TEST( TestRegExInteractive );
+        CPPUNIT_TEST( TestDateTimeInteractive );
+    CPPUNIT_TEST_SUITE_END();
+
+    void TestSingleIstance();
+    void TestFtpInteractive();
+    void TestDiskInfo();
+    void TestRegExInteractive();
+    void TestDateTimeInteractive();
+
+    wxDECLARE_NO_COPY_CLASS(InteractiveInputTestCase);
+};
+
+// ----------------------------------------------------------------------------
+// CppUnit macros
+// ----------------------------------------------------------------------------
+
+//CPPUNIT_TEST_SUITE_REGISTRATION( InteractiveInputTestCase );
+    // do not run this test by default!
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( InteractiveInputTestCase, "InteractiveInputTestCase" );
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// misc information functions
+// ----------------------------------------------------------------------------
+
+#include "wx/utils.h"
+
+void InteractiveInputTestCase::TestDiskInfo()
+{
+#ifdef TEST_INFO_FUNCTIONS
+    wxPuts(wxT("*** Testing wxGetDiskSpace() ***"));
+
+    for ( ;; )
+    {
+        wxChar pathname[128];
+        wxPrintf(wxT("Enter a directory name (press ENTER or type 'quit' to escape): "));
+        if ( !wxFgets(pathname, WXSIZEOF(pathname), stdin) )
+            break;
+
+        // kill the last '\n'
+        pathname[wxStrlen(pathname) - 1] = 0;
+        
+        if (pathname[0] == '\0' || wxStrcmp(pathname, "quit") == 0)
+            break;
+
+        wxLongLong total, free;
+        if ( !wxGetDiskSpace(pathname, &total, &free) )
+        {
+            wxPuts(wxT("ERROR: wxGetDiskSpace failed."));
+        }
+        else
+        {
+            wxPrintf(wxT("%sKb total, %sKb free on '%s'.\n"),
+                    (total / 1024).ToString().c_str(),
+                    (free / 1024).ToString().c_str(),
+                    pathname);
+        }
+        
+        wxPuts("\n");
+    }
+
+    wxPuts("\n");
+#endif // TEST_INFO_FUNCTIONS
+}
+
+
+// ----------------------------------------------------------------------------
+// regular expressions
+// ----------------------------------------------------------------------------
+
+#include "wx/regex.h"
+
+void InteractiveInputTestCase::TestRegExInteractive()
+{
+#ifdef TEST_REGEX 
+    wxPuts(wxT("*** Testing RE interactively ***"));
+
+    for ( ;; )
+    {
+        wxChar pattern[128];
+        wxPrintf(wxT("Enter a pattern (press ENTER or type 'quit' to escape): "));
+        if ( !wxFgets(pattern, WXSIZEOF(pattern), stdin) )
+            break;
+
+        // kill the last '\n'
+        pattern[wxStrlen(pattern) - 1] = 0;
+
+        if (pattern[0] == '\0' || wxStrcmp(pattern, "quit") == 0)
+            break;
+            
+        wxRegEx re;
+        if ( !re.Compile(pattern) )
+        {
+            continue;
+        }
+
+        wxChar text[128];
+        for ( ;; )
+        {
+            wxPrintf(wxT("Enter text to match: "));
+            if ( !wxFgets(text, WXSIZEOF(text), stdin) )
+                break;
+
+            // kill the last '\n'
+            text[wxStrlen(text) - 1] = 0;
+
+            if ( !re.Matches(text) )
+            {
+                wxPrintf(wxT("No match.\n"));
+            }
+            else
+            {
+                wxPrintf(wxT("Pattern matches at '%s'\n"), re.GetMatch(text).c_str());
+
+                size_t start, len;
+                for ( size_t n = 1; ; n++ )
+                {
+                    if ( !re.GetMatch(&start, &len, n) )
+                    {
+                        break;
+                    }
+
+                    wxPrintf(wxT("Subexpr %u matched '%s'\n"),
+                             n, wxString(text + start, len).c_str());
+                }
+            }
+        }
+        
+        wxPuts("\n");
+    }
+#endif // TEST_REGEX
+}
+
+
+// ----------------------------------------------------------------------------
+// FTP
+// ----------------------------------------------------------------------------
+
+#include "wx/protocol/ftp.h"
+#include "wx/protocol/log.h"
+
+#define FTP_ANONYMOUS
+#ifdef FTP_ANONYMOUS
+    static const wxChar *hostname = wxT("ftp.wxwidgets.org");
+#else
+    static const wxChar *hostname = "localhost";
+#endif
+
+void InteractiveInputTestCase::TestFtpInteractive()
+{
+#ifdef TEST_FTP
+    wxFTP ftp;
+
+    wxPuts(wxT("\n*** Interactive wxFTP test ***"));
+
+#ifdef FTP_ANONYMOUS
+    wxPrintf(wxT("--- Attempting to connect to %s:21 anonymously...\n"), hostname);
+#else // !FTP_ANONYMOUS
+    wxChar user[256];
+    wxFgets(user, WXSIZEOF(user), stdin);
+    user[wxStrlen(user) - 1] = '\0'; // chop off '\n'
+    ftp.SetUser(user);
+
+    wxChar password[256];
+    wxPrintf(wxT("Password for %s: "), password);
+    wxFgets(password, WXSIZEOF(password), stdin);
+    password[wxStrlen(password) - 1] = '\0'; // chop off '\n'
+    ftp.SetPassword(password);
+
+    wxPrintf(wxT("--- Attempting to connect to %s:21 as %s...\n"), hostname, user);
+#endif // FTP_ANONYMOUS/!FTP_ANONYMOUS
+
+    if ( !ftp.Connect(hostname) )
+    {
+        wxPrintf(wxT("ERROR: failed to connect to %s\n"), hostname);
+
+        return;
+    }
+    else
+    {
+        wxPrintf(wxT("--- Connected to %s, current directory is '%s'\n"),
+                 hostname, ftp.Pwd().c_str());
+    }
+    
+    wxChar buf[128];
+    for ( ;; )
+    {
+        wxPrintf(wxT("Enter FTP command (press ENTER or type 'quit' to escape): "));
+        if ( !wxFgets(buf, WXSIZEOF(buf), stdin) )
+            break;
+
+        // kill the last '\n'
+        buf[wxStrlen(buf) - 1] = 0;
+
+        if (buf[0] == '\0' || wxStrcmp(buf, "quit") == 0)
+            break;
+            
+        // special handling of LIST and NLST as they require data connection
+        wxString start(buf, 4);
+        start.MakeUpper();
+        if ( start == wxT("LIST") || start == wxT("NLST") )
+        {
+            wxString wildcard;
+            if ( wxStrlen(buf) > 4 )
+                wildcard = buf + 5;
+
+            wxArrayString files;
+            if ( !ftp.GetList(files, wildcard, start == wxT("LIST")) )
+            {
+                wxPrintf(wxT("ERROR: failed to get %s of files\n"), start.c_str());
+            }
+            else
+            {
+                wxPrintf(wxT("--- %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++ )
+                {
+                    wxPrintf(wxT("\t%s\n"), files[n].c_str());
+                }
+                wxPuts(wxT("--- End of the file list"));
+            }
+        }
+        else // !list
+        {
+            wxChar ch = ftp.SendCommand(buf);
+            wxPrintf(wxT("Command %s"), ch ? wxT("succeeded") : wxT("failed"));
+            if ( ch )
+            {
+                wxPrintf(wxT(" (return code %c)"), ch);
+            }
+
+            wxPrintf(wxT(", server reply:\n%s\n\n"), ftp.GetLastResult().c_str());
+        }
+    }
+
+    wxPuts(wxT("\n"));
+#endif // TEST_FTP
+}
+
+// ----------------------------------------------------------------------------
+// date time
+// ----------------------------------------------------------------------------
+
+#include "wx/math.h"
+#include "wx/datetime.h"
+
+void InteractiveInputTestCase::TestDateTimeInteractive()
+{
+#ifdef TEST_DATETIME
+    wxPuts(wxT("\n*** interactive wxDateTime tests ***"));
+
+    wxChar buf[128];
+
+    for ( ;; )
+    {
+        wxPrintf(wxT("Enter a date (press ENTER or type 'quit' to escape): "));
+        if ( !wxFgets(buf, WXSIZEOF(buf), stdin) )
+            break;
+
+        // kill the last '\n'
+        buf[wxStrlen(buf) - 1] = 0;
+        
+        if ( buf[0] == '\0' || wxStrcmp(buf, "quit") == 0 )
+            break;
+
+        wxDateTime dt;
+        const wxChar *p = dt.ParseDate(buf);
+        if ( !p )
+        {
+            wxPrintf(wxT("ERROR: failed to parse the date '%s'.\n"), buf);
+
+            continue;
+        }
+        else if ( *p )
+        {
+            wxPrintf(wxT("WARNING: parsed only first %u characters.\n"), p - buf);
+        }
+
+        wxPrintf(wxT("%s: day %u, week of month %u/%u, week of year %u\n"),
+                 dt.Format(wxT("%b %d, %Y")).c_str(),
+                 dt.GetDayOfYear(),
+                 dt.GetWeekOfMonth(wxDateTime::Monday_First),
+                 dt.GetWeekOfMonth(wxDateTime::Sunday_First),
+                 dt.GetWeekOfYear(wxDateTime::Monday_First));
+    }
+    
+    wxPuts("\n");
+#endif // TEST_DATETIME
+}
+
+
+// ----------------------------------------------------------------------------
+// single instance
+// ----------------------------------------------------------------------------
+
+#include "wx/snglinst.h"
+
+void InteractiveInputTestCase::TestSingleIstance()
+{
+#ifdef TEST_SNGLINST
+    wxPuts(wxT("\n*** Testing wxSingleInstanceChecker ***"));
+
+    wxSingleInstanceChecker checker;
+    if ( checker.Create(wxT(".wxconsole.lock")) )
+    {
+        if ( checker.IsAnotherRunning() )
+        {
+            wxPrintf(wxT("Another instance of the program is running, exiting.\n"));
+            return;
+        }
+
+        // wait some time to give time to launch another instance
+        wxPuts(wxT("If you try to run another instance of this program now, it won't start."));
+        wxPrintf(wxT("Press \"Enter\" to exit wxSingleInstanceChecker test and proceed..."));
+        wxFgetc(stdin);
+    }
+    else // failed to create
+    {
+        wxPrintf(wxT("Failed to init wxSingleInstanceChecker.\n"));
+    }
+    
+    wxPuts("\n");
+#endif // defined(TEST_SNGLINST)
+}
+
diff --git a/tests/interactive/output.cpp b/tests/interactive/output.cpp
new file mode 100644 (file)
index 0000000..308d242
--- /dev/null
@@ -0,0 +1,478 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/interactive/output.cpp
+// Purpose:     Miscellaneous tests NOT requiring user input, just user checks
+// Author:      Francesco Montorsi (extracted from console sample)
+// Created:     2010-06-21
+// RCS-ID:      $Id$
+// Copyright:   (c) 2010 wxWidgets team
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// ----------------------------------------------------------------------------
+// conditional compilation
+// ----------------------------------------------------------------------------
+
+#define TEST_DYNLIB
+#define TEST_MIME
+#define TEST_INFO_FUNCTIONS
+#define TEST_STACKWALKER
+#define TEST_STDPATHS
+#define TEST_VOLUME
+
+// ----------------------------------------------------------------------------
+// test class
+// ----------------------------------------------------------------------------
+
+class InteractiveOutputTestCase : public CppUnit::TestCase
+{
+public:
+    InteractiveOutputTestCase() { }
+
+private:
+    CPPUNIT_TEST_SUITE( InteractiveOutputTestCase );
+        CPPUNIT_TEST( TestDllListLoaded );
+        CPPUNIT_TEST( TestMimeEnum );
+        CPPUNIT_TEST( TestMimeAssociate );
+        CPPUNIT_TEST( TestMimeFilename );
+        CPPUNIT_TEST( TestOsInfo );
+        CPPUNIT_TEST( TestPlatformInfo );
+        CPPUNIT_TEST( TestUserInfo );
+        CPPUNIT_TEST( TestStackWalk );
+        CPPUNIT_TEST( TestStandardPaths );
+        CPPUNIT_TEST( TestFSVolume );
+    CPPUNIT_TEST_SUITE_END();
+
+    void TestDllListLoaded();
+    void TestMimeEnum();
+    void TestMimeAssociate();
+    void TestMimeFilename();
+    void TestOsInfo();
+    void TestPlatformInfo();
+    void TestUserInfo();
+    void TestStackWalk();
+    void TestStandardPaths();
+    void TestFSVolume();
+
+    wxDECLARE_NO_COPY_CLASS(InteractiveOutputTestCase);
+};
+
+// ----------------------------------------------------------------------------
+// CppUnit macros
+// ----------------------------------------------------------------------------
+
+//CPPUNIT_TEST_SUITE_REGISTRATION( InteractiveOutputTestCase );
+    // do not run this test by default!
+
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( InteractiveOutputTestCase, "InteractiveOutputTestCase" );
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxDllLoader
+// ----------------------------------------------------------------------------
+
+#if !defined(__WXMSW__) && !defined(__UNIX__)
+    #undef TEST_DYNLIB
+#endif
+
+#include "wx/dynlib.h"
+
+void InteractiveOutputTestCase::TestDllListLoaded()
+{
+#ifdef TEST_DYNLIB
+    wxPuts(wxT("*** testing wxDynamicLibrary::ListLoaded() ***\n"));
+
+    wxPuts("Loaded modules:");
+    wxDynamicLibraryDetailsArray dlls = wxDynamicLibrary::ListLoaded();
+    const size_t count = dlls.GetCount();
+    for ( size_t n = 0; n < count; ++n )
+    {
+        const wxDynamicLibraryDetails& details = dlls[n];
+        printf("%-45s", (const char *)details.GetPath().mb_str());
+
+        void *addr wxDUMMY_INITIALIZE(NULL);
+        size_t len wxDUMMY_INITIALIZE(0);
+        if ( details.GetAddress(&addr, &len) )
+        {
+            printf(" %08lx:%08lx",
+                   (unsigned long)addr, (unsigned long)((char *)addr + len));
+        }
+
+        printf(" %s\n", (const char *)details.GetVersion().mb_str());
+    }
+    
+    wxPuts(wxEmptyString);
+#endif // TEST_DYNLIB
+}
+
+
+// ----------------------------------------------------------------------------
+// MIME types
+// ----------------------------------------------------------------------------
+
+#include "wx/mimetype.h"
+
+void InteractiveOutputTestCase::TestMimeEnum()
+{
+#ifdef TEST_MIME
+    wxPuts(wxT("*** Testing wxMimeTypesManager::EnumAllFileTypes() ***\n"));
+
+    wxArrayString mimetypes;
+
+    size_t count = wxTheMimeTypesManager->EnumAllFileTypes(mimetypes);
+
+    wxPrintf(wxT("*** All %u known filetypes: ***\n"), count);
+
+    wxArrayString exts;
+    wxString desc;
+
+    for ( size_t n = 0; n < count; n++ )
+    {
+        wxFileType *filetype =
+            wxTheMimeTypesManager->GetFileTypeFromMimeType(mimetypes[n]);
+        if ( !filetype )
+        {
+            wxPrintf(wxT("   nothing known about the filetype '%s'!\n"),
+                   mimetypes[n].c_str());
+            continue;
+        }
+
+        filetype->GetDescription(&desc);
+        filetype->GetExtensions(exts);
+
+        filetype->GetIcon(NULL);
+
+        wxString extsAll;
+        for ( size_t e = 0; e < exts.GetCount(); e++ )
+        {
+            if ( e > 0 )
+                extsAll << wxT(", ");
+            extsAll += exts[e];
+        }
+
+        wxPrintf(wxT("   %s: %s (%s)\n"),
+               mimetypes[n].c_str(), desc.c_str(), extsAll.c_str());
+    }
+
+    wxPuts(wxEmptyString);
+#endif // TEST_MIME
+}
+
+void InteractiveOutputTestCase::TestMimeFilename()
+{
+#ifdef TEST_MIME
+    wxPuts(wxT("*** Testing MIME type from filename query ***\n"));
+
+    static const wxChar *filenames[] =
+    {
+        wxT("readme.txt"),
+        wxT("document.pdf"),
+        wxT("image.gif"),
+        wxT("picture.jpeg"),
+    };
+
+    for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
+    {
+        const wxString fname = filenames[n];
+        wxString ext = fname.AfterLast(wxT('.'));
+        wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
+        if ( !ft )
+        {
+            wxPrintf(wxT("WARNING: extension '%s' is unknown.\n"), ext.c_str());
+        }
+        else
+        {
+            wxString desc;
+            if ( !ft->GetDescription(&desc) )
+                desc = wxT("<no description>");
+
+            wxString cmd;
+            if ( !ft->GetOpenCommand(&cmd,
+                                     wxFileType::MessageParameters(fname, wxEmptyString)) )
+                cmd = wxT("<no command available>");
+            else
+                cmd = wxString(wxT('"')) + cmd + wxT('"');
+
+            wxPrintf(wxT("To open %s (%s) run:\n   %s\n"),
+                     fname.c_str(), desc.c_str(), cmd.c_str());
+
+            delete ft;
+        }
+    }
+
+    wxPuts(wxEmptyString);
+#endif // TEST_MIME
+}
+
+void InteractiveOutputTestCase::TestMimeAssociate()
+{
+#ifdef TEST_MIME
+    wxPuts(wxT("*** Testing creation of filetype association ***\n"));
+
+    wxFileTypeInfo ftInfo(
+                            wxT("application/x-xyz"),
+                            wxT("xyzview '%s'"), // open cmd
+                            wxT(""),             // print cmd
+                            wxT("XYZ File"),     // description
+                            wxT(".xyz"),         // extensions
+                            wxNullPtr           // end of extensions
+                         );
+    ftInfo.SetShortDesc(wxT("XYZFile")); // used under Win32 only
+
+    wxFileType *ft = wxTheMimeTypesManager->Associate(ftInfo);
+    if ( !ft )
+    {
+        wxPuts(wxT("ERROR: failed to create association!"));
+    }
+    else
+    {
+        // TODO: read it back
+        delete ft;
+    }
+
+    wxPuts(wxEmptyString);
+#endif // TEST_MIME
+}
+
+
+// ----------------------------------------------------------------------------
+// misc information functions
+// ----------------------------------------------------------------------------
+
+#include "wx/utils.h"
+
+void InteractiveOutputTestCase::TestOsInfo()
+{
+#ifdef TEST_INFO_FUNCTIONS
+    wxPuts(wxT("*** Testing OS info functions ***\n"));
+
+    int major, minor;
+    wxGetOsVersion(&major, &minor);
+    wxPrintf(wxT("Running under: %s, version %d.%d\n"),
+            wxGetOsDescription().c_str(), major, minor);
+
+    wxPrintf(wxT("%ld free bytes of memory left.\n"), wxGetFreeMemory().ToLong());
+
+    wxPrintf(wxT("Host name is %s (%s).\n"),
+           wxGetHostName().c_str(), wxGetFullHostName().c_str());
+
+    wxPuts(wxEmptyString);
+#endif // TEST_INFO_FUNCTIONS
+}
+
+void InteractiveOutputTestCase::TestPlatformInfo()
+{
+#ifdef TEST_INFO_FUNCTIONS
+    wxPuts(wxT("*** Testing wxPlatformInfo functions ***\n"));
+
+    // get this platform
+    wxPlatformInfo plat;
+
+    wxPrintf(wxT("Operating system family name is: %s\n"), plat.GetOperatingSystemFamilyName().c_str());
+    wxPrintf(wxT("Operating system name is: %s\n"), plat.GetOperatingSystemIdName().c_str());
+    wxPrintf(wxT("Port ID name is: %s\n"), plat.GetPortIdName().c_str());
+    wxPrintf(wxT("Port ID short name is: %s\n"), plat.GetPortIdShortName().c_str());
+    wxPrintf(wxT("Architecture is: %s\n"), plat.GetArchName().c_str());
+    wxPrintf(wxT("Endianness is: %s\n"), plat.GetEndiannessName().c_str());
+
+    wxPuts(wxEmptyString);
+#endif // TEST_INFO_FUNCTIONS
+}
+
+void InteractiveOutputTestCase::TestUserInfo()
+{
+#ifdef TEST_INFO_FUNCTIONS
+    wxPuts(wxT("*** Testing user info functions ***\n"));
+
+    wxPrintf(wxT("User id is:\t%s\n"), wxGetUserId().c_str());
+    wxPrintf(wxT("User name is:\t%s\n"), wxGetUserName().c_str());
+    wxPrintf(wxT("Home dir is:\t%s\n"), wxGetHomeDir().c_str());
+    wxPrintf(wxT("Email address:\t%s\n"), wxGetEmailAddress().c_str());
+
+    wxPuts(wxEmptyString);
+#endif // TEST_INFO_FUNCTIONS
+}
+
+
+// ----------------------------------------------------------------------------
+// stack backtrace
+// ----------------------------------------------------------------------------
+
+#include "wx/stackwalk.h"
+
+class StackDump : public wxStackWalker
+{
+public:
+    StackDump(const char *argv0)
+        : wxStackWalker(argv0)
+    {
+    }
+
+    virtual void Walk(size_t skip = 1, size_t maxdepth = wxSTACKWALKER_MAX_DEPTH)
+    {
+        wxPuts(wxT("Stack dump:"));
+
+        wxStackWalker::Walk(skip, maxdepth);
+    }
+
+protected:
+    virtual void OnStackFrame(const wxStackFrame& frame)
+    {
+        printf("[%2d] ", (int) frame.GetLevel());
+
+        wxString name = frame.GetName();
+        if ( !name.empty() )
+        {
+            printf("%-20.40s", (const char*)name.mb_str());
+        }
+        else
+        {
+            printf("0x%08lx", (unsigned long)frame.GetAddress());
+        }
+
+        if ( frame.HasSourceLocation() )
+        {
+            printf("\t%s:%d",
+                   (const char*)frame.GetFileName().mb_str(),
+                   (int)frame.GetLine());
+        }
+
+        puts("");
+
+        wxString type, val;
+        for ( size_t n = 0; frame.GetParam(n, &type, &name, &val); n++ )
+        {
+            printf("\t%s %s = %s\n", (const char*)type.mb_str(),
+                                     (const char*)name.mb_str(),
+                                     (const char*)val.mb_str());
+        }
+    }
+};
+
+void InteractiveOutputTestCase::TestStackWalk()
+{
+#ifdef TEST_STACKWALKER
+    wxPuts(wxT("*** Testing wxStackWalker ***"));
+
+    StackDump dump(wxTheApp->argv[0]);
+    dump.Walk();
+    
+    wxPuts("\n");
+#endif // TEST_STACKWALKER
+}
+
+
+// ----------------------------------------------------------------------------
+// standard paths
+// ----------------------------------------------------------------------------
+
+
+#include "wx/stdpaths.h"
+#include "wx/wxchar.h"      // wxPrintf
+
+void InteractiveOutputTestCase::TestStandardPaths()
+{
+#ifdef TEST_STDPATHS
+    wxPuts(wxT("*** Testing wxStandardPaths ***"));
+
+    wxTheApp->SetAppName(wxT("console"));
+
+    wxStandardPathsBase& stdp = wxStandardPaths::Get();
+    wxPrintf(wxT("Config dir (sys):\t%s\n"), stdp.GetConfigDir().c_str());
+    wxPrintf(wxT("Config dir (user):\t%s\n"), stdp.GetUserConfigDir().c_str());
+    wxPrintf(wxT("Data dir (sys):\t\t%s\n"), stdp.GetDataDir().c_str());
+    wxPrintf(wxT("Data dir (sys local):\t%s\n"), stdp.GetLocalDataDir().c_str());
+    wxPrintf(wxT("Data dir (user):\t%s\n"), stdp.GetUserDataDir().c_str());
+    wxPrintf(wxT("Data dir (user local):\t%s\n"), stdp.GetUserLocalDataDir().c_str());
+    wxPrintf(wxT("Documents dir:\t\t%s\n"), stdp.GetDocumentsDir().c_str());
+    wxPrintf(wxT("Executable path:\t%s\n"), stdp.GetExecutablePath().c_str());
+    wxPrintf(wxT("Plugins dir:\t\t%s\n"), stdp.GetPluginsDir().c_str());
+    wxPrintf(wxT("Resources dir:\t\t%s\n"), stdp.GetResourcesDir().c_str());
+    wxPrintf(wxT("Localized res. dir:\t%s\n"),
+             stdp.GetLocalizedResourcesDir(wxT("fr")).c_str());
+    wxPrintf(wxT("Message catalogs dir:\t%s\n"),
+             stdp.GetLocalizedResourcesDir
+                  (
+                    wxT("fr"),
+                    wxStandardPaths::ResourceCat_Messages
+                  ).c_str());
+                  
+    wxPuts("\n");
+#endif // TEST_STDPATHS
+}
+
+
+// ----------------------------------------------------------------------------
+// wxVolume tests
+// ----------------------------------------------------------------------------
+
+#if !defined(__WIN32__) || !wxUSE_FSVOLUME
+    #undef TEST_VOLUME
+#endif
+
+#include "wx/volume.h"
+
+static const wxChar *volumeKinds[] =
+{
+    wxT("floppy"),
+    wxT("hard disk"),
+    wxT("CD-ROM"),
+    wxT("DVD-ROM"),
+    wxT("network volume"),
+    wxT("other volume"),
+};
+
+void InteractiveOutputTestCase::TestFSVolume()
+{
+#ifdef TEST_VOLUME
+    wxPuts(wxT("*** Testing wxFSVolume class ***"));
+
+    wxArrayString volumes = wxFSVolume::GetVolumes();
+    size_t count = volumes.GetCount();
+
+    if ( !count )
+    {
+        wxPuts(wxT("ERROR: no mounted volumes?"));
+        return;
+    }
+
+    wxPrintf(wxT("%u mounted volumes found:\n"), count);
+
+    for ( size_t n = 0; n < count; n++ )
+    {
+        wxFSVolume vol(volumes[n]);
+        if ( !vol.IsOk() )
+        {
+            wxPuts(wxT("ERROR: couldn't create volume"));
+            continue;
+        }
+
+        wxPrintf(wxT("%u: %s (%s), %s, %s, %s\n"),
+                 n + 1,
+                 vol.GetDisplayName().c_str(),
+                 vol.GetName().c_str(),
+                 volumeKinds[vol.GetKind()],
+                 vol.IsWritable() ? wxT("rw") : wxT("ro"),
+                 vol.GetFlags() & wxFS_VOL_REMOVABLE ? wxT("removable")
+                                                     : wxT("fixed"));
+    }
+    
+    wxPuts("\n");
+#endif // TEST_VOLUME
+}
+
index 8d037d6d6d73a1e016bf18512bc321f46611b9c8..1396fe55b702c205a0417673efb2fecde38de6b3 100644 (file)
@@ -63,6 +63,8 @@ TEST_OBJECTS =  \
        $(OBJS)\test_formatconvertertest.obj \\r
        $(OBJS)\test_fswatchertest.obj \\r
        $(OBJS)\test_hashes.obj \\r
+       $(OBJS)\test_output.obj \\r
+       $(OBJS)\test_input.obj \\r
        $(OBJS)\test_intltest.obj \\r
        $(OBJS)\test_lists.obj \\r
        $(OBJS)\test_logtest.obj \\r
@@ -483,6 +485,12 @@ $(OBJS)\test_fswatchertest.obj: .\fswatcher\fswatchertest.cpp
 $(OBJS)\test_hashes.obj: .\hashes\hashes.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\hashes\hashes.cpp\r
 \r
+$(OBJS)\test_output.obj: .\interactive\output.cpp\r
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\interactive\output.cpp\r
+\r
+$(OBJS)\test_input.obj: .\interactive\input.cpp\r
+       $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\interactive\input.cpp\r
+\r
 $(OBJS)\test_intltest.obj: .\intl\intltest.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\intl\intltest.cpp\r
 \r
index 444adfe996341f5ac9b1b1c1987f8741174937a6..c29a2f0eaec02b3b88a387374ffb984f575f226a 100644 (file)
@@ -55,6 +55,8 @@ TEST_OBJECTS =  \
        $(OBJS)\test_formatconvertertest.o \\r
        $(OBJS)\test_fswatchertest.o \\r
        $(OBJS)\test_hashes.o \\r
+       $(OBJS)\test_output.o \\r
+       $(OBJS)\test_input.o \\r
        $(OBJS)\test_intltest.o \\r
        $(OBJS)\test_lists.o \\r
        $(OBJS)\test_logtest.o \\r
@@ -464,6 +466,12 @@ $(OBJS)\test_fswatchertest.o: ./fswatcher/fswatchertest.cpp
 $(OBJS)\test_hashes.o: ./hashes/hashes.cpp\r
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\test_output.o: ./interactive/output.cpp\r
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\test_input.o: ./interactive/input.cpp\r
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\test_intltest.o: ./intl/intltest.cpp\r
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
index 0495345c00ec2c3c9edfda4a2919eb06db43f8cd..0e67b396e2f87f191af66d285f0f459fe7c720be 100644 (file)
@@ -57,6 +57,8 @@ TEST_OBJECTS =  \
        $(OBJS)\test_formatconvertertest.obj \\r
        $(OBJS)\test_fswatchertest.obj \\r
        $(OBJS)\test_hashes.obj \\r
+       $(OBJS)\test_output.obj \\r
+       $(OBJS)\test_input.obj \\r
        $(OBJS)\test_intltest.obj \\r
        $(OBJS)\test_lists.obj \\r
        $(OBJS)\test_logtest.obj \\r
@@ -609,6 +611,12 @@ $(OBJS)\test_fswatchertest.obj: .\fswatcher\fswatchertest.cpp
 $(OBJS)\test_hashes.obj: .\hashes\hashes.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\hashes\hashes.cpp\r
 \r
+$(OBJS)\test_output.obj: .\interactive\output.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\interactive\output.cpp\r
+\r
+$(OBJS)\test_input.obj: .\interactive\input.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\interactive\input.cpp\r
+\r
 $(OBJS)\test_intltest.obj: .\intl\intltest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\intl\intltest.cpp\r
 \r
index 8df3c7d951ac43c059e90559500dac6f9970f01f..ed945c5b81bdb2611c61f51bfdd834b5e3851353 100644 (file)
@@ -293,6 +293,8 @@ TEST_OBJECTS =  &
        $(OBJS)\test_formatconvertertest.obj &\r
        $(OBJS)\test_fswatchertest.obj &\r
        $(OBJS)\test_hashes.obj &\r
+       $(OBJS)\test_output.obj &\r
+       $(OBJS)\test_input.obj &\r
        $(OBJS)\test_intltest.obj &\r
        $(OBJS)\test_lists.obj &\r
        $(OBJS)\test_logtest.obj &\r
@@ -521,6 +523,12 @@ $(OBJS)\test_fswatchertest.obj :  .AUTODEPEND .\fswatcher\fswatchertest.cpp
 $(OBJS)\test_hashes.obj :  .AUTODEPEND .\hashes\hashes.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_output.obj :  .AUTODEPEND .\interactive\output.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_input.obj :  .AUTODEPEND .\interactive\input.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_intltest.obj :  .AUTODEPEND .\intl\intltest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<\r
 \r
index 491e299b6bb7804d8c47c1c03ba01c50cc4fbcaa..4532306a73669489d41218462c88016bf8da33ec 100644 (file)
@@ -54,6 +54,8 @@
             formatconverter/formatconvertertest.cpp
             fswatcher/fswatchertest.cpp
             hashes/hashes.cpp
+            interactive/output.cpp
+            interactive/input.cpp
             intl/intltest.cpp
             lists/lists.cpp
             log/logtest.cpp
index e06a08e2a429000cebed6aa4e2424dc23c8dde64..57d10245f18aa85e4402c3d556d011e5f59b8598 100644 (file)
@@ -369,6 +369,10 @@ SOURCE=.\hashes\hashes.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\interactive\input.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\intl\intltest.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -425,6 +429,10 @@ SOURCE=.\misc\module.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\interactive\output.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\misc\pathlist.cpp\r
 # End Source File\r
 # Begin Source File\r
index 9aa73921ca7f86a157099be8ab828e3467f497dc..753e3489caa1a3980f87c9867c118f6a54586412 100644 (file)
                        <File\r
                                RelativePath=".\hashes\hashes.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\interactive\input.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath=".\intl\intltest.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\misc\module.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\interactive\output.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath=".\misc\pathlist.cpp">\r
                        </File>\r
index 75e2622f6ad3dab53c502d634877ff45c07fad15..ddbf79007f1fb93a5e850507e11d0903cf311fc4 100644 (file)
                                RelativePath=".\hashes\hashes.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\interactive\input.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\intl\intltest.cpp"\r
                                >\r
                                RelativePath=".\misc\module.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\interactive\output.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\misc\pathlist.cpp"\r
                                >\r
index 77dd6798e2d85e6a15cdcf5ae9a621dbb943eca9..c35f4cb7aaed015afad1c4faf4329863ad46c902 100644 (file)
                                RelativePath=".\hashes\hashes.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\interactive\input.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\intl\intltest.cpp"\r
                                >\r
                                RelativePath=".\misc\module.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\interactive\output.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\misc\pathlist.cpp"\r
                                >\r