#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!
// 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 0
+#define TEST_ALL 1
#if TEST_ALL
#define TEST_MIME
#define TEST_MODULE
#define TEST_PATHLIST
- #define TEST_ODBC
#define TEST_PRINTF
#define TEST_REGCONF
#define TEST_REGEX
#define TEST_WCHAR
#define TEST_ZIP
#else // #if TEST_ALL
- #define TEST_STDPATHS
+ #define TEST_EXECUTE
#endif
// some tests are interactive, define this to run them
wxString strVal;
long lVal;
+ double dVal;
wxDateTime dt;
if ( parser.Found(_T("o"), &strVal) )
s << _T("Output file:\t") << strVal << '\n';
s << _T("Input dir:\t") << strVal << '\n';
if ( parser.Found(_T("s"), &lVal) )
s << _T("Size:\t") << lVal << '\n';
+ if ( parser.Found(_T("f"), &dVal) )
+ s << _T("Double:\t") << dVal << '\n';
if ( parser.Found(_T("d"), &dt) )
s << _T("Date:\t") << dt.FormatISODate() << '\n';
if ( parser.Found(_T("project_name"), &strVal) )
for ( size_t n = 0; n < count; ++n )
{
const wxDynamicLibraryDetails& details = dlls[n];
- printf("%-45s", details.GetPath().mb_str());
+ printf("%-45s", (const char *)details.GetPath().mb_str());
void *addr;
size_t len;
(unsigned long)addr, (unsigned long)((char *)addr + len));
}
- printf(" %s\n", details.GetVersion().mb_str());
+ printf(" %s\n", (const char *)details.GetVersion().mb_str());
}
}
wxPuts(_T("*** testing wxExecute ***"));
#ifdef __UNIX__
- #define COMMAND "cat -n ../../Makefile" // "echo hi"
+ #define COMMAND "echo hi"
+ #define ASYNC_COMMAND "xclock"
#define SHELL_COMMAND "echo hi from shell"
- #define REDIRECT_COMMAND COMMAND // "date"
+ #define REDIRECT_COMMAND "cat -n Makefile"
#elif defined(__WXMSW__)
#define COMMAND "command.com /c echo hi"
+ #define ASYNC_COMMAND "notepad"
#define SHELL_COMMAND "echo hi"
#define REDIRECT_COMMAND COMMAND
#else
wxPrintf(_T("Testing wxExecute: "));
fflush(stdout);
- if ( wxExecute(_T(COMMAND), true /* sync */) == 0 )
+ if ( wxExecute(_T(COMMAND), wxEXEC_SYNC) == 0 )
wxPuts(_T("Ok."));
else
wxPuts(_T("ERROR."));
-#if 0 // no, it doesn't work (yet?)
wxPrintf(_T("Testing async wxExecute: "));
fflush(stdout);
- if ( wxExecute(COMMAND) != 0 )
+ int pid = wxExecute(ASYNC_COMMAND);
+ if ( pid != 0 )
+ {
wxPuts(_T("Ok (command launched)."));
+ if ( wxKill(pid) == -1 )
+ wxPuts("ERROR: failed to kill child process.");
+ }
else
wxPuts(_T("ERROR."));
-#endif // 0
wxPrintf(_T("Testing wxExecute with redirection:\n"));
wxArrayString output;
}
else
{
- size_t count = output.GetCount();
- for ( size_t n = 0; n < count; n++ )
+ // don't show too much output, MAX_LINES is enough
+ static const unsigned MAX_LINES = 20;
+
+ const unsigned count = output.size();
+ for ( unsigned n = 0;
+ n < (count > MAX_LINES ? MAX_LINES/2 : count);
+ n++ )
{
- wxPrintf(_T("\t%s\n"), output[n].c_str());
+ wxPrintf("%04u:\t%s\n", n + 1, output[n]);
+ }
+
+ if ( count > MAX_LINES )
+ {
+ wxPrintf("... skipping %u lines...\n", count - MAX_LINES);
+
+ for ( unsigned n = count - MAX_LINES/2; n < count; n++ )
+ {
+ wxPrintf("%04u:\t%s\n", n + 1, output[n]);
+ }
}
wxPuts(_T("Ok."));
wxPuts(wxEmptyString);
}
-static void TestMimeOverride()
-{
- wxPuts(_T("*** Testing wxMimeTypesManager additional files loading ***\n"));
-
- static const wxChar *mailcap = _T("/tmp/mailcap");
- static const wxChar *mimetypes = _T("/tmp/mime.types");
-
- if ( wxFile::Exists(mailcap) )
- wxPrintf(_T("Loading mailcap from '%s': %s\n"),
- mailcap,
- wxTheMimeTypesManager->ReadMailcap(mailcap) ? _T("ok") : _T("ERROR"));
- else
- wxPrintf(_T("WARN: mailcap file '%s' doesn't exist, not loaded.\n"),
- mailcap);
-
- if ( wxFile::Exists(mimetypes) )
- wxPrintf(_T("Loading mime.types from '%s': %s\n"),
- mimetypes,
- wxTheMimeTypesManager->ReadMimeTypes(mimetypes) ? _T("ok") : _T("ERROR"));
- else
- wxPrintf(_T("WARN: mime.types file '%s' doesn't exist, not loaded.\n"),
- mimetypes);
-
- wxPuts(wxEmptyString);
-}
-
static void TestMimeFilename()
{
wxPuts(_T("*** Testing MIME type from filename query ***\n"));
wxPuts(wxEmptyString);
}
+// these tests were broken by wxMimeTypesManager changes, temporarily disabling
+#if 0
+
+static void TestMimeOverride()
+{
+ wxPuts(_T("*** Testing wxMimeTypesManager additional files loading ***\n"));
+
+ static const wxChar *mailcap = _T("/tmp/mailcap");
+ static const wxChar *mimetypes = _T("/tmp/mime.types");
+
+ if ( wxFile::Exists(mailcap) )
+ wxPrintf(_T("Loading mailcap from '%s': %s\n"),
+ mailcap,
+ wxTheMimeTypesManager->ReadMailcap(mailcap) ? _T("ok") : _T("ERROR"));
+ else
+ wxPrintf(_T("WARN: mailcap file '%s' doesn't exist, not loaded.\n"),
+ mailcap);
+
+ if ( wxFile::Exists(mimetypes) )
+ wxPrintf(_T("Loading mime.types from '%s': %s\n"),
+ mimetypes,
+ wxTheMimeTypesManager->ReadMimeTypes(mimetypes) ? _T("ok") : _T("ERROR"));
+ else
+ wxPrintf(_T("WARN: mime.types file '%s' doesn't exist, not loaded.\n"),
+ mimetypes);
+
+ wxPuts(wxEmptyString);
+}
+
static void TestMimeAssociate()
{
wxPuts(_T("*** Testing creation of filetype association ***\n"));
_T(""), // print cmd
_T("XYZ File"), // description
_T(".xyz"), // extensions
- NULL // end of extensions
+ wxNullPtr // end of extensions
);
ftInfo.SetShortDesc(_T("XYZFile")); // used under Win32 only
wxPuts(wxEmptyString);
}
+#endif // 0
+
#endif // TEST_MIME
// ----------------------------------------------------------------------------
#endif // TEST_REGEX
-// ----------------------------------------------------------------------------
-// database
-// ----------------------------------------------------------------------------
-
-#if !wxUSE_ODBC
- #undef TEST_ODBC
-#endif
-
-#ifdef TEST_ODBC
-
-#include "wx/db.h"
-
-static void TestDbOpen()
-{
- HENV henv;
- wxDb db(henv);
-}
-
-#endif // TEST_ODBC
-
// ----------------------------------------------------------------------------
// printf() tests
// ----------------------------------------------------------------------------
static void TestRegConfRead()
{
- wxConfig *config = new wxConfig(_T("myapp"));
+ wxRegConfig *config = new wxRegConfig(_T("myapp"));
wxString str;
long dummy;
protected:
virtual void OnStackFrame(const wxStackFrame& frame)
{
- printf("[%2d] ", frame.GetLevel());
+ printf("[%2d] ", (int) frame.GetLevel());
wxString name = frame.GetName();
if ( !name.empty() )
{
- printf("%-20.40s", name.mb_str());
+ printf("%-20.40s", (const char*)name.mb_str());
}
else
{
if ( frame.HasSourceLocation() )
{
printf("\t%s:%d",
- frame.GetFileName().mb_str(),
- frame.GetLine());
+ (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", type.mb_str(), name.mb_str(), val.mb_str());
+ printf("\t%s %s = %s\n", (const char*)type.mb_str(),
+ (const char*)name.mb_str(),
+ (const char*)val.mb_str());
}
}
};
#ifdef TEST_STDPATHS
#include "wx/stdpaths.h"
+#include "wx/wxchar.h" // wxPrintf
static void TestStandardPaths()
{
wxPuts(_T(", ok."));
}
+#include "wx/timer.h"
+#include "wx/evtloop.h"
+
+void TestTimer()
+{
+ wxPuts(_T("*** Testing wxTimer ***\n"));
+
+ class MyTimer : public wxTimer
+ {
+ public:
+ MyTimer() : wxTimer() { m_num = 0; }
+
+ virtual void Notify()
+ {
+ wxPrintf(_T("%d"), m_num++);
+ fflush(stdout);
+
+ if ( m_num == 10 )
+ {
+ wxPrintf(_T("... exiting the event loop"));
+ Stop();
+
+ wxEventLoop::GetActive()->Exit(0);
+ wxPuts(_T(", ok."));
+ }
+
+ fflush(stdout);
+ }
+
+ private:
+ int m_num;
+ };
+
+ wxEventLoop loop;
+
+ wxTimer timer1;
+ timer1.Start(100, true /* one shot */);
+ timer1.Stop();
+ timer1.Start(100, true /* one shot */);
+
+ MyTimer timer;
+ timer.Start(500);
+
+ loop.Run();
+}
+
#endif // TEST_TIMER
// ----------------------------------------------------------------------------
wxPuts(_T("*** Testing ZIP reading ***\n"));
static const wxString filename = _T("foo");
- wxZipInputStream istr(TESTFILE_ZIP, filename);
+ wxFFileInputStream in(TESTFILE_ZIP);
+ wxZipInputStream istr(in);
+ wxZipEntry entry(filename);
+ istr.OpenEntry(entry);
+
wxPrintf(_T("Archive size: %u\n"), istr.GetSize());
wxPrintf(_T("Dumping the file '%s':\n"), filename.c_str());
#if wxUSE_CMDLINE_PARSER
static const wxCmdLineEntryDesc cmdLineDesc[] =
{
- { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("show this help message"),
+ { wxCMD_LINE_SWITCH, "h", "help", "show this help message",
wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
- { wxCMD_LINE_SWITCH, _T("v"), _T("verbose"), _T("be verbose") },
- { wxCMD_LINE_SWITCH, _T("q"), _T("quiet"), _T("be quiet") },
+ { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" },
+ { wxCMD_LINE_SWITCH, "q", "quiet", "be quiet" },
- { wxCMD_LINE_OPTION, _T("o"), _T("output"), _T("output file") },
- { wxCMD_LINE_OPTION, _T("i"), _T("input"), _T("input dir") },
- { wxCMD_LINE_OPTION, _T("s"), _T("size"), _T("output block size"),
+ { wxCMD_LINE_OPTION, "o", "output", "output file" },
+ { wxCMD_LINE_OPTION, "i", "input", "input dir" },
+ { wxCMD_LINE_OPTION, "s", "size", "output block size",
wxCMD_LINE_VAL_NUMBER },
- { wxCMD_LINE_OPTION, _T("d"), _T("date"), _T("output file date"),
+ { wxCMD_LINE_OPTION, "d", "date", "output file date",
wxCMD_LINE_VAL_DATE },
+ { wxCMD_LINE_OPTION, "f", "double", "output double",
+ wxCMD_LINE_VAL_DOUBLE },
- { wxCMD_LINE_PARAM, NULL, NULL, _T("input file"),
+ { wxCMD_LINE_PARAM, NULL, NULL, "input file",
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE },
{ wxCMD_LINE_NONE }
#endif // TEST_FTP
#ifdef TEST_MIME
- wxLog::AddTraceMask(_T("mime"));
- #if TEST_ALL
- TestMimeEnum();
- #endif
- TestMimeOverride();
- TestMimeAssociate();
+ //wxLog::AddTraceMask(_T("mime"));
+ TestMimeEnum();
+#if 0
+ TestMimeOverride();
+ TestMimeAssociate();
+#endif
TestMimeFilename();
#endif // TEST_MIME
TestPathList();
#endif // TEST_PATHLIST
-#ifdef TEST_ODBC
- TestDbOpen();
-#endif // TEST_ODBC
-
#ifdef TEST_PRINTF
TestPrintf();
#endif // TEST_PRINTF
#ifdef TEST_TIMER
TestStopWatch();
+ TestTimer();
#endif // TEST_TIMER
#ifdef TEST_DATETIME
projects / wxWidgets.git / blobdiff