#include "wx/string.h"
#include "wx/file.h"
#include "wx/app.h"
+#include "wx/log.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)? uncomment the line below to do all tests
-// #define TEST_ALL
+//#define TEST_ALL
#ifdef TEST_ALL
#define TEST_ARRAYS
#define TEST_CHARSET
#define TEST_MIME
#define TEST_PATHLIST
#define TEST_ODBC
+ #define TEST_PRINTF
#define TEST_REGCONF
#define TEST_REGEX
#define TEST_REGISTRY
+ #define TEST_SCOPEGUARD
#define TEST_SNGLINST
#define TEST_SOCKETS
#define TEST_STREAMS
#define TEST_STRINGS
+ #define TEST_TEXTSTREAM
#define TEST_THREADS
#define TEST_TIMER
+ #define TEST_UNICODE
// #define TEST_VCARD -- don't enable this (VZ)
#define TEST_VOLUME
#define TEST_WCHAR
#define TEST_ZLIB
#undef TEST_ALL
- static const bool TEST_ALL = TRUE;
+ static const bool TEST_ALL = true;
#else
- #define TEST_ARRAYS
+ #define TEST_HASHMAP
- static const bool TEST_ALL = FALSE;
+ static const bool TEST_ALL = false;
#endif
// some tests are interactive, define this to run them
#ifdef TEST_INTERACTIVE
#undef TEST_INTERACTIVE
- static const bool TEST_INTERACTIVE = TRUE;
+ static const bool TEST_INTERACTIVE = true;
#else
- static const bool TEST_INTERACTIVE = FALSE;
+ static const bool TEST_INTERACTIVE = false;
#endif
// ----------------------------------------------------------------------------
static size_t GetNumber() { return ms_bars; }
- const char *GetName() const { return m_name; }
+ const wxChar *GetName() const { return m_name; }
private:
wxString m_name;
static void ShowCmdLine(const wxCmdLineParser& parser)
{
- wxString s = "Input files: ";
+ wxString s = _T("Input files: ");
size_t count = parser.GetParamCount();
for ( size_t param = 0; param < count; param++ )
}
s << '\n'
- << "Verbose:\t" << (parser.Found("v") ? "yes" : "no") << '\n'
- << "Quiet:\t" << (parser.Found("q") ? "yes" : "no") << '\n';
+ << _T("Verbose:\t") << (parser.Found(_T("v")) ? _T("yes") : _T("no")) << '\n'
+ << _T("Quiet:\t") << (parser.Found(_T("q")) ? _T("yes") : _T("no")) << '\n';
wxString strVal;
long lVal;
wxDateTime dt;
- if ( parser.Found("o", &strVal) )
- s << "Output file:\t" << strVal << '\n';
- if ( parser.Found("i", &strVal) )
- s << "Input dir:\t" << strVal << '\n';
- if ( parser.Found("s", &lVal) )
- s << "Size:\t" << lVal << '\n';
- if ( parser.Found("d", &dt) )
- s << "Date:\t" << dt.FormatISODate() << '\n';
- if ( parser.Found("project_name", &strVal) )
- s << "Project:\t" << strVal << '\n';
+ if ( parser.Found(_T("o"), &strVal) )
+ s << _T("Output file:\t") << strVal << '\n';
+ if ( parser.Found(_T("i"), &strVal) )
+ s << _T("Input dir:\t") << strVal << '\n';
+ if ( parser.Found(_T("s"), &lVal) )
+ s << _T("Size:\t") << lVal << '\n';
+ if ( parser.Found(_T("d"), &dt) )
+ s << _T("Date:\t") << dt.FormatISODate() << '\n';
+ if ( parser.Found(_T("project_name"), &strVal) )
+ s << _T("Project:\t") << strVal << '\n';
wxLogMessage(s);
}
static void TestCmdLineConvert()
{
- static const char *cmdlines[] =
+ static const wxChar *cmdlines[] =
{
- "arg1 arg2",
- "-a \"-bstring 1\" -c\"string 2\" \"string 3\"",
- "literal \\\" and \"\"",
+ _T("arg1 arg2"),
+ _T("-a \"-bstring 1\" -c\"string 2\" \"string 3\""),
+ _T("literal \\\" and \"\""),
};
for ( size_t n = 0; n < WXSIZEOF(cmdlines); n++ )
{
- const char *cmdline = cmdlines[n];
- printf("Parsing: %s\n", cmdline);
+ const wxChar *cmdline = cmdlines[n];
+ wxPrintf(_T("Parsing: %s\n"), cmdline);
wxArrayString args = wxCmdLineParser::ConvertStringToArgs(cmdline);
size_t count = args.GetCount();
- printf("\targc = %u\n", count);
+ wxPrintf(_T("\targc = %u\n"), count);
for ( size_t arg = 0; arg < count; arg++ )
{
- printf("\targv[%u] = %s\n", arg, args[arg].c_str());
+ wxPrintf(_T("\targv[%u] = %s\n"), arg, args[arg].c_str());
}
}
}
#ifdef __UNIX__
static const wxChar *ROOTDIR = _T("/");
- static const wxChar *TESTDIR = _T("/usr");
+ static const wxChar *TESTDIR = _T("/usr/local/share");
#elif defined(__WXMSW__)
static const wxChar *ROOTDIR = _T("c:\\");
static const wxChar *TESTDIR = _T("d:\\");
bool cont = dir.GetFirst(&filename, filespec, flags);
while ( cont )
{
- printf("\t%s\n", filename.c_str());
+ wxPrintf(_T("\t%s\n"), filename.c_str());
cont = dir.GetNext(&filename);
}
- puts("");
+ wxPuts(_T(""));
}
static void TestDirEnum()
{
- puts("*** Testing wxDir::GetFirst/GetNext ***");
+ wxPuts(_T("*** Testing wxDir::GetFirst/GetNext ***"));
- wxDir dir(wxGetCwd());
+ wxString cwd = wxGetCwd();
+ if ( !wxDir::Exists(cwd) )
+ {
+ wxPrintf(_T("ERROR: current directory '%s' doesn't exist?\n"), cwd.c_str());
+ return;
+ }
+
+ wxDir dir(cwd);
+ if ( !dir.IsOpened() )
+ {
+ wxPrintf(_T("ERROR: failed to open current directory '%s'.\n"), cwd.c_str());
+ return;
+ }
- puts("Enumerating everything in current directory:");
+ wxPuts(_T("Enumerating everything in current directory:"));
TestDirEnumHelper(dir);
- puts("Enumerating really everything in current directory:");
+ wxPuts(_T("Enumerating really everything in current directory:"));
TestDirEnumHelper(dir, wxDIR_DEFAULT | wxDIR_DOTDOT);
- puts("Enumerating object files in current directory:");
- TestDirEnumHelper(dir, wxDIR_DEFAULT, "*.o");
+ wxPuts(_T("Enumerating object files in current directory:"));
+ TestDirEnumHelper(dir, wxDIR_DEFAULT, "*.o*");
- puts("Enumerating directories in current directory:");
+ wxPuts(_T("Enumerating directories in current directory:"));
TestDirEnumHelper(dir, wxDIR_DIRS);
- puts("Enumerating files in current directory:");
+ wxPuts(_T("Enumerating files in current directory:"));
TestDirEnumHelper(dir, wxDIR_FILES);
- puts("Enumerating files including hidden in current directory:");
+ wxPuts(_T("Enumerating files including hidden in current directory:"));
TestDirEnumHelper(dir, wxDIR_FILES | wxDIR_HIDDEN);
dir.Open(ROOTDIR);
- puts("Enumerating everything in root directory:");
+ wxPuts(_T("Enumerating everything in root directory:"));
TestDirEnumHelper(dir, wxDIR_DEFAULT);
- puts("Enumerating directories in root directory:");
+ wxPuts(_T("Enumerating directories in root directory:"));
TestDirEnumHelper(dir, wxDIR_DIRS);
- puts("Enumerating files in root directory:");
+ wxPuts(_T("Enumerating files in root directory:"));
TestDirEnumHelper(dir, wxDIR_FILES);
- puts("Enumerating files including hidden in root directory:");
+ wxPuts(_T("Enumerating files including hidden in root directory:"));
TestDirEnumHelper(dir, wxDIR_FILES | wxDIR_HIDDEN);
- puts("Enumerating files in non existing directory:");
+ wxPuts(_T("Enumerating files in non existing directory:"));
wxDir dirNo("nosuchdir");
TestDirEnumHelper(dirNo);
}
indent += _T(" ");
}
- printf("%s%s\n", indent.c_str(), name.c_str());
+ wxPrintf(_T("%s%s\n"), indent.c_str(), name.c_str());
return wxDIR_CONTINUE;
}
static void TestDirTraverse()
{
- puts("*** Testing wxDir::Traverse() ***");
+ wxPuts(_T("*** Testing wxDir::Traverse() ***"));
// enum all files
wxArrayString files;
size_t n = wxDir::GetAllFiles(TESTDIR, &files);
- printf("There are %u files under '%s'\n", n, TESTDIR);
+ wxPrintf(_T("There are %u files under '%s'\n"), n, TESTDIR);
if ( n > 1 )
{
- printf("First one is '%s'\n", files[0u].c_str());
- printf(" last one is '%s'\n", files[n - 1].c_str());
+ wxPrintf(_T("First one is '%s'\n"), files[0u].c_str());
+ wxPrintf(_T(" last one is '%s'\n"), files[n - 1].c_str());
}
// enum again with custom traverser
+ wxPuts(_T("Now enumerating directories:"));
wxDir dir(TESTDIR);
DirPrintTraverser traverser;
dir.Traverse(traverser, _T(""), wxDIR_DIRS | wxDIR_HIDDEN);
}
+static void TestDirExists()
+{
+ wxPuts(_T("*** Testing wxDir::Exists() ***"));
+
+ static const wxChar *dirnames[] =
+ {
+ _T("."),
+#if defined(__WXMSW__)
+ _T("c:"),
+ _T("c:\\"),
+ _T("\\\\share\\file"),
+ _T("c:\\dos"),
+ _T("c:\\dos\\"),
+ _T("c:\\dos\\\\"),
+ _T("c:\\autoexec.bat"),
+#elif defined(__UNIX__)
+ _T("/"),
+ _T("//"),
+ _T("/usr/bin"),
+ _T("/usr//bin"),
+ _T("/usr///bin"),
+#endif
+ };
+
+ for ( size_t n = 0; n < WXSIZEOF(dirnames); n++ )
+ {
+ wxPrintf(_T("%-40s: %s\n"),
+ dirnames[n],
+ wxDir::Exists(dirnames[n]) ? _T("exists")
+ : _T("doesn't exist"));
+ }
+}
+
#endif // TEST_DIR
// ----------------------------------------------------------------------------
#error "don't know how to test wxDllLoader on this platform"
#endif
- puts("*** testing wxDllLoader ***\n");
+ wxPuts(_T("*** testing wxDllLoader ***\n"));
- wxDllType dllHandle = wxDllLoader::LoadLibrary(LIB_NAME);
- if ( !dllHandle )
+ wxDynamicLibrary lib(LIB_NAME);
+ if ( !lib.IsLoaded() )
{
wxPrintf(_T("ERROR: failed to load '%s'.\n"), LIB_NAME);
}
else
{
- typedef int (*strlenType)(const char *);
- strlenType pfnStrlen = (strlenType)wxDllLoader::GetSymbol(dllHandle, FUNC_NAME);
+ typedef int (*wxStrlenType)(const char *);
+ wxStrlenType pfnStrlen = (wxStrlenType)lib.GetSymbol(FUNC_NAME);
if ( !pfnStrlen )
{
wxPrintf(_T("ERROR: function '%s' wasn't found in '%s'.\n"),
{
if ( pfnStrlen("foo") != 3 )
{
- wxPrintf(_T("ERROR: loaded function is not strlen()!\n"));
+ wxPrintf(_T("ERROR: loaded function is not wxStrlen()!\n"));
}
else
{
- puts("... ok");
+ wxPuts(_T("... ok"));
}
}
-
- wxDllLoader::UnloadLibrary(dllHandle);
}
}
{
const wxChar *var = _T("wxTestVar");
- puts("*** testing environment access functions ***");
+ wxPuts(_T("*** testing environment access functions ***"));
- printf("Initially getenv(%s) = %s\n", var, MyGetEnv(var).c_str());
+ wxPrintf(_T("Initially getenv(%s) = %s\n"), var, MyGetEnv(var).c_str());
wxSetEnv(var, _T("value for wxTestVar"));
- printf("After wxSetEnv: getenv(%s) = %s\n", var, MyGetEnv(var).c_str());
+ wxPrintf(_T("After wxSetEnv: getenv(%s) = %s\n"), var, MyGetEnv(var).c_str());
wxSetEnv(var, _T("another value"));
- printf("After 2nd wxSetEnv: getenv(%s) = %s\n", var, MyGetEnv(var).c_str());
+ wxPrintf(_T("After 2nd wxSetEnv: getenv(%s) = %s\n"), var, MyGetEnv(var).c_str());
wxUnsetEnv(var);
- printf("After wxUnsetEnv: getenv(%s) = %s\n", var, MyGetEnv(var).c_str());
- printf("PATH = %s\n", MyGetEnv(_T("PATH")).c_str());
+ wxPrintf(_T("After wxUnsetEnv: getenv(%s) = %s\n"), var, MyGetEnv(var).c_str());
+ wxPrintf(_T("PATH = %s\n"), MyGetEnv(_T("PATH")).c_str());
}
#endif // TEST_ENVIRON
static void TestExecute()
{
- puts("*** testing wxExecute ***");
+ wxPuts(_T("*** testing wxExecute ***"));
#ifdef __UNIX__
#define COMMAND "cat -n ../../Makefile" // "echo hi"
#define SHELL_COMMAND "echo hi from shell"
#define REDIRECT_COMMAND COMMAND // "date"
#elif defined(__WXMSW__)
- #define COMMAND "command.com -c 'echo hi'"
+ #define COMMAND "command.com /c echo hi"
#define SHELL_COMMAND "echo hi"
#define REDIRECT_COMMAND COMMAND
#else
#error "no command to exec"
#endif // OS
- printf("Testing wxShell: ");
+ wxPrintf(_T("Testing wxShell: "));
fflush(stdout);
if ( wxShell(SHELL_COMMAND) )
- puts("Ok.");
+ wxPuts(_T("Ok."));
else
- puts("ERROR.");
+ wxPuts(_T("ERROR."));
- printf("Testing wxExecute: ");
+ wxPrintf(_T("Testing wxExecute: "));
fflush(stdout);
- if ( wxExecute(COMMAND, TRUE /* sync */) == 0 )
- puts("Ok.");
+ if ( wxExecute(COMMAND, true /* sync */) == 0 )
+ wxPuts(_T("Ok."));
else
- puts("ERROR.");
+ wxPuts(_T("ERROR."));
#if 0 // no, it doesn't work (yet?)
- printf("Testing async wxExecute: ");
+ wxPrintf(_T("Testing async wxExecute: "));
fflush(stdout);
if ( wxExecute(COMMAND) != 0 )
- puts("Ok (command launched).");
+ wxPuts(_T("Ok (command launched)."));
else
- puts("ERROR.");
+ wxPuts(_T("ERROR."));
#endif // 0
- printf("Testing wxExecute with redirection:\n");
+ wxPrintf(_T("Testing wxExecute with redirection:\n"));
wxArrayString output;
if ( wxExecute(REDIRECT_COMMAND, output) != 0 )
{
- puts("ERROR.");
+ wxPuts(_T("ERROR."));
}
else
{
size_t count = output.GetCount();
for ( size_t n = 0; n < count; n++ )
{
- printf("\t%s\n", output[n].c_str());
+ wxPrintf(_T("\t%s\n"), output[n].c_str());
}
- puts("Ok.");
+ wxPuts(_T("Ok."));
}
}
static void TestFileRead()
{
- puts("*** wxFile read test ***");
+ wxPuts(_T("*** wxFile read test ***"));
wxFile file(_T("testdata.fc"));
if ( file.IsOpened() )
{
- printf("File length: %lu\n", file.Length());
+ wxPrintf(_T("File length: %lu\n"), file.Length());
- puts("File dump:\n----------");
+ wxPuts(_T("File dump:\n----------"));
static const off_t len = 1024;
- char buf[len];
+ wxChar buf[len];
for ( ;; )
{
off_t nRead = file.Read(buf, len);
if ( nRead == wxInvalidOffset )
{
- printf("Failed to read the file.");
+ wxPrintf(_T("Failed to read the file."));
break;
}
break;
}
- puts("----------");
+ wxPuts(_T("----------"));
}
else
{
- printf("ERROR: can't open test file.\n");
+ wxPrintf(_T("ERROR: can't open test file.\n"));
}
- puts("");
+ wxPuts(_T(""));
}
static void TestTextFileRead()
{
- puts("*** wxTextFile read test ***");
+ wxPuts(_T("*** wxTextFile read test ***"));
wxTextFile file(_T("testdata.fc"));
if ( file.Open() )
{
- printf("Number of lines: %u\n", file.GetLineCount());
- printf("Last line: '%s'\n", file.GetLastLine().c_str());
+ wxPrintf(_T("Number of lines: %u\n"), file.GetLineCount());
+ wxPrintf(_T("Last line: '%s'\n"), file.GetLastLine().c_str());
wxString s;
- puts("\nDumping the entire file:");
+ wxPuts(_T("\nDumping the entire file:"));
for ( s = file.GetFirstLine(); !file.Eof(); s = file.GetNextLine() )
{
- printf("%6u: %s\n", file.GetCurrentLine() + 1, s.c_str());
+ wxPrintf(_T("%6u: %s\n"), file.GetCurrentLine() + 1, s.c_str());
}
- printf("%6u: %s\n", file.GetCurrentLine() + 1, s.c_str());
+ wxPrintf(_T("%6u: %s\n"), file.GetCurrentLine() + 1, s.c_str());
- puts("\nAnd now backwards:");
+ wxPuts(_T("\nAnd now backwards:"));
for ( s = file.GetLastLine();
file.GetCurrentLine() != 0;
s = file.GetPrevLine() )
{
- printf("%6u: %s\n", file.GetCurrentLine() + 1, s.c_str());
+ wxPrintf(_T("%6u: %s\n"), file.GetCurrentLine() + 1, s.c_str());
}
- printf("%6u: %s\n", file.GetCurrentLine() + 1, s.c_str());
+ wxPrintf(_T("%6u: %s\n"), file.GetCurrentLine() + 1, s.c_str());
}
else
{
- printf("ERROR: can't open '%s'\n", file.GetName());
+ wxPrintf(_T("ERROR: can't open '%s'\n"), file.GetName());
}
- puts("");
+ wxPuts(_T(""));
}
static void TestFileCopy()
{
- puts("*** Testing wxCopyFile ***");
+ wxPuts(_T("*** Testing wxCopyFile ***"));
static const wxChar *filename1 = _T("testdata.fc");
static const wxChar *filename2 = _T("test2");
if ( !wxCopyFile(filename1, filename2) )
{
- puts("ERROR: failed to copy file");
+ wxPuts(_T("ERROR: failed to copy file"));
}
else
{
if ( !f1.IsOpened() || !f2.IsOpened() )
{
- puts("ERROR: failed to open file(s)");
+ wxPuts(_T("ERROR: failed to open file(s)"));
}
else
{
wxString s1, s2;
if ( !f1.ReadAll(&s1) || !f2.ReadAll(&s2) )
{
- puts("ERROR: failed to read file(s)");
+ wxPuts(_T("ERROR: failed to read file(s)"));
}
else
{
if ( (s1.length() != s2.length()) ||
(memcmp(s1.c_str(), s2.c_str(), s1.length()) != 0) )
{
- puts("ERROR: copy error!");
+ wxPuts(_T("ERROR: copy error!"));
}
else
{
- puts("File was copied ok.");
+ wxPuts(_T("File was copied ok."));
}
}
}
if ( !wxRemoveFile(filename2) )
{
- puts("ERROR: failed to remove the file");
+ wxPuts(_T("ERROR: failed to remove the file"));
}
- puts("");
+ wxPuts(_T(""));
}
#endif // TEST_FILE
static void TestFileConfRead()
{
- puts("*** testing wxFileConfig loading/reading ***");
+ wxPuts(_T("*** testing wxFileConfig loading/reading ***"));
wxFileConfig fileconf(_T("test"), wxEmptyString,
_T("testdata.fc"), wxEmptyString,
wxCONFIG_USE_RELATIVE_PATH);
// test simple reading
- puts("\nReading config file:");
+ wxPuts(_T("\nReading config file:"));
wxString defValue(_T("default")), value;
for ( size_t n = 0; n < WXSIZEOF(fcTestData); n++ )
{
const FileConfTestData& data = fcTestData[n];
value = fileconf.Read(data.name, defValue);
- printf("\t%s = %s ", data.name, value.c_str());
+ wxPrintf(_T("\t%s = %s "), data.name, value.c_str());
if ( value == data.value )
{
- puts("(ok)");
+ wxPuts(_T("(ok)"));
}
else
{
- printf("(ERROR: should be %s)\n", data.value);
+ wxPrintf(_T("(ERROR: should be %s)\n"), data.value);
}
}
// test enumerating the entries
- puts("\nEnumerating all root entries:");
+ wxPuts(_T("\nEnumerating all root entries:"));
long dummy;
wxString name;
bool cont = fileconf.GetFirstEntry(name, dummy);
while ( cont )
{
- printf("\t%s = %s\n",
+ wxPrintf(_T("\t%s = %s\n"),
name.c_str(),
fileconf.Read(name.c_str(), _T("ERROR")).c_str());
cont = fileconf.GetNextEntry(name, dummy);
}
+
+ static const wxChar *testEntry = _T("TestEntry");
+ wxPrintf(_T("\nTesting deletion of newly created \"Test\" entry: "));
+ fileconf.Write(testEntry, _T("A value"));
+ fileconf.DeleteEntry(testEntry);
+ wxPrintf(fileconf.HasEntry(testEntry) ? _T("ERROR\n") : _T("ok\n"));
}
#endif // TEST_FILECONF
fn.GetPath(wxPATH_GET_SEPARATOR).c_str());
wxPrintf(_T("with both: \t'%s'\n"),
fn.GetPath(wxPATH_GET_SEPARATOR | wxPATH_GET_VOLUME).c_str());
+
+ wxPuts(_T("The directories in the path are:"));
+ wxArrayString dirs = fn.GetDirs();
+ size_t count = dirs.GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ wxPrintf(_T("\t%u: %s\n"), n, dirs[n].c_str());
+ }
}
static struct FileNameInfo
} filenames[] =
{
// Unix file names
- { _T("/usr/bin/ls"), _T(""), _T("/usr/bin"), _T("ls"), _T(""), TRUE, wxPATH_UNIX },
- { _T("/usr/bin/"), _T(""), _T("/usr/bin"), _T(""), _T(""), TRUE, wxPATH_UNIX },
- { _T("~/.zshrc"), _T(""), _T("~"), _T(".zshrc"), _T(""), TRUE, wxPATH_UNIX },
- { _T("../../foo"), _T(""), _T("../.."), _T("foo"), _T(""), FALSE, wxPATH_UNIX },
- { _T("foo.bar"), _T(""), _T(""), _T("foo"), _T("bar"), FALSE, wxPATH_UNIX },
- { _T("~/foo.bar"), _T(""), _T("~"), _T("foo"), _T("bar"), TRUE, wxPATH_UNIX },
- { _T("/foo"), _T(""), _T("/"), _T("foo"), _T(""), TRUE, wxPATH_UNIX },
- { _T("Mahogany-0.60/foo.bar"), _T(""), _T("Mahogany-0.60"), _T("foo"), _T("bar"), FALSE, wxPATH_UNIX },
- { _T("/tmp/wxwin.tar.bz"), _T(""), _T("/tmp"), _T("wxwin.tar"), _T("bz"), TRUE, wxPATH_UNIX },
+ { _T("/usr/bin/ls"), _T(""), _T("/usr/bin"), _T("ls"), _T(""), true, wxPATH_UNIX },
+ { _T("/usr/bin/"), _T(""), _T("/usr/bin"), _T(""), _T(""), true, wxPATH_UNIX },
+ { _T("~/.zshrc"), _T(""), _T("~"), _T(".zshrc"), _T(""), true, wxPATH_UNIX },
+ { _T("../../foo"), _T(""), _T("../.."), _T("foo"), _T(""), false, wxPATH_UNIX },
+ { _T("foo.bar"), _T(""), _T(""), _T("foo"), _T("bar"), false, wxPATH_UNIX },
+ { _T("~/foo.bar"), _T(""), _T("~"), _T("foo"), _T("bar"), true, wxPATH_UNIX },
+ { _T("/foo"), _T(""), _T("/"), _T("foo"), _T(""), true, wxPATH_UNIX },
+ { _T("Mahogany-0.60/foo.bar"), _T(""), _T("Mahogany-0.60"), _T("foo"), _T("bar"), false, wxPATH_UNIX },
+ { _T("/tmp/wxwin.tar.bz"), _T(""), _T("/tmp"), _T("wxwin.tar"), _T("bz"), true, wxPATH_UNIX },
// Windows file names
- { _T("foo.bar"), _T(""), _T(""), _T("foo"), _T("bar"), FALSE, wxPATH_DOS },
- { _T("\\foo.bar"), _T(""), _T("\\"), _T("foo"), _T("bar"), FALSE, wxPATH_DOS },
- { _T("c:foo.bar"), _T("c"), _T(""), _T("foo"), _T("bar"), FALSE, wxPATH_DOS },
- { _T("c:\\foo.bar"), _T("c"), _T("\\"), _T("foo"), _T("bar"), TRUE, wxPATH_DOS },
- { _T("c:\\Windows\\command.com"), _T("c"), _T("\\Windows"), _T("command"), _T("com"), TRUE, wxPATH_DOS },
- { _T("\\\\server\\foo.bar"), _T("server"), _T("\\"), _T("foo"), _T("bar"), TRUE, wxPATH_DOS },
+ { _T("foo.bar"), _T(""), _T(""), _T("foo"), _T("bar"), false, wxPATH_DOS },
+ { _T("\\foo.bar"), _T(""), _T("\\"), _T("foo"), _T("bar"), false, wxPATH_DOS },
+ { _T("c:foo.bar"), _T("c"), _T(""), _T("foo"), _T("bar"), false, wxPATH_DOS },
+ { _T("c:\\foo.bar"), _T("c"), _T("\\"), _T("foo"), _T("bar"), true, wxPATH_DOS },
+ { _T("c:\\Windows\\command.com"), _T("c"), _T("\\Windows"), _T("command"), _T("com"), true, wxPATH_DOS },
+ { _T("\\\\server\\foo.bar"), _T("server"), _T("\\"), _T("foo"), _T("bar"), true, wxPATH_DOS },
+ { _T("\\\\server\\dir\\foo.bar"), _T("server"), _T("\\dir"), _T("foo"), _T("bar"), true, wxPATH_DOS },
// wxFileName support for Mac file names is broken currently
#if 0
// Mac file names
- { _T("Volume:Dir:File"), _T("Volume"), _T("Dir"), _T("File"), _T(""), TRUE, wxPATH_MAC },
- { _T("Volume:Dir:Subdir:File"), _T("Volume"), _T("Dir:Subdir"), _T("File"), _T(""), TRUE, wxPATH_MAC },
- { _T("Volume:"), _T("Volume"), _T(""), _T(""), _T(""), TRUE, wxPATH_MAC },
- { _T(":Dir:File"), _T(""), _T("Dir"), _T("File"), _T(""), FALSE, wxPATH_MAC },
- { _T(":File.Ext"), _T(""), _T(""), _T("File"), _T(".Ext"), FALSE, wxPATH_MAC },
- { _T("File.Ext"), _T(""), _T(""), _T("File"), _T(".Ext"), FALSE, wxPATH_MAC },
+ { _T("Volume:Dir:File"), _T("Volume"), _T("Dir"), _T("File"), _T(""), true, wxPATH_MAC },
+ { _T("Volume:Dir:Subdir:File"), _T("Volume"), _T("Dir:Subdir"), _T("File"), _T(""), true, wxPATH_MAC },
+ { _T("Volume:"), _T("Volume"), _T(""), _T(""), _T(""), true, wxPATH_MAC },
+ { _T(":Dir:File"), _T(""), _T("Dir"), _T("File"), _T(""), false, wxPATH_MAC },
+ { _T(":File.Ext"), _T(""), _T(""), _T("File"), _T(".Ext"), false, wxPATH_MAC },
+ { _T("File.Ext"), _T(""), _T(""), _T("File"), _T(".Ext"), false, wxPATH_MAC },
#endif // 0
// VMS file names
- { _T("device:[dir1.dir2.dir3]file.txt"), _T("device"), _T("dir1.dir2.dir3"), _T("file"), _T("txt"), TRUE, wxPATH_VMS },
- { _T("file.txt"), _T(""), _T(""), _T("file"), _T("txt"), FALSE, wxPATH_VMS },
+ { _T("device:[dir1.dir2.dir3]file.txt"), _T("device"), _T("dir1.dir2.dir3"), _T("file"), _T("txt"), true, wxPATH_VMS },
+ { _T("file.txt"), _T(""), _T(""), _T("file"), _T("txt"), false, wxPATH_VMS },
};
static void TestFileNameConstruction()
{
- puts("*** testing wxFileName construction ***");
+ wxPuts(_T("*** testing wxFileName construction ***"));
for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
{
wxString fullname = fn.GetFullPath(fni.format);
if ( fullname != fni.fullname )
{
- printf("ERROR: fullname should be '%s'\n", fni.fullname);
+ wxPrintf(_T("ERROR: fullname should be '%s'\n"), fni.fullname);
}
bool isAbsolute = fn.IsAbsolute(fni.format);
- printf("'%s' is %s (%s)\n\t",
+ wxPrintf(_T("'%s' is %s (%s)\n\t"),
fullname.c_str(),
isAbsolute ? "absolute" : "relative",
isAbsolute == fni.isAbsolute ? "ok" : "ERROR");
if ( !fn.Normalize(wxPATH_NORM_ALL, _T(""), fni.format) )
{
- puts("ERROR (couldn't be normalized)");
+ wxPuts(_T("ERROR (couldn't be normalized)"));
}
else
{
- printf("normalized: '%s'\n", fn.GetFullPath(fni.format).c_str());
+ wxPrintf(_T("normalized: '%s'\n"), fn.GetFullPath(fni.format).c_str());
}
}
- puts("");
+ wxPuts(_T(""));
}
static void TestFileNameSplit()
{
- puts("*** testing wxFileName splitting ***");
+ wxPuts(_T("*** testing wxFileName splitting ***"));
for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
{
wxFileName::SplitPath(fni.fullname,
&volume, &path, &name, &ext, fni.format);
- printf("%s -> volume = '%s', path = '%s', name = '%s', ext = '%s'",
+ wxPrintf(_T("%s -> volume = '%s', path = '%s', name = '%s', ext = '%s'"),
fni.fullname,
volume.c_str(), path.c_str(), name.c_str(), ext.c_str());
if ( volume != fni.volume )
- printf(" (ERROR: volume = '%s')", fni.volume);
+ wxPrintf(_T(" (ERROR: volume = '%s')"), fni.volume);
if ( path != fni.path )
- printf(" (ERROR: path = '%s')", fni.path);
+ wxPrintf(_T(" (ERROR: path = '%s')"), fni.path);
if ( name != fni.name )
- printf(" (ERROR: name = '%s')", fni.name);
+ wxPrintf(_T(" (ERROR: name = '%s')"), fni.name);
if ( ext != fni.ext )
- printf(" (ERROR: ext = '%s')", fni.ext);
+ wxPrintf(_T(" (ERROR: ext = '%s')"), fni.ext);
- puts("");
+ wxPuts(_T(""));
}
}
static void TestFileNameTemp()
{
- puts("*** testing wxFileName temp file creation ***");
+ wxPuts(_T("*** testing wxFileName temp file creation ***"));
- static const char *tmpprefixes[] =
+ static const wxChar *tmpprefixes[] =
{
- "",
- "foo",
- "..",
- "../bar",
+ _T(""),
+ _T("foo"),
+ _T(".."),
+ _T("../bar"),
#ifdef __UNIX__
- "/tmp/foo",
- "/tmp/foo/bar", // this one must be an error
+ _T("/tmp/foo"),
+ _T("/tmp/foo/bar"), // this one must be an error
#endif // __UNIX__
};
if ( path.empty() )
{
// "error" is not in upper case because it may be ok
- printf("Prefix '%s'\t-> error\n", tmpprefixes[n]);
+ wxPrintf(_T("Prefix '%s'\t-> error\n"), tmpprefixes[n]);
}
else
{
- printf("Prefix '%s'\t-> temp file '%s'\n",
+ wxPrintf(_T("Prefix '%s'\t-> temp file '%s'\n"),
tmpprefixes[n], path.c_str());
if ( !wxRemoveFile(path) )
{
- wxLogWarning("Failed to remove temp file '%s'", path.c_str());
+ wxLogWarning(_T("Failed to remove temp file '%s'"),
+ path.c_str());
}
}
}
static void TestFileNameMakeRelative()
{
- puts("*** testing wxFileName::MakeRelativeTo() ***");
+ wxPuts(_T("*** testing wxFileName::MakeRelativeTo() ***"));
for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
{
wxFAIL_MSG( "unexpected path format" );
}
- printf("'%s' relative to '%s': ",
+ wxPrintf(_T("'%s' relative to '%s': "),
fn.GetFullPath(fni.format).c_str(), base.c_str());
if ( !fn.MakeRelativeTo(base, fni.format) )
{
- puts("unchanged");
+ wxPuts(_T("unchanged"));
}
else
{
- printf("'%s'\n", fn.GetFullPath(fni.format).c_str());
+ wxPrintf(_T("'%s'\n"), fn.GetFullPath(fni.format).c_str());
}
}
}
+static void TestFileNameMakeAbsolute()
+{
+ wxPuts(_T("*** testing wxFileName::MakeAbsolute() ***"));
+
+ for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
+ {
+ const FileNameInfo& fni = filenames[n];
+ wxFileName fn(fni.fullname, fni.format);
+
+ wxPrintf(_T("'%s' absolutized: "),
+ fn.GetFullPath(fni.format).c_str());
+ fn.MakeAbsolute();
+ wxPrintf(_T("'%s'\n"), fn.GetFullPath(fni.format).c_str());
+ }
+
+ wxPuts(_T(""));
+}
+
static void TestFileNameComparison()
{
// TODO!
static void TestHash()
{
- puts("*** Testing wxHashTable ***\n");
+ wxPuts(_T("*** Testing wxHashTable ***\n"));
+
+ {
+ wxHashTable hash(wxKEY_INTEGER), hash2(wxKEY_STRING);
+ int i;
+
+ for ( i = 0; i < 100; ++i )
+ hash.Put(i, (wxObject*)&i + i);
+
+ hash.BeginFind();
+ wxHashTable::compatibility_iterator it = hash.Next();
+ i = 0;
+
+ while (it)
+ {
+ ++i;
+ it = hash.Next();
+ }
+
+ if (i != 100)
+ wxPuts(_T("Error in wxHashTable::compatibility_iterator\n"));
+
+ for ( i = 99; i >= 0; --i )
+ if( hash.Get(i) != (wxObject*)&i + i )
+ wxPuts(_T("Error in wxHashTable::Get/Put\n"));
+ hash2.Put("foo", (wxObject*)&i + 1);
+ hash2.Put("bar", (wxObject*)&i + 2);
+ hash2.Put("baz", (wxObject*)&i + 3);
+
+ if (hash2.Get("moo") != NULL)
+ wxPuts(_T("Error in wxHashTable::Get\n"));
+
+ if (hash2.Get("bar") != (wxObject*)&i + 2)
+ wxPuts(_T("Error in wxHashTable::Get/Put\n"));
+ }
+#if !wxUSE_STL
{
wxHashFoos hash;
- hash.DeleteContents(TRUE);
+ hash.DeleteContents(true);
- printf("Hash created: %u foos in hash, %u foos totally\n",
+ wxPrintf(_T("Hash created: %u foos in hash, %u foos totally\n"),
hash.GetCount(), Foo::count);
static const int hashTestData[] =
hash.Put(hashTestData[n], n, new Foo(n));
}
- printf("Hash filled: %u foos in hash, %u foos totally\n",
+ wxPrintf(_T("Hash filled: %u foos in hash, %u foos totally\n"),
hash.GetCount(), Foo::count);
- puts("Hash access test:");
+ wxPuts(_T("Hash access test:"));
for ( n = 0; n < WXSIZEOF(hashTestData); n++ )
{
- printf("\tGetting element with key %d, value %d: ",
+ wxPrintf(_T("\tGetting element with key %d, value %d: "),
hashTestData[n], n);
Foo *foo = hash.Get(hashTestData[n], n);
if ( !foo )
{
- printf("ERROR, not found.\n");
+ wxPrintf(_T("ERROR, not found.\n"));
}
else
{
- printf("%d (%s)\n", foo->n,
+ wxPrintf(_T("%d (%s)\n"), foo->n,
(size_t)foo->n == n ? "ok" : "ERROR");
}
}
- printf("\nTrying to get an element not in hash: ");
+ wxPrintf(_T("\nTrying to get an element not in hash: "));
if ( hash.Get(1234) || hash.Get(1, 0) )
{
- puts("ERROR: found!");
+ wxPuts(_T("ERROR: found!"));
}
else
{
- puts("ok (not found)");
+ wxPuts(_T("ok (not found)"));
}
}
+#endif
- printf("Hash destroyed: %u foos left\n", Foo::count);
+ wxPrintf(_T("Hash destroyed: %u foos left\n"), Foo::count);
+ wxPuts(_T("*** Testing wxHashTable finished ***\n"));
}
#endif // TEST_HASH
static void TestHashMap()
{
- puts("*** Testing wxHashMap ***\n");
+ wxPuts(_T("*** Testing wxHashMap ***\n"));
myStringHashMap sh(0); // as small as possible
wxString buf;
size_t i;
// test that insertion worked
if( sh.size() != count )
{
- printf("*** ERROR: %u ELEMENTS, SHOULD BE %u ***\n", sh.size(), count);
+ wxPrintf(_T("*** ERROR: %u ELEMENTS, SHOULD BE %u ***\n"), sh.size(), count);
}
for( i = 0; i < count; ++i )
buf.Printf(wxT("%d"), i );
if( sh[buf] != wxT("A") + buf + wxT("C") )
{
- printf("*** ERROR INSERTION BROKEN! STOPPING NOW! ***\n");
+ wxPrintf(_T("*** ERROR INSERTION BROKEN! STOPPING NOW! ***\n"));
return;
}
}
{
if( i == count )
{
- printf("*** ERROR ITERATORS DO NOT TERMINATE! STOPPING NOW! ***\n");
+ wxPrintf(_T("*** ERROR ITERATORS DO NOT TERMINATE! STOPPING NOW! ***\n"));
return;
}
if( it->second != sh[it->first] )
{
- printf("*** ERROR ITERATORS BROKEN! STOPPING NOW! ***\n");
+ wxPrintf(_T("*** ERROR ITERATORS BROKEN! STOPPING NOW! ***\n"));
return;
}
}
if( sh.size() != i )
{
- printf("*** ERROR: %u ELEMENTS ITERATED, SHOULD BE %u ***\n", i, count);
+ wxPrintf(_T("*** ERROR: %u ELEMENTS ITERATED, SHOULD BE %u ***\n"), i, count);
}
// test copy ctor, assignment operator
{
if( h1[it->first] != it->second )
{
- printf("*** ERROR: COPY CTOR BROKEN %s ***\n", it->first.c_str());
+ wxPrintf(_T("*** ERROR: COPY CTOR BROKEN %s ***\n"), it->first.c_str());
}
if( h2[it->first] != it->second )
{
- printf("*** ERROR: OPERATOR= BROKEN %s ***\n", it->first.c_str());
+ wxPrintf(_T("*** ERROR: OPERATOR= BROKEN %s ***\n"), it->first.c_str());
}
}
if( sh.find( buf ) != sh.end() )
{
- printf("*** ERROR: FOUND DELETED ELEMENT %u ***\n", i);
+ wxPrintf(_T("*** ERROR: FOUND DELETED ELEMENT %u ***\n"), i);
}
}
else
- printf("*** ERROR: CANT FIND ELEMENT %u ***\n", i);
+ wxPrintf(_T("*** ERROR: CANT FIND ELEMENT %u ***\n"), i);
}
else
// test erase(key)
{
size_t c = sh.erase( buf );
if( c != 1 )
- printf("*** ERROR: SHOULD RETURN 1 ***\n");
+ wxPrintf(_T("*** ERROR: SHOULD RETURN 1 ***\n"));
if( sh.find( buf ) != sh.end() )
{
- printf("*** ERROR: FOUND DELETED ELEMENT %u ***\n", i);
+ wxPrintf(_T("*** ERROR: FOUND DELETED ELEMENT %u ***\n"), i);
}
}
// count should decrease
if( sh.size() != sz - 1 )
{
- printf("*** ERROR: COUNT DID NOT DECREASE ***\n");
+ wxPrintf(_T("*** ERROR: COUNT DID NOT DECREASE ***\n"));
}
}
- printf("*** Finished testing wxHashMap ***\n");
+ wxPrintf(_T("*** Finished testing wxHashMap ***\n"));
}
#endif // TEST_HASHMAP
#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxListBars);
+WX_DECLARE_LIST(int, wxListInt);
+WX_DEFINE_LIST(wxListInt);
+
+static void TestList()
+{
+ wxPuts(_T("*** Testing wxList operations ***\n"));
+ {
+ wxListInt list1;
+ int dummy[5];
+ int i;
+
+ for ( i = 0; i < 5; ++i )
+ list1.Append(dummy + i);
+
+ if ( list1.GetCount() != 5 )
+ wxPuts(_T("Wrong number of items in list\n"));
+
+ if ( list1.Item(3)->GetData() != dummy + 3 )
+ wxPuts(_T("Error in Item()\n"));
+
+ if ( !list1.Find(dummy + 4) )
+ wxPuts(_T("Error in Find()\n"));
+
+ wxListInt::compatibility_iterator node = list1.GetFirst();
+ i = 0;
+
+ while (node)
+ {
+ if ( node->GetData() != dummy + i )
+ wxPuts(_T("Error in compatibility_iterator\n"));
+ node = node->GetNext();
+ ++i;
+ }
+
+ if ( size_t(i) != list1.GetCount() )
+ wxPuts(_T("Error in compatibility_iterator\n"));
+
+ list1.Insert(dummy + 0);
+ list1.Insert(1, dummy + 1);
+ list1.Insert(list1.GetFirst()->GetNext()->GetNext(), dummy + 2);
+
+ node = list1.GetFirst();
+ i = 0;
+
+ while (i < 3)
+ {
+ int* t = node->GetData();
+ if ( t != dummy + i )
+ wxPuts(_T("Error in Insert\n"));
+ node = node->GetNext();
+ ++i;
+ }
+ }
+
+ wxPuts(_T("*** Testing wxList operations finished ***\n"));
+
+ wxPuts(_T("*** Testing std::list operations ***\n"));
+
+ {
+ wxListInt list1;
+ wxListInt::iterator it, en;
+ wxListInt::reverse_iterator rit, ren;
+ int i;
+ for ( i = 0; i < 5; ++i )
+ list1.push_back(i + &i);
+
+ for ( it = list1.begin(), en = list1.end(), i = 0;
+ it != en; ++it, ++i )
+ if ( *it != i + &i )
+ wxPuts(_T("Error in iterator\n"));
+
+ for ( rit = list1.rbegin(), ren = list1.rend(), i = 4;
+ rit != ren; ++rit, --i )
+ if ( *rit != i + &i )
+ wxPuts(_T("Error in reverse_iterator\n"));
+
+ if ( *list1.rbegin() != *--list1.end() ||
+ *list1.begin() != *--list1.rend() )
+ wxPuts(_T("Error in iterator/reverse_iterator\n"));
+ if ( *list1.begin() != *--++list1.begin() ||
+ *list1.rbegin() != *--++list1.rbegin() )
+ wxPuts(_T("Error in iterator/reverse_iterator\n"));
+
+ if ( list1.front() != &i || list1.back() != &i + 4 )
+ wxPuts(_T("Error in front()/back()\n"));
+
+ list1.erase(list1.begin());
+ list1.erase(--list1.end());
+
+ for ( it = list1.begin(), en = list1.end(), i = 1;
+ it != en; ++it, ++i )
+ if ( *it != i + &i )
+ wxPuts(_T("Error in erase()\n"));
+ }
+
+ wxPuts(_T("*** Testing std::list operations finished ***\n"));
+}
+
static void TestListCtor()
{
- puts("*** Testing wxList construction ***\n");
+ wxPuts(_T("*** Testing wxList construction ***\n"));
{
wxListBars list1;
list1.Append(new Bar(_T("first")));
list1.Append(new Bar(_T("second")));
- printf("After 1st list creation: %u objects in the list, %u objects total.\n",
+ wxPrintf(_T("After 1st list creation: %u objects in the list, %u objects total.\n"),
list1.GetCount(), Bar::GetNumber());
wxListBars list2;
list2 = list1;
- printf("After 2nd list creation: %u and %u objects in the lists, %u objects total.\n",
+ wxPrintf(_T("After 2nd list creation: %u and %u objects in the lists, %u objects total.\n"),
list1.GetCount(), list2.GetCount(), Bar::GetNumber());
- list1.DeleteContents(TRUE);
+#if !wxUSE_STL
+ list1.DeleteContents(true);
+#else
+ WX_CLEAR_LIST(wxListBars, list1);
+#endif
}
- printf("After list destruction: %u objects left.\n", Bar::GetNumber());
+ wxPrintf(_T("After list destruction: %u objects left.\n"), Bar::GetNumber());
}
#endif // TEST_LIST
static wxLocale gs_localeDefault(wxLANGUAGE_ENGLISH);
// find the name of the language from its value
-static const char *GetLangName(int lang)
-{
- static const char *languageNames[] =
- {
- "DEFAULT",
- "UNKNOWN",
- "ABKHAZIAN",
- "AFAR",
- "AFRIKAANS",
- "ALBANIAN",
- "AMHARIC",
- "ARABIC",
- "ARABIC_ALGERIA",
- "ARABIC_BAHRAIN",
- "ARABIC_EGYPT",
- "ARABIC_IRAQ",
- "ARABIC_JORDAN",
- "ARABIC_KUWAIT",
- "ARABIC_LEBANON",
- "ARABIC_LIBYA",
- "ARABIC_MOROCCO",
- "ARABIC_OMAN",
- "ARABIC_QATAR",
- "ARABIC_SAUDI_ARABIA",
- "ARABIC_SUDAN",
- "ARABIC_SYRIA",
- "ARABIC_TUNISIA",
- "ARABIC_UAE",
- "ARABIC_YEMEN",
- "ARMENIAN",
- "ASSAMESE",
- "AYMARA",
- "AZERI",
- "AZERI_CYRILLIC",
- "AZERI_LATIN",
- "BASHKIR",
- "BASQUE",
- "BELARUSIAN",
- "BENGALI",
- "BHUTANI",
- "BIHARI",
- "BISLAMA",
- "BRETON",
- "BULGARIAN",
- "BURMESE",
- "CAMBODIAN",
- "CATALAN",
- "CHINESE",
- "CHINESE_SIMPLIFIED",
- "CHINESE_TRADITIONAL",
- "CHINESE_HONGKONG",
- "CHINESE_MACAU",
- "CHINESE_SINGAPORE",
- "CHINESE_TAIWAN",
- "CORSICAN",
- "CROATIAN",
- "CZECH",
- "DANISH",
- "DUTCH",
- "DUTCH_BELGIAN",
- "ENGLISH",
- "ENGLISH_UK",
- "ENGLISH_US",
- "ENGLISH_AUSTRALIA",
- "ENGLISH_BELIZE",
- "ENGLISH_BOTSWANA",
- "ENGLISH_CANADA",
- "ENGLISH_CARIBBEAN",
- "ENGLISH_DENMARK",
- "ENGLISH_EIRE",
- "ENGLISH_JAMAICA",
- "ENGLISH_NEW_ZEALAND",
- "ENGLISH_PHILIPPINES",
- "ENGLISH_SOUTH_AFRICA",
- "ENGLISH_TRINIDAD",
- "ENGLISH_ZIMBABWE",
- "ESPERANTO",
- "ESTONIAN",
- "FAEROESE",
- "FARSI",
- "FIJI",
- "FINNISH",
- "FRENCH",
- "FRENCH_BELGIAN",
- "FRENCH_CANADIAN",
- "FRENCH_LUXEMBOURG",
- "FRENCH_MONACO",
- "FRENCH_SWISS",
- "FRISIAN",
- "GALICIAN",
- "GEORGIAN",
- "GERMAN",
- "GERMAN_AUSTRIAN",
- "GERMAN_BELGIUM",
- "GERMAN_LIECHTENSTEIN",
- "GERMAN_LUXEMBOURG",
- "GERMAN_SWISS",
- "GREEK",
- "GREENLANDIC",
- "GUARANI",
- "GUJARATI",
- "HAUSA",
- "HEBREW",
- "HINDI",
- "HUNGARIAN",
- "ICELANDIC",
- "INDONESIAN",
- "INTERLINGUA",
- "INTERLINGUE",
- "INUKTITUT",
- "INUPIAK",
- "IRISH",
- "ITALIAN",
- "ITALIAN_SWISS",
- "JAPANESE",
- "JAVANESE",
- "KANNADA",
- "KASHMIRI",
- "KASHMIRI_INDIA",
- "KAZAKH",
- "KERNEWEK",
- "KINYARWANDA",
- "KIRGHIZ",
- "KIRUNDI",
- "KONKANI",
- "KOREAN",
- "KURDISH",
- "LAOTHIAN",
- "LATIN",
- "LATVIAN",
- "LINGALA",
- "LITHUANIAN",
- "MACEDONIAN",
- "MALAGASY",
- "MALAY",
- "MALAYALAM",
- "MALAY_BRUNEI_DARUSSALAM",
- "MALAY_MALAYSIA",
- "MALTESE",
- "MANIPURI",
- "MAORI",
- "MARATHI",
- "MOLDAVIAN",
- "MONGOLIAN",
- "NAURU",
- "NEPALI",
- "NEPALI_INDIA",
- "NORWEGIAN_BOKMAL",
- "NORWEGIAN_NYNORSK",
- "OCCITAN",
- "ORIYA",
- "OROMO",
- "PASHTO",
- "POLISH",
- "PORTUGUESE",
- "PORTUGUESE_BRAZILIAN",
- "PUNJABI",
- "QUECHUA",
- "RHAETO_ROMANCE",
- "ROMANIAN",
- "RUSSIAN",
- "RUSSIAN_UKRAINE",
- "SAMOAN",
- "SANGHO",
- "SANSKRIT",
- "SCOTS_GAELIC",
- "SERBIAN",
- "SERBIAN_CYRILLIC",
- "SERBIAN_LATIN",
- "SERBO_CROATIAN",
- "SESOTHO",
- "SETSWANA",
- "SHONA",
- "SINDHI",
- "SINHALESE",
- "SISWATI",
- "SLOVAK",
- "SLOVENIAN",
- "SOMALI",
- "SPANISH",
- "SPANISH_ARGENTINA",
- "SPANISH_BOLIVIA",
- "SPANISH_CHILE",
- "SPANISH_COLOMBIA",
- "SPANISH_COSTA_RICA",
- "SPANISH_DOMINICAN_REPUBLIC",
- "SPANISH_ECUADOR",
- "SPANISH_EL_SALVADOR",
- "SPANISH_GUATEMALA",
- "SPANISH_HONDURAS",
- "SPANISH_MEXICAN",
- "SPANISH_MODERN",
- "SPANISH_NICARAGUA",
- "SPANISH_PANAMA",
- "SPANISH_PARAGUAY",
- "SPANISH_PERU",
- "SPANISH_PUERTO_RICO",
- "SPANISH_URUGUAY",
- "SPANISH_US",
- "SPANISH_VENEZUELA",
- "SUNDANESE",
- "SWAHILI",
- "SWEDISH",
- "SWEDISH_FINLAND",
- "TAGALOG",
- "TAJIK",
- "TAMIL",
- "TATAR",
- "TELUGU",
- "THAI",
- "TIBETAN",
- "TIGRINYA",
- "TONGA",
- "TSONGA",
- "TURKISH",
- "TURKMEN",
- "TWI",
- "UIGHUR",
- "UKRAINIAN",
- "URDU",
- "URDU_INDIA",
- "URDU_PAKISTAN",
- "UZBEK",
- "UZBEK_CYRILLIC",
- "UZBEK_LATIN",
- "VIETNAMESE",
- "VOLAPUK",
- "WELSH",
- "WOLOF",
- "XHOSA",
- "YIDDISH",
- "YORUBA",
- "ZHUANG",
- "ZULU",
+static const wxChar *GetLangName(int lang)
+{
+ static const wxChar *languageNames[] =
+ {
+ _T("DEFAULT"),
+ _T("UNKNOWN"),
+ _T("ABKHAZIAN"),
+ _T("AFAR"),
+ _T("AFRIKAANS"),
+ _T("ALBANIAN"),
+ _T("AMHARIC"),
+ _T("ARABIC"),
+ _T("ARABIC_ALGERIA"),
+ _T("ARABIC_BAHRAIN"),
+ _T("ARABIC_EGYPT"),
+ _T("ARABIC_IRAQ"),
+ _T("ARABIC_JORDAN"),
+ _T("ARABIC_KUWAIT"),
+ _T("ARABIC_LEBANON"),
+ _T("ARABIC_LIBYA"),
+ _T("ARABIC_MOROCCO"),
+ _T("ARABIC_OMAN"),
+ _T("ARABIC_QATAR"),
+ _T("ARABIC_SAUDI_ARABIA"),
+ _T("ARABIC_SUDAN"),
+ _T("ARABIC_SYRIA"),
+ _T("ARABIC_TUNISIA"),
+ _T("ARABIC_UAE"),
+ _T("ARABIC_YEMEN"),
+ _T("ARMENIAN"),
+ _T("ASSAMESE"),
+ _T("AYMARA"),
+ _T("AZERI"),
+ _T("AZERI_CYRILLIC"),
+ _T("AZERI_LATIN"),
+ _T("BASHKIR"),
+ _T("BASQUE"),
+ _T("BELARUSIAN"),
+ _T("BENGALI"),
+ _T("BHUTANI"),
+ _T("BIHARI"),
+ _T("BISLAMA"),
+ _T("BRETON"),
+ _T("BULGARIAN"),
+ _T("BURMESE"),
+ _T("CAMBODIAN"),
+ _T("CATALAN"),
+ _T("CHINESE"),
+ _T("CHINESE_SIMPLIFIED"),
+ _T("CHINESE_TRADITIONAL"),
+ _T("CHINESE_HONGKONG"),
+ _T("CHINESE_MACAU"),
+ _T("CHINESE_SINGAPORE"),
+ _T("CHINESE_TAIWAN"),
+ _T("CORSICAN"),
+ _T("CROATIAN"),
+ _T("CZECH"),
+ _T("DANISH"),
+ _T("DUTCH"),
+ _T("DUTCH_BELGIAN"),
+ _T("ENGLISH"),
+ _T("ENGLISH_UK"),
+ _T("ENGLISH_US"),
+ _T("ENGLISH_AUSTRALIA"),
+ _T("ENGLISH_BELIZE"),
+ _T("ENGLISH_BOTSWANA"),
+ _T("ENGLISH_CANADA"),
+ _T("ENGLISH_CARIBBEAN"),
+ _T("ENGLISH_DENMARK"),
+ _T("ENGLISH_EIRE"),
+ _T("ENGLISH_JAMAICA"),
+ _T("ENGLISH_NEW_ZEALAND"),
+ _T("ENGLISH_PHILIPPINES"),
+ _T("ENGLISH_SOUTH_AFRICA"),
+ _T("ENGLISH_TRINIDAD"),
+ _T("ENGLISH_ZIMBABWE"),
+ _T("ESPERANTO"),
+ _T("ESTONIAN"),
+ _T("FAEROESE"),
+ _T("FARSI"),
+ _T("FIJI"),
+ _T("FINNISH"),
+ _T("FRENCH"),
+ _T("FRENCH_BELGIAN"),
+ _T("FRENCH_CANADIAN"),
+ _T("FRENCH_LUXEMBOURG"),
+ _T("FRENCH_MONACO"),
+ _T("FRENCH_SWISS"),
+ _T("FRISIAN"),
+ _T("GALICIAN"),
+ _T("GEORGIAN"),
+ _T("GERMAN"),
+ _T("GERMAN_AUSTRIAN"),
+ _T("GERMAN_BELGIUM"),
+ _T("GERMAN_LIECHTENSTEIN"),
+ _T("GERMAN_LUXEMBOURG"),
+ _T("GERMAN_SWISS"),
+ _T("GREEK"),
+ _T("GREENLANDIC"),
+ _T("GUARANI"),
+ _T("GUJARATI"),
+ _T("HAUSA"),
+ _T("HEBREW"),
+ _T("HINDI"),
+ _T("HUNGARIAN"),
+ _T("ICELANDIC"),
+ _T("INDONESIAN"),
+ _T("INTERLINGUA"),
+ _T("INTERLINGUE"),
+ _T("INUKTITUT"),
+ _T("INUPIAK"),
+ _T("IRISH"),
+ _T("ITALIAN"),
+ _T("ITALIAN_SWISS"),
+ _T("JAPANESE"),
+ _T("JAVANESE"),
+ _T("KANNADA"),
+ _T("KASHMIRI"),
+ _T("KASHMIRI_INDIA"),
+ _T("KAZAKH"),
+ _T("KERNEWEK"),
+ _T("KINYARWANDA"),
+ _T("KIRGHIZ"),
+ _T("KIRUNDI"),
+ _T("KONKANI"),
+ _T("KOREAN"),
+ _T("KURDISH"),
+ _T("LAOTHIAN"),
+ _T("LATIN"),
+ _T("LATVIAN"),
+ _T("LINGALA"),
+ _T("LITHUANIAN"),
+ _T("MACEDONIAN"),
+ _T("MALAGASY"),
+ _T("MALAY"),
+ _T("MALAYALAM"),
+ _T("MALAY_BRUNEI_DARUSSALAM"),
+ _T("MALAY_MALAYSIA"),
+ _T("MALTESE"),
+ _T("MANIPURI"),
+ _T("MAORI"),
+ _T("MARATHI"),
+ _T("MOLDAVIAN"),
+ _T("MONGOLIAN"),
+ _T("NAURU"),
+ _T("NEPALI"),
+ _T("NEPALI_INDIA"),
+ _T("NORWEGIAN_BOKMAL"),
+ _T("NORWEGIAN_NYNORSK"),
+ _T("OCCITAN"),
+ _T("ORIYA"),
+ _T("OROMO"),
+ _T("PASHTO"),
+ _T("POLISH"),
+ _T("PORTUGUESE"),
+ _T("PORTUGUESE_BRAZILIAN"),
+ _T("PUNJABI"),
+ _T("QUECHUA"),
+ _T("RHAETO_ROMANCE"),
+ _T("ROMANIAN"),
+ _T("RUSSIAN"),
+ _T("RUSSIAN_UKRAINE"),
+ _T("SAMOAN"),
+ _T("SANGHO"),
+ _T("SANSKRIT"),
+ _T("SCOTS_GAELIC"),
+ _T("SERBIAN"),
+ _T("SERBIAN_CYRILLIC"),
+ _T("SERBIAN_LATIN"),
+ _T("SERBO_CROATIAN"),
+ _T("SESOTHO"),
+ _T("SETSWANA"),
+ _T("SHONA"),
+ _T("SINDHI"),
+ _T("SINHALESE"),
+ _T("SISWATI"),
+ _T("SLOVAK"),
+ _T("SLOVENIAN"),
+ _T("SOMALI"),
+ _T("SPANISH"),
+ _T("SPANISH_ARGENTINA"),
+ _T("SPANISH_BOLIVIA"),
+ _T("SPANISH_CHILE"),
+ _T("SPANISH_COLOMBIA"),
+ _T("SPANISH_COSTA_RICA"),
+ _T("SPANISH_DOMINICAN_REPUBLIC"),
+ _T("SPANISH_ECUADOR"),
+ _T("SPANISH_EL_SALVADOR"),
+ _T("SPANISH_GUATEMALA"),
+ _T("SPANISH_HONDURAS"),
+ _T("SPANISH_MEXICAN"),
+ _T("SPANISH_MODERN"),
+ _T("SPANISH_NICARAGUA"),
+ _T("SPANISH_PANAMA"),
+ _T("SPANISH_PARAGUAY"),
+ _T("SPANISH_PERU"),
+ _T("SPANISH_PUERTO_RICO"),
+ _T("SPANISH_URUGUAY"),
+ _T("SPANISH_US"),
+ _T("SPANISH_VENEZUELA"),
+ _T("SUNDANESE"),
+ _T("SWAHILI"),
+ _T("SWEDISH"),
+ _T("SWEDISH_FINLAND"),
+ _T("TAGALOG"),
+ _T("TAJIK"),
+ _T("TAMIL"),
+ _T("TATAR"),
+ _T("TELUGU"),
+ _T("THAI"),
+ _T("TIBETAN"),
+ _T("TIGRINYA"),
+ _T("TONGA"),
+ _T("TSONGA"),
+ _T("TURKISH"),
+ _T("TURKMEN"),
+ _T("TWI"),
+ _T("UIGHUR"),
+ _T("UKRAINIAN"),
+ _T("URDU"),
+ _T("URDU_INDIA"),
+ _T("URDU_PAKISTAN"),
+ _T("UZBEK"),
+ _T("UZBEK_CYRILLIC"),
+ _T("UZBEK_LATIN"),
+ _T("VIETNAMESE"),
+ _T("VOLAPUK"),
+ _T("WELSH"),
+ _T("WOLOF"),
+ _T("XHOSA"),
+ _T("YIDDISH"),
+ _T("YORUBA"),
+ _T("ZHUANG"),
+ _T("ZULU"),
};
if ( (size_t)lang < WXSIZEOF(languageNames) )
return languageNames[lang];
else
- return "INVALID";
+ return _T("INVALID");
}
static void TestDefaultLang()
{
- puts("*** Testing wxLocale::GetSystemLanguage ***");
+ wxPuts(_T("*** Testing wxLocale::GetSystemLanguage ***"));
static const wxChar *langStrings[] =
{
for ( size_t n = 0; n < WXSIZEOF(langStrings); n++ )
{
- const char *langStr = langStrings[n];
+ const wxChar *langStr = langStrings[n];
if ( langStr )
{
// FIXME: this doesn't do anything at all under Windows, we need
}
int lang = gs_localeDefault.GetSystemLanguage();
- printf("Locale for '%s' is %s.\n",
- langStr ? langStr : "system default", GetLangName(lang));
+ wxPrintf(_T("Locale for '%s' is %s.\n"),
+ langStr ? langStr : _T("system default"), GetLangName(lang));
}
}
size_t count = wxTheMimeTypesManager->EnumAllFileTypes(mimetypes);
- printf("*** All %u known filetypes: ***\n", count);
+ wxPrintf(_T("*** All %u known filetypes: ***\n"), count);
wxArrayString exts;
wxString desc;
wxTheMimeTypesManager->GetFileTypeFromMimeType(mimetypes[n]);
if ( !filetype )
{
- printf("nothing known about the filetype '%s'!\n",
+ wxPrintf(_T("nothing known about the filetype '%s'!\n"),
mimetypes[n].c_str());
continue;
}
extsAll += exts[e];
}
- printf("\t%s: %s (%s)\n",
+ wxPrintf(_T("\t%s: %s (%s)\n"),
mimetypes[n].c_str(), desc.c_str(), extsAll.c_str());
}
- puts("");
+ wxPuts(_T(""));
}
static void TestMimeOverride()
wxPrintf(_T("WARN: mime.types file '%s' doesn't exist, not loaded.\n"),
mimetypes);
- puts("");
+ wxPuts(_T(""));
}
static void TestMimeFilename()
_T("readme.txt"),
_T("document.pdf"),
_T("image.gif"),
+ _T("picture.jpeg"),
};
for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
if ( !ft->GetOpenCommand(&cmd,
wxFileType::MessageParameters(fname, _T(""))) )
cmd = _T("<no command available>");
+ else
+ cmd = wxString(_T('"')) + cmd + _T('"');
- wxPrintf(_T("To open %s (%s) do '%s'.\n"),
+ wxPrintf(_T("To open %s (%s) do %s.\n"),
fname.c_str(), desc.c_str(), cmd.c_str());
delete ft;
}
}
- puts("");
+ wxPuts(_T(""));
}
static void TestMimeAssociate()
delete ft;
}
- puts("");
+ wxPuts(_T(""));
}
#endif // TEST_MIME
static void TestDiskInfo()
{
- puts("*** Testing wxGetDiskSpace() ***");
+ wxPuts(_T("*** Testing wxGetDiskSpace() ***"));
for ( ;; )
{
- char pathname[128];
- printf("\nEnter a directory name: ");
- if ( !fgets(pathname, WXSIZEOF(pathname), stdin) )
+ wxChar pathname[128];
+ wxPrintf(_T("\nEnter a directory name: "));
+ if ( !wxFgets(pathname, WXSIZEOF(pathname), stdin) )
break;
// kill the last '\n'
- pathname[strlen(pathname) - 1] = 0;
+ pathname[wxStrlen(pathname) - 1] = 0;
wxLongLong total, free;
if ( !wxGetDiskSpace(pathname, &total, &free) )
static void TestOsInfo()
{
- puts("*** Testing OS info functions ***\n");
+ wxPuts(_T("*** Testing OS info functions ***\n"));
int major, minor;
wxGetOsVersion(&major, &minor);
- printf("Running under: %s, version %d.%d\n",
+ wxPrintf(_T("Running under: %s, version %d.%d\n"),
wxGetOsDescription().c_str(), major, minor);
- printf("%ld free bytes of memory left.\n", wxGetFreeMemory());
+ wxPrintf(_T("%ld free bytes of memory left.\n"), wxGetFreeMemory());
- printf("Host name is %s (%s).\n",
+ wxPrintf(_T("Host name is %s (%s).\n"),
wxGetHostName().c_str(), wxGetFullHostName().c_str());
- puts("");
+ wxPuts(_T(""));
}
static void TestUserInfo()
{
- puts("*** Testing user info functions ***\n");
+ wxPuts(_T("*** Testing user info functions ***\n"));
- printf("User id is:\t%s\n", wxGetUserId().c_str());
- printf("User name is:\t%s\n", wxGetUserName().c_str());
- printf("Home dir is:\t%s\n", wxGetHomeDir().c_str());
- printf("Email address:\t%s\n", wxGetEmailAddress().c_str());
+ wxPrintf(_T("User id is:\t%s\n"), wxGetUserId().c_str());
+ wxPrintf(_T("User name is:\t%s\n"), wxGetUserName().c_str());
+ wxPrintf(_T("Home dir is:\t%s\n"), wxGetHomeDir().c_str());
+ wxPrintf(_T("Email address:\t%s\n"), wxGetEmailAddress().c_str());
- puts("");
+ wxPuts(_T(""));
}
#endif // TEST_INFO_FUNCTIONS
l += n;
}
- printf("Summing longs took %ld milliseconds.\n", sw.Time());
+ wxPrintf(_T("Summing longs took %ld milliseconds.\n"), sw.Time());
}
#if wxUSE_LONGLONG_NATIVE
l += n;
}
- printf("Summing wxLongLong_t took %ld milliseconds.\n", sw.Time());
+ wxPrintf(_T("Summing wxLongLong_t took %ld milliseconds.\n"), sw.Time());
}
#endif // wxUSE_LONGLONG_NATIVE
l += n;
}
- printf("Summing wxLongLongs took %ld milliseconds.\n", sw.Time());
+ wxPrintf(_T("Summing wxLongLongs took %ld milliseconds.\n"), sw.Time());
}
}
static void TestLongLongConversion()
{
- puts("*** Testing wxLongLong conversions ***\n");
+ wxPuts(_T("*** Testing wxLongLong conversions ***\n"));
wxLongLong a;
size_t nTested = 0;
wxASSERT_MSG( a == b, "conversions failure" );
#else
- puts("Can't do it without native long long type, test skipped.");
+ wxPuts(_T("Can't do it without native long long type, test skipped."));
return;
#endif // wxUSE_LONGLONG_NATIVE
nTested++;
}
- puts(" done!");
+ wxPuts(_T(" done!"));
}
static void TestMultiplication()
{
- puts("*** Testing wxLongLong multiplication ***\n");
+ wxPuts(_T("*** Testing wxLongLong multiplication ***\n"));
wxLongLong a, b;
size_t nTested = 0;
wxASSERT_MSG( a*b == aa*bb, "multiplication failure" );
#else // !wxUSE_LONGLONG_NATIVE
- puts("Can't do it without native long long type, test skipped.");
+ wxPuts(_T("Can't do it without native long long type, test skipped."));
return;
#endif // wxUSE_LONGLONG_NATIVE
nTested++;
}
- puts(" done!");
+ wxPuts(_T(" done!"));
}
static void TestDivision()
{
- puts("*** Testing wxLongLong division ***\n");
+ wxPuts(_T("*** Testing wxLongLong division ***\n"));
wxLongLong q, r;
size_t nTested = 0;
nTested++;
}
- puts(" done!");
+ wxPuts(_T(" done!"));
}
static void TestAddition()
{
- puts("*** Testing wxLongLong addition ***\n");
+ wxPuts(_T("*** Testing wxLongLong addition ***\n"));
wxLongLong a, b, c;
size_t nTested = 0;
nTested++;
}
- puts(" done!");
+ wxPuts(_T(" done!"));
}
static void TestBitOperations()
{
- puts("*** Testing wxLongLong bit operation ***\n");
+ wxPuts(_T("*** Testing wxLongLong bit operation ***\n"));
wxLongLong ll;
size_t nTested = 0;
{
}
#else // !wxUSE_LONGLONG_NATIVE
- puts("Can't do it without native long long type, test skipped.");
+ wxPuts(_T("Can't do it without native long long type, test skipped."));
return;
#endif // wxUSE_LONGLONG_NATIVE
nTested++;
}
- puts(" done!");
+ wxPuts(_T(" done!"));
}
static void TestLongLongComparison()
{
#if wxUSE_LONGLONG_WX
- puts("*** Testing wxLongLong comparison ***\n");
+ wxPuts(_T("*** Testing wxLongLong comparison ***\n"));
static const long ls[2] =
{
for ( size_t m = 0; m < WXSIZEOF(lls); m++ )
{
res = lls[m] > testLongs[n];
- printf("0x%lx > 0x%lx is %s (%s)\n",
+ wxPrintf(_T("0x%lx > 0x%lx is %s (%s)\n"),
ls[m], testLongs[n], res ? "true" : "false",
res == (ls[m] > testLongs[n]) ? "ok" : "ERROR");
res = lls[m] < testLongs[n];
- printf("0x%lx < 0x%lx is %s (%s)\n",
+ wxPrintf(_T("0x%lx < 0x%lx is %s (%s)\n"),
ls[m], testLongs[n], res ? "true" : "false",
res == (ls[m] < testLongs[n]) ? "ok" : "ERROR");
res = lls[m] == testLongs[n];
- printf("0x%lx == 0x%lx is %s (%s)\n",
+ wxPrintf(_T("0x%lx == 0x%lx is %s (%s)\n"),
ls[m], testLongs[n], res ? "true" : "false",
res == (ls[m] == testLongs[n]) ? "ok" : "ERROR");
}
#endif // wxUSE_LONGLONG_WX
}
-static void TestLongLongPrint()
+static void TestLongLongToString()
{
- wxPuts(_T("*** Testing wxLongLong printing ***\n"));
+ wxPuts(_T("*** Testing wxLongLong::ToString() ***\n"));
for ( size_t n = 0; n < WXSIZEOF(testLongs); n++ )
{
wxPrintf(_T("-0x1234567887654321 = %s\n"), ll.ToString().c_str());
}
+static void TestLongLongPrintf()
+{
+ wxPuts(_T("*** Testing wxLongLong printing ***\n"));
+
+#ifdef wxLongLongFmtSpec
+ wxLongLong ll = wxLL(0x1234567890abcdef);
+ wxString s = wxString::Format(_T("%") wxLongLongFmtSpec _T("x"), ll);
+ wxPrintf(_T("0x1234567890abcdef -> %s (%s)\n"),
+ s.c_str(), s == _T("1234567890abcdef") ? _T("ok") : _T("ERROR"));
+#else // !wxLongLongFmtSpec
+ #error "wxLongLongFmtSpec not defined for this compiler/platform"
+#endif
+}
+
#undef MAKE_LL
#undef RAND_LL
#ifdef TEST_PATHLIST
+#ifdef __UNIX__
+ #define CMD_IN_PATH _T("ls")
+#else
+ #define CMD_IN_PATH _T("command.com")
+#endif
+
static void TestPathList()
{
- puts("*** Testing wxPathList ***\n");
+ wxPuts(_T("*** Testing wxPathList ***\n"));
wxPathList pathlist;
- pathlist.AddEnvList("PATH");
- wxString path = pathlist.FindValidPath("ls");
+ pathlist.AddEnvList(_T("PATH"));
+ wxString path = pathlist.FindValidPath(CMD_IN_PATH);
if ( path.empty() )
{
- printf("ERROR: command not found in the path.\n");
+ wxPrintf(_T("ERROR: command not found in the path.\n"));
}
else
{
- printf("Command found in the path as '%s'.\n", path.c_str());
+ wxPrintf(_T("Command found in the path as '%s'.\n"), path.c_str());
}
}
bool correct;
} regExCompTestData[] =
{
- { _T("foo"), TRUE },
- { _T("foo("), FALSE },
- { _T("foo(bar"), FALSE },
- { _T("foo(bar)"), TRUE },
- { _T("foo["), FALSE },
- { _T("foo[bar"), FALSE },
- { _T("foo[bar]"), TRUE },
- { _T("foo{"), TRUE },
- { _T("foo{1"), FALSE },
- { _T("foo{bar"), TRUE },
- { _T("foo{1}"), TRUE },
- { _T("foo{1,2}"), TRUE },
- { _T("foo{bar}"), TRUE },
- { _T("foo*"), TRUE },
- { _T("foo**"), FALSE },
- { _T("foo+"), TRUE },
- { _T("foo++"), FALSE },
- { _T("foo?"), TRUE },
- { _T("foo??"), FALSE },
- { _T("foo?+"), FALSE },
+ { _T("foo"), true },
+ { _T("foo("), false },
+ { _T("foo(bar"), false },
+ { _T("foo(bar)"), true },
+ { _T("foo["), false },
+ { _T("foo[bar"), false },
+ { _T("foo[bar]"), true },
+ { _T("foo{"), true },
+ { _T("foo{1"), false },
+ { _T("foo{bar"), true },
+ { _T("foo{1}"), true },
+ { _T("foo{1,2}"), true },
+ { _T("foo{bar}"), true },
+ { _T("foo*"), true },
+ { _T("foo**"), false },
+ { _T("foo+"), true },
+ { _T("foo++"), false },
+ { _T("foo?"), true },
+ { _T("foo??"), false },
+ { _T("foo?+"), false },
};
wxRegEx re;
bool correct;
} regExMatchTestData[] =
{
- { _T("foo"), _T("bar"), FALSE },
- { _T("foo"), _T("foobar"), TRUE },
- { _T("^foo"), _T("foobar"), TRUE },
- { _T("^foo"), _T("barfoo"), FALSE },
- { _T("bar$"), _T("barbar"), TRUE },
- { _T("bar$"), _T("barbar "), FALSE },
+ { _T("foo"), _T("bar"), false },
+ { _T("foo"), _T("foobar"), true },
+ { _T("^foo"), _T("foobar"), true },
+ { _T("^foo"), _T("barfoo"), false },
+ { _T("bar$"), _T("barbar"), true },
+ { _T("bar$"), _T("barbar "), false },
};
for ( size_t n = 0; n < WXSIZEOF(regExMatchTestData); n++ )
for ( ;; )
{
- char pattern[128];
- printf("\nEnter a pattern: ");
- if ( !fgets(pattern, WXSIZEOF(pattern), stdin) )
+ wxChar pattern[128];
+ wxPrintf(_T("\nEnter a pattern: "));
+ if ( !wxFgets(pattern, WXSIZEOF(pattern), stdin) )
break;
// kill the last '\n'
- pattern[strlen(pattern) - 1] = 0;
+ pattern[wxStrlen(pattern) - 1] = 0;
wxRegEx re;
if ( !re.Compile(pattern) )
continue;
}
- char text[128];
+ wxChar text[128];
for ( ;; )
{
- printf("Enter text to match: ");
- if ( !fgets(text, WXSIZEOF(text), stdin) )
+ wxPrintf(_T("Enter text to match: "));
+ if ( !wxFgets(text, WXSIZEOF(text), stdin) )
break;
// kill the last '\n'
- text[strlen(text) - 1] = 0;
+ text[wxStrlen(text) - 1] = 0;
if ( !re.Matches(text) )
{
- printf("No match.\n");
+ wxPrintf(_T("No match.\n"));
}
else
{
- printf("Pattern matches at '%s'\n", re.GetMatch(text).c_str());
+ wxPrintf(_T("Pattern matches at '%s'\n"), re.GetMatch(text).c_str());
size_t start, len;
for ( size_t n = 1; ; n++ )
break;
}
- printf("Subexpr %u matched '%s'\n",
- n, wxString(text + start, len).c_str());
+ wxPrintf(_T("Subexpr %u matched '%s'\n"),
+ n, wxString(text + start, len).c_str());
}
}
}
// database
// ----------------------------------------------------------------------------
+#if !wxUSE_ODBC
+ #undef TEST_ODBC
+#endif
+
#ifdef TEST_ODBC
#include <wx/db.h>
#endif // TEST_ODBC
+// ----------------------------------------------------------------------------
+// printf() tests
+// ----------------------------------------------------------------------------
+
+/*
+ NB: this stuff was taken from the glibc test suite and modified to build
+ in wxWindows: if I read the copyright below properly, this shouldn't
+ be a problem
+ */
+
+#ifdef TEST_PRINTF
+
+#ifdef wxTEST_PRINTF
+ // use our functions from wxchar.cpp
+ #undef wxPrintf
+ #undef wxSprintf
+
+ // NB: do _not_ use ATTRIBUTE_PRINTF here, we have some invalid formats
+ // in the tests below
+ int wxPrintf( const wxChar *format, ... );
+ int wxSprintf( wxChar *str, const wxChar *format, ... );
+#endif
+
+#include "wx/longlong.h"
+
+#include <float.h>
+
+static void rfg1 (void);
+static void rfg2 (void);
+
+
+static void
+fmtchk (const wxChar *fmt)
+{
+ (void) wxPrintf(_T("%s:\t`"), fmt);
+ (void) wxPrintf(fmt, 0x12);
+ (void) wxPrintf(_T("'\n"));
+}
+
+static void
+fmtst1chk (const wxChar *fmt)
+{
+ (void) wxPrintf(_T("%s:\t`"), fmt);
+ (void) wxPrintf(fmt, 4, 0x12);
+ (void) wxPrintf(_T("'\n"));
+}
+
+static void
+fmtst2chk (const wxChar *fmt)
+{
+ (void) wxPrintf(_T("%s:\t`"), fmt);
+ (void) wxPrintf(fmt, 4, 4, 0x12);
+ (void) wxPrintf(_T("'\n"));
+}
+
+/* This page is covered by the following copyright: */
+
+/* (C) Copyright C E Chew
+ *
+ * Feel free to copy, use and distribute this software provided:
+ *
+ * 1. you do not pretend that you wrote it
+ * 2. you leave this copyright notice intact.
+ */
+
+/*
+ * Extracted from exercise.c for glibc-1.05 bug report by Bruce Evans.
+ */
+
+#define DEC -123
+#define INT 255
+#define UNS (~0)
+
+/* Formatted Output Test
+ *
+ * This exercises the output formatting code.
+ */
+
+static void
+fp_test (void)
+{
+ int i, j, k, l;
+ wxChar buf[7];
+ wxChar *prefix = buf;
+ wxChar tp[20];
+
+ wxPuts(_T("\nFormatted output test"));
+ wxPrintf(_T("prefix 6d 6o 6x 6X 6u\n"));
+ wxStrcpy(prefix, _T("%"));
+ for (i = 0; i < 2; i++) {
+ for (j = 0; j < 2; j++) {
+ for (k = 0; k < 2; k++) {
+ for (l = 0; l < 2; l++) {
+ wxStrcpy(prefix, _T("%"));
+ if (i == 0) wxStrcat(prefix, _T("-"));
+ if (j == 0) wxStrcat(prefix, _T("+"));
+ if (k == 0) wxStrcat(prefix, _T("#"));
+ if (l == 0) wxStrcat(prefix, _T("0"));
+ wxPrintf(_T("%5s |"), prefix);
+ wxStrcpy(tp, prefix);
+ wxStrcat(tp, _T("6d |"));
+ wxPrintf(tp, DEC);
+ wxStrcpy(tp, prefix);
+ wxStrcat(tp, _T("6o |"));
+ wxPrintf(tp, INT);
+ wxStrcpy(tp, prefix);
+ wxStrcat(tp, _T("6x |"));
+ wxPrintf(tp, INT);
+ wxStrcpy(tp, prefix);
+ wxStrcat(tp, _T("6X |"));
+ wxPrintf(tp, INT);
+ wxStrcpy(tp, prefix);
+ wxStrcat(tp, _T("6u |"));
+ wxPrintf(tp, UNS);
+ wxPrintf(_T("\n"));
+ }
+ }
+ }
+ }
+ wxPrintf(_T("%10s\n"), (wxChar *) NULL);
+ wxPrintf(_T("%-10s\n"), (wxChar *) NULL);
+}
+
+static void TestPrintf()
+{
+ static wxChar shortstr[] = _T("Hi, Z.");
+ static wxChar longstr[] = _T("Good morning, Doctor Chandra. This is Hal. \
+I am ready for my first lesson today.");
+ int result = 0;
+
+ fmtchk(_T("%.4x"));
+ fmtchk(_T("%04x"));
+ fmtchk(_T("%4.4x"));
+ fmtchk(_T("%04.4x"));
+ fmtchk(_T("%4.3x"));
+ fmtchk(_T("%04.3x"));
+
+ fmtst1chk(_T("%.*x"));
+ fmtst1chk(_T("%0*x"));
+ fmtst2chk(_T("%*.*x"));
+ fmtst2chk(_T("%0*.*x"));
+
+ wxPrintf(_T("bad format:\t\"%b\"\n"));
+ wxPrintf(_T("nil pointer (padded):\t\"%10p\"\n"), (void *) NULL);
+
+ wxPrintf(_T("decimal negative:\t\"%d\"\n"), -2345);
+ wxPrintf(_T("octal negative:\t\"%o\"\n"), -2345);
+ wxPrintf(_T("hex negative:\t\"%x\"\n"), -2345);
+ wxPrintf(_T("long decimal number:\t\"%ld\"\n"), -123456L);
+ wxPrintf(_T("long octal negative:\t\"%lo\"\n"), -2345L);
+ wxPrintf(_T("long unsigned decimal number:\t\"%lu\"\n"), -123456L);
+ wxPrintf(_T("zero-padded LDN:\t\"%010ld\"\n"), -123456L);
+ wxPrintf(_T("left-adjusted ZLDN:\t\"%-010ld\"\n"), -123456);
+ wxPrintf(_T("space-padded LDN:\t\"%10ld\"\n"), -123456L);
+ wxPrintf(_T("left-adjusted SLDN:\t\"%-10ld\"\n"), -123456L);
+
+ wxPrintf(_T("zero-padded string:\t\"%010s\"\n"), shortstr);
+ wxPrintf(_T("left-adjusted Z string:\t\"%-010s\"\n"), shortstr);
+ wxPrintf(_T("space-padded string:\t\"%10s\"\n"), shortstr);
+ wxPrintf(_T("left-adjusted S string:\t\"%-10s\"\n"), shortstr);
+ wxPrintf(_T("null string:\t\"%s\"\n"), (wxChar *)NULL);
+ wxPrintf(_T("limited string:\t\"%.22s\"\n"), longstr);
+
+ wxPrintf(_T("e-style >= 1:\t\"%e\"\n"), 12.34);
+ wxPrintf(_T("e-style >= .1:\t\"%e\"\n"), 0.1234);
+ wxPrintf(_T("e-style < .1:\t\"%e\"\n"), 0.001234);
+ wxPrintf(_T("e-style big:\t\"%.60e\"\n"), 1e20);
+ wxPrintf(_T("e-style == .1:\t\"%e\"\n"), 0.1);
+ wxPrintf(_T("f-style >= 1:\t\"%f\"\n"), 12.34);
+ wxPrintf(_T("f-style >= .1:\t\"%f\"\n"), 0.1234);
+ wxPrintf(_T("f-style < .1:\t\"%f\"\n"), 0.001234);
+ wxPrintf(_T("g-style >= 1:\t\"%g\"\n"), 12.34);
+ wxPrintf(_T("g-style >= .1:\t\"%g\"\n"), 0.1234);
+ wxPrintf(_T("g-style < .1:\t\"%g\"\n"), 0.001234);
+ wxPrintf(_T("g-style big:\t\"%.60g\"\n"), 1e20);
+
+ wxPrintf (_T(" %6.5f\n"), .099999999860301614);
+ wxPrintf (_T(" %6.5f\n"), .1);
+ wxPrintf (_T("x%5.4fx\n"), .5);
+
+ wxPrintf (_T("%#03x\n"), 1);
+
+ //wxPrintf (_T("something really insane: %.10000f\n"), 1.0);
+
+ {
+ double d = FLT_MIN;
+ int niter = 17;
+
+ while (niter-- != 0)
+ wxPrintf (_T("%.17e\n"), d / 2);
+ fflush (stdout);
+ }
+
+ wxPrintf (_T("%15.5e\n"), 4.9406564584124654e-324);
+
+#define FORMAT _T("|%12.4f|%12.4e|%12.4g|\n")
+ wxPrintf (FORMAT, 0.0, 0.0, 0.0);
+ wxPrintf (FORMAT, 1.0, 1.0, 1.0);
+ wxPrintf (FORMAT, -1.0, -1.0, -1.0);
+ wxPrintf (FORMAT, 100.0, 100.0, 100.0);
+ wxPrintf (FORMAT, 1000.0, 1000.0, 1000.0);
+ wxPrintf (FORMAT, 10000.0, 10000.0, 10000.0);
+ wxPrintf (FORMAT, 12345.0, 12345.0, 12345.0);
+ wxPrintf (FORMAT, 100000.0, 100000.0, 100000.0);
+ wxPrintf (FORMAT, 123456.0, 123456.0, 123456.0);
+#undef FORMAT
+
+ {
+ wxChar buf[20];
+ int rc = wxSnprintf (buf, WXSIZEOF(buf), _T("%30s"), _T("foo"));
+
+ wxPrintf(_T("snprintf (\"%%30s\", \"foo\") == %d, \"%.*s\"\n"),
+ rc, WXSIZEOF(buf), buf);
+#if 0
+ wxChar buf2[512];
+ wxPrintf ("snprintf (\"%%.999999u\", 10)\n",
+ wxSnprintf(buf2, WXSIZEOFbuf2), "%.999999u", 10));
+#endif
+ }
+
+ fp_test ();
+
+ wxPrintf (_T("%e should be 1.234568e+06\n"), 1234567.8);
+ wxPrintf (_T("%f should be 1234567.800000\n"), 1234567.8);
+ wxPrintf (_T("%g should be 1.23457e+06\n"), 1234567.8);
+ wxPrintf (_T("%g should be 123.456\n"), 123.456);
+ wxPrintf (_T("%g should be 1e+06\n"), 1000000.0);
+ wxPrintf (_T("%g should be 10\n"), 10.0);
+ wxPrintf (_T("%g should be 0.02\n"), 0.02);
+
+ {
+ double x=1.0;
+ wxPrintf(_T("%.17f\n"),(1.0/x/10.0+1.0)*x-x);
+ }
+
+ {
+ wxChar buf[200];
+
+ wxSprintf(buf,_T("%*s%*s%*s"),-1,_T("one"),-20,_T("two"),-30,_T("three"));
+
+ result |= wxStrcmp (buf,
+ _T("onetwo three "));
+
+ wxPuts (result != 0 ? _T("Test failed!") : _T("Test ok."));
+ }
+
+#ifdef wxLongLong_t
+ {
+ wxChar buf[200];
+
+ wxSprintf(buf, _T("%07") wxLongLongFmtSpec _T("o"), wxLL(040000000000));
+ wxPrintf (_T("sprintf (buf, \"%%07Lo\", 040000000000ll) = %s"), buf);
+
+ if (wxStrcmp (buf, _T("40000000000")) != 0)
+ {
+ result = 1;
+ wxPuts (_T("\tFAILED"));
+ }
+ wxPuts (_T(""));
+ }
+#endif // wxLongLong_t
+
+ wxPrintf (_T("printf (\"%%hhu\", %u) = %hhu\n"), UCHAR_MAX + 2, UCHAR_MAX + 2);
+ wxPrintf (_T("printf (\"%%hu\", %u) = %hu\n"), USHRT_MAX + 2, USHRT_MAX + 2);
+
+ wxPuts (_T("--- Should be no further output. ---"));
+ rfg1 ();
+ rfg2 ();
+
+#if 0
+ {
+ wxChar bytes[7];
+ wxChar buf[20];
+
+ memset (bytes, '\xff', sizeof bytes);
+ wxSprintf (buf, _T("foo%hhn\n"), &bytes[3]);
+ if (bytes[0] != '\xff' || bytes[1] != '\xff' || bytes[2] != '\xff'
+ || bytes[4] != '\xff' || bytes[5] != '\xff' || bytes[6] != '\xff')
+ {
+ wxPuts (_T("%hhn overwrite more bytes"));
+ result = 1;
+ }
+ if (bytes[3] != 3)
+ {
+ wxPuts (_T("%hhn wrote incorrect value"));
+ result = 1;
+ }
+ }
+#endif
+}
+
+static void
+rfg1 (void)
+{
+ wxChar buf[100];
+
+ wxSprintf (buf, _T("%5.s"), _T("xyz"));
+ if (wxStrcmp (buf, _T(" ")) != 0)
+ wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" "));
+ wxSprintf (buf, _T("%5.f"), 33.3);
+ if (wxStrcmp (buf, _T(" 33")) != 0)
+ wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 33"));
+ wxSprintf (buf, _T("%8.e"), 33.3e7);
+ if (wxStrcmp (buf, _T(" 3e+08")) != 0)
+ wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 3e+08"));
+ wxSprintf (buf, _T("%8.E"), 33.3e7);
+ if (wxStrcmp (buf, _T(" 3E+08")) != 0)
+ wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 3E+08"));
+ wxSprintf (buf, _T("%.g"), 33.3);
+ if (wxStrcmp (buf, _T("3e+01")) != 0)
+ wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T("3e+01"));
+ wxSprintf (buf, _T("%.G"), 33.3);
+ if (wxStrcmp (buf, _T("3E+01")) != 0)
+ wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T("3E+01"));
+}
+
+static void
+rfg2 (void)
+{
+ int prec;
+ wxChar buf[100];
+
+ prec = 0;
+ wxSprintf (buf, _T("%.*g"), prec, 3.3);
+ if (wxStrcmp (buf, _T("3")) != 0)
+ wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T("3"));
+ prec = 0;
+ wxSprintf (buf, _T("%.*G"), prec, 3.3);
+ if (wxStrcmp (buf, _T("3")) != 0)
+ wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T("3"));
+ prec = 0;
+ wxSprintf (buf, _T("%7.*G"), prec, 3.33);
+ if (wxStrcmp (buf, _T(" 3")) != 0)
+ wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 3"));
+ prec = 3;
+ wxSprintf (buf, _T("%04.*o"), prec, 33);
+ if (wxStrcmp (buf, _T(" 041")) != 0)
+ wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 041"));
+ prec = 7;
+ wxSprintf (buf, _T("%09.*u"), prec, 33);
+ if (wxStrcmp (buf, _T(" 0000033")) != 0)
+ wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 0000033"));
+ prec = 3;
+ wxSprintf (buf, _T("%04.*x"), prec, 33);
+ if (wxStrcmp (buf, _T(" 021")) != 0)
+ wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 021"));
+ prec = 3;
+ wxSprintf (buf, _T("%04.*X"), prec, 33);
+ if (wxStrcmp (buf, _T(" 021")) != 0)
+ wxPrintf (_T("got: '%s', expected: '%s'\n"), buf, _T(" 021"));
+}
+
+#endif // TEST_PRINTF
+
// ----------------------------------------------------------------------------
// registry and related stuff
// ----------------------------------------------------------------------------
static void TestRegistryRead()
{
- puts("*** testing registry reading ***");
+ wxPuts(_T("*** testing registry reading ***"));
wxRegKey key(TESTKEY);
- printf("The test key name is '%s'.\n", key.GetName().c_str());
+ wxPrintf(_T("The test key name is '%s'.\n"), key.GetName().c_str());
if ( !key.Open() )
{
- puts("ERROR: test key can't be opened, aborting test.");
+ wxPuts(_T("ERROR: test key can't be opened, aborting test."));
return;
}
size_t nSubKeys, nValues;
if ( key.GetKeyInfo(&nSubKeys, NULL, &nValues, NULL) )
{
- printf("It has %u subkeys and %u values.\n", nSubKeys, nValues);
+ wxPrintf(_T("It has %u subkeys and %u values.\n"), nSubKeys, nValues);
}
- printf("Enumerating values:\n");
+ wxPrintf(_T("Enumerating values:\n"));
long dummy;
wxString value;
bool cont = key.GetFirstValue(value, dummy);
while ( cont )
{
- printf("Value '%s': type ", value.c_str());
+ wxPrintf(_T("Value '%s': type "), value.c_str());
switch ( key.GetValueType(value) )
{
- case wxRegKey::Type_None: printf("ERROR (none)"); break;
- case wxRegKey::Type_String: printf("SZ"); break;
- case wxRegKey::Type_Expand_String: printf("EXPAND_SZ"); break;
- case wxRegKey::Type_Binary: printf("BINARY"); break;
- case wxRegKey::Type_Dword: printf("DWORD"); break;
- case wxRegKey::Type_Multi_String: printf("MULTI_SZ"); break;
- default: printf("other (unknown)"); break;
+ case wxRegKey::Type_None: wxPrintf(_T("ERROR (none)")); break;
+ case wxRegKey::Type_String: wxPrintf(_T("SZ")); break;
+ case wxRegKey::Type_Expand_String: wxPrintf(_T("EXPAND_SZ")); break;
+ case wxRegKey::Type_Binary: wxPrintf(_T("BINARY")); break;
+ case wxRegKey::Type_Dword: wxPrintf(_T("DWORD")); break;
+ case wxRegKey::Type_Multi_String: wxPrintf(_T("MULTI_SZ")); break;
+ default: wxPrintf(_T("other (unknown)")); break;
}
- printf(", value = ");
+ wxPrintf(_T(", value = "));
if ( key.IsNumericValue(value) )
{
long val;
key.QueryValue(value, &val);
- printf("%ld", val);
+ wxPrintf(_T("%ld"), val);
}
else // string
{
wxString val;
key.QueryValue(value, val);
- printf("'%s'", val.c_str());
+ wxPrintf(_T("'%s'"), val.c_str());
key.QueryRawValue(value, val);
- printf(" (raw value '%s')", val.c_str());
+ wxPrintf(_T(" (raw value '%s')"), val.c_str());
}
putchar('\n');
#endif // TEST_REGISTRY
+// ----------------------------------------------------------------------------
+// scope guard
+// ----------------------------------------------------------------------------
+
+#ifdef TEST_SCOPEGUARD
+
+#include "wx/scopeguard.h"
+
+static void function0() { puts("function0()"); }
+static void function1(int n) { printf("function1(%d)\n", n); }
+static void function2(double x, char c) { printf("function2(%g, %c)\n", x, c); }
+
+struct Object
+{
+ void method0() { printf("method0()\n"); }
+ void method1(int n) { printf("method1(%d)\n", n); }
+ void method2(double x, char c) { printf("method2(%g, %c)\n", x, c); }
+};
+
+static void TestScopeGuard()
+{
+ ON_BLOCK_EXIT0(function0);
+ ON_BLOCK_EXIT1(function1, 17);
+ ON_BLOCK_EXIT2(function2, 3.14, 'p');
+
+ Object obj;
+ ON_BLOCK_EXIT_OBJ0(obj, &Object::method0);
+ ON_BLOCK_EXIT_OBJ1(obj, &Object::method1, 7);
+ ON_BLOCK_EXIT_OBJ2(obj, &Object::method2, 2.71, 'e');
+
+ wxScopeGuard dismissed = wxMakeGuard(function0);
+ dismissed.Dismiss();
+}
+
+#endif
+
// ----------------------------------------------------------------------------
// sockets
// ----------------------------------------------------------------------------
static void TestSocketServer()
{
- puts("*** Testing wxSocketServer ***\n");
+ wxPuts(_T("*** Testing wxSocketServer ***\n"));
static const int PORT = 3000;
wxSocketServer *server = new wxSocketServer(addr);
if ( !server->Ok() )
{
- puts("ERROR: failed to bind");
+ wxPuts(_T("ERROR: failed to bind"));
return;
}
- for ( ;; )
+ bool quit = false;
+ while ( !quit )
{
- printf("Server: waiting for connection on port %d...\n", PORT);
+ wxPrintf(_T("Server: waiting for connection on port %d...\n"), PORT);
wxSocketBase *socket = server->Accept();
if ( !socket )
{
- puts("ERROR: wxSocketServer::Accept() failed.");
+ wxPuts(_T("ERROR: wxSocketServer::Accept() failed."));
break;
}
- puts("Server: got a client.");
+ wxPuts(_T("Server: got a client."));
server->SetTimeout(60); // 1 min
- while ( socket->IsConnected() )
+ bool close = false;
+ while ( !close && socket->IsConnected() )
{
wxString s;
- char ch = '\0';
+ wxChar ch = _T('\0');
for ( ;; )
{
if ( socket->Read(&ch, sizeof(ch)).Error() )
// don't log error if the client just close the connection
if ( socket->IsConnected() )
{
- puts("ERROR: in wxSocket::Read.");
+ wxPuts(_T("ERROR: in wxSocket::Read."));
}
break;
break;
}
- printf("Server: got '%s'.\n", s.c_str());
- if ( s == _T("bye") )
+ wxPrintf(_T("Server: got '%s'.\n"), s.c_str());
+ if ( s == _T("close") )
{
- delete socket;
+ wxPuts(_T("Closing connection"));
- break;
+ close = true;
}
+ else if ( s == _T("quit") )
+ {
+ close =
+ quit = true;
- socket->Write(s.MakeUpper().c_str(), s.length());
- socket->Write("\r\n", 2);
- printf("Server: wrote '%s'.\n", s.c_str());
+ wxPuts(_T("Shutting down the server"));
+ }
+ else // not a special command
+ {
+ socket->Write(s.MakeUpper().c_str(), s.length());
+ socket->Write("\r\n", 2);
+ wxPrintf(_T("Server: wrote '%s'.\n"), s.c_str());
+ }
}
- puts("Server: lost a client.");
+ if ( !close )
+ {
+ wxPuts(_T("Server: lost a client unexpectedly."));
+ }
socket->Destroy();
}
static void TestSocketClient()
{
- puts("*** Testing wxSocketClient ***\n");
+ wxPuts(_T("*** Testing wxSocketClient ***\n"));
- static const char *hostname = "www.wxwindows.org";
+ static const wxChar *hostname = _T("www.wxwindows.org");
wxIPV4address addr;
addr.Hostname(hostname);
addr.Service(80);
- printf("--- Attempting to connect to %s:80...\n", hostname);
+ wxPrintf(_T("--- Attempting to connect to %s:80...\n"), hostname);
wxSocketClient client;
if ( !client.Connect(addr) )
{
- printf("ERROR: failed to connect to %s\n", hostname);
+ wxPrintf(_T("ERROR: failed to connect to %s\n"), hostname);
}
else
{
- printf("--- Connected to %s:%u...\n",
+ wxPrintf(_T("--- Connected to %s:%u...\n"),
addr.Hostname().c_str(), addr.Service());
- char buf[8192];
+ wxChar buf[8192];
// could use simply "GET" here I suppose
wxString cmdGet =
- wxString::Format("GET http://%s/\r\n", hostname);
+ wxString::Format(_T("GET http://%s/\r\n"), hostname);
client.Write(cmdGet, cmdGet.length());
- printf("--- Sent command '%s' to the server\n",
+ wxPrintf(_T("--- Sent command '%s' to the server\n"),
MakePrintable(cmdGet).c_str());
client.Read(buf, WXSIZEOF(buf));
- printf("--- Server replied:\n%s", buf);
+ wxPrintf(_T("--- Server replied:\n%s"), buf);
}
}
#define FTP_ANONYMOUS
#ifdef FTP_ANONYMOUS
- static const char *directory = "/pub";
- static const char *filename = "welcome.msg";
+ static const wxChar *directory = _T("/pub");
+ static const wxChar *filename = _T("welcome.msg");
#else
- static const char *directory = "/etc";
- static const char *filename = "issue";
+ static const wxChar *directory = _T("/etc");
+ static const wxChar *filename = _T("issue");
#endif
static bool TestFtpConnect()
{
- puts("*** Testing FTP connect ***");
+ wxPuts(_T("*** Testing FTP connect ***"));
#ifdef FTP_ANONYMOUS
- static const char *hostname = "ftp.wxwindows.org";
+ static const wxChar *hostname = _T("ftp.wxwindows.org");
- printf("--- Attempting to connect to %s:21 anonymously...\n", hostname);
+ wxPrintf(_T("--- Attempting to connect to %s:21 anonymously...\n"), hostname);
#else // !FTP_ANONYMOUS
- static const char *hostname = "localhost";
+ static const wxChar *hostname = "localhost";
- char user[256];
- fgets(user, WXSIZEOF(user), stdin);
- user[strlen(user) - 1] = '\0'; // chop off '\n'
+ wxChar user[256];
+ wxFgets(user, WXSIZEOF(user), stdin);
+ user[wxStrlen(user) - 1] = '\0'; // chop off '\n'
ftp.SetUser(user);
- char password[256];
- printf("Password for %s: ", password);
- fgets(password, WXSIZEOF(password), stdin);
- password[strlen(password) - 1] = '\0'; // chop off '\n'
+ wxChar password[256];
+ wxPrintf(_T("Password for %s: "), password);
+ wxFgets(password, WXSIZEOF(password), stdin);
+ password[wxStrlen(password) - 1] = '\0'; // chop off '\n'
ftp.SetPassword(password);
- printf("--- Attempting to connect to %s:21 as %s...\n", hostname, user);
+ wxPrintf(_T("--- Attempting to connect to %s:21 as %s...\n"), hostname, user);
#endif // FTP_ANONYMOUS/!FTP_ANONYMOUS
if ( !ftp.Connect(hostname) )
{
- printf("ERROR: failed to connect to %s\n", hostname);
+ wxPrintf(_T("ERROR: failed to connect to %s\n"), hostname);
- return FALSE;
+ return false;
}
else
{
- printf("--- Connected to %s, current directory is '%s'\n",
+ wxPrintf(_T("--- Connected to %s, current directory is '%s'\n"),
hostname, ftp.Pwd().c_str());
}
- return TRUE;
+ return true;
}
// test (fixed?) wxFTP bug with wu-ftpd >= 2.6.0?
static void TestFtpWuFtpd()
{
wxFTP ftp;
- static const char *hostname = "ftp.eudora.com";
+ static const wxChar *hostname = _T("ftp.eudora.com");
if ( !ftp.Connect(hostname) )
{
- printf("ERROR: failed to connect to %s\n", hostname);
+ wxPrintf(_T("ERROR: failed to connect to %s\n"), hostname);
}
else
{
- static const char *filename = "eudora/pubs/draft-gellens-submit-09.txt";
+ static const wxChar *filename = _T("eudora/pubs/draft-gellens-submit-09.txt");
wxInputStream *in = ftp.GetInputStream(filename);
if ( !in )
{
- printf("ERROR: couldn't get input stream for %s\n", filename);
+ wxPrintf(_T("ERROR: couldn't get input stream for %s\n"), filename);
}
else
{
- size_t size = in->StreamSize();
- printf("Reading file %s (%u bytes)...", filename, size);
+ size_t size = in->GetSize();
+ wxPrintf(_T("Reading file %s (%u bytes)..."), filename, size);
- char *data = new char[size];
+ wxChar *data = new wxChar[size];
if ( !in->Read(data, size) )
{
- puts("ERROR: read error");
+ wxPuts(_T("ERROR: read error"));
}
else
{
- printf("Successfully retrieved the file.\n");
+ wxPrintf(_T("Successfully retrieved the file.\n"));
}
delete [] data;
static void TestFtpList()
{
- puts("*** Testing wxFTP file listing ***\n");
+ wxPuts(_T("*** Testing wxFTP file listing ***\n"));
// test CWD
if ( !ftp.ChDir(directory) )
{
- printf("ERROR: failed to cd to %s\n", directory);
+ wxPrintf(_T("ERROR: failed to cd to %s\n"), directory);
}
- printf("Current directory is '%s'\n", ftp.Pwd().c_str());
+ wxPrintf(_T("Current directory is '%s'\n"), ftp.Pwd().c_str());
// test NLIST and LIST
wxArrayString files;
if ( !ftp.GetFilesList(files) )
{
- puts("ERROR: failed to get NLIST of files");
+ wxPuts(_T("ERROR: failed to get NLIST of files"));
}
else
{
- printf("Brief list of files under '%s':\n", ftp.Pwd().c_str());
+ wxPrintf(_T("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());
+ wxPrintf(_T("\t%s\n"), files[n].c_str());
}
- puts("End of the file list");
+ wxPuts(_T("End of the file list"));
}
if ( !ftp.GetDirList(files) )
{
- puts("ERROR: failed to get LIST of files");
+ wxPuts(_T("ERROR: failed to get LIST of files"));
}
else
{
- printf("Detailed list of files under '%s':\n", ftp.Pwd().c_str());
+ wxPrintf(_T("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());
+ wxPrintf(_T("\t%s\n"), files[n].c_str());
}
- puts("End of the file list");
+ wxPuts(_T("End of the file list"));
}
if ( !ftp.ChDir(_T("..")) )
{
- puts("ERROR: failed to cd to ..");
+ wxPuts(_T("ERROR: failed to cd to .."));
}
- printf("Current directory is '%s'\n", ftp.Pwd().c_str());
+ wxPrintf(_T("Current directory is '%s'\n"), ftp.Pwd().c_str());
}
static void TestFtpDownload()
{
- puts("*** Testing wxFTP download ***\n");
+ wxPuts(_T("*** Testing wxFTP download ***\n"));
// test RETR
wxInputStream *in = ftp.GetInputStream(filename);
if ( !in )
{
- printf("ERROR: couldn't get input stream for %s\n", filename);
+ wxPrintf(_T("ERROR: couldn't get input stream for %s\n"), filename);
}
else
{
- size_t size = in->StreamSize();
- printf("Reading file %s (%u bytes)...", filename, size);
+ size_t size = in->GetSize();
+ wxPrintf(_T("Reading file %s (%u bytes)..."), filename, size);
fflush(stdout);
- char *data = new char[size];
+ wxChar *data = new wxChar[size];
if ( !in->Read(data, size) )
{
- puts("ERROR: read error");
+ wxPuts(_T("ERROR: read error"));
}
else
{
- printf("\nContents of %s:\n%s\n", filename, data);
+ wxPrintf(_T("\nContents of %s:\n%s\n"), filename, data);
}
delete [] data;
static void TestFtpFileSize()
{
- puts("*** Testing FTP SIZE command ***");
+ wxPuts(_T("*** Testing FTP SIZE command ***"));
if ( !ftp.ChDir(directory) )
{
- printf("ERROR: failed to cd to %s\n", directory);
+ wxPrintf(_T("ERROR: failed to cd to %s\n"), directory);
}
- printf("Current directory is '%s'\n", ftp.Pwd().c_str());
+ wxPrintf(_T("Current directory is '%s'\n"), ftp.Pwd().c_str());
if ( ftp.FileExists(filename) )
{
int size = ftp.GetFileSize(filename);
if ( size == -1 )
- printf("ERROR: couldn't get size of '%s'\n", filename);
+ wxPrintf(_T("ERROR: couldn't get size of '%s'\n"), filename);
else
- printf("Size of '%s' is %d bytes.\n", filename, size);
+ wxPrintf(_T("Size of '%s' is %d bytes.\n"), filename, size);
}
else
{
- printf("ERROR: '%s' doesn't exist\n", filename);
+ wxPrintf(_T("ERROR: '%s' doesn't exist\n"), filename);
}
}
static void TestFtpMisc()
{
- puts("*** Testing miscellaneous wxFTP functions ***");
+ wxPuts(_T("*** Testing miscellaneous wxFTP functions ***"));
if ( ftp.SendCommand("STAT") != '2' )
{
- puts("ERROR: STAT failed");
+ wxPuts(_T("ERROR: STAT failed"));
}
else
{
- printf("STAT returned:\n\n%s\n", ftp.GetLastResult().c_str());
+ wxPrintf(_T("STAT returned:\n\n%s\n"), ftp.GetLastResult().c_str());
}
if ( ftp.SendCommand("HELP SITE") != '2' )
{
- puts("ERROR: HELP SITE failed");
+ wxPuts(_T("ERROR: HELP SITE failed"));
}
else
{
- printf("The list of site-specific commands:\n\n%s\n",
+ wxPrintf(_T("The list of site-specific commands:\n\n%s\n"),
ftp.GetLastResult().c_str());
}
}
static void TestFtpInteractive()
{
- puts("\n*** Interactive wxFTP test ***");
+ wxPuts(_T("\n*** Interactive wxFTP test ***"));
- char buf[128];
+ wxChar buf[128];
for ( ;; )
{
- printf("Enter FTP command: ");
- if ( !fgets(buf, WXSIZEOF(buf), stdin) )
+ wxPrintf(_T("Enter FTP command: "));
+ if ( !wxFgets(buf, WXSIZEOF(buf), stdin) )
break;
// kill the last '\n'
- buf[strlen(buf) - 1] = 0;
+ buf[wxStrlen(buf) - 1] = 0;
// special handling of LIST and NLST as they require data connection
wxString start(buf, 4);
if ( start == "LIST" || start == "NLST" )
{
wxString wildcard;
- if ( strlen(buf) > 4 )
+ if ( wxStrlen(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());
+ wxPrintf(_T("ERROR: failed to get %s of files\n"), start.c_str());
}
else
{
- printf("--- %s of '%s' under '%s':\n",
+ wxPrintf(_T("--- %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());
+ wxPrintf(_T("\t%s\n"), files[n].c_str());
}
- puts("--- End of the file list");
+ wxPuts(_T("--- End of the file list"));
}
}
else // !list
{
- char ch = ftp.SendCommand(buf);
- printf("Command %s", ch ? "succeeded" : "failed");
+ wxChar ch = ftp.SendCommand(buf);
+ wxPrintf(_T("Command %s"), ch ? _T("succeeded") : _T("failed"));
if ( ch )
{
- printf(" (return code %c)", ch);
+ wxPrintf(_T(" (return code %c)"), ch);
}
- printf(", server reply:\n%s\n\n", ftp.GetLastResult().c_str());
+ wxPrintf(_T(", server reply:\n%s\n\n"), ftp.GetLastResult().c_str());
}
}
- puts("\n*** done ***");
+ wxPuts(_T("\n*** done ***"));
}
static void TestFtpUpload()
{
- puts("*** Testing wxFTP uploading ***\n");
+ wxPuts(_T("*** Testing wxFTP uploading ***\n"));
// upload a file
- static const char *file1 = "test1";
- static const char *file2 = "test2";
+ static const wxChar *file1 = _T("test1");
+ static const wxChar *file2 = _T("test2");
wxOutputStream *out = ftp.GetOutputStream(file1);
if ( out )
{
- printf("--- Uploading to %s ---\n", file1);
+ wxPrintf(_T("--- 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);
+ wxPrintf(_T("ERROR: STAT %s failed\n"), file1);
}
else
{
- printf("STAT %s returned:\n\n%s\n",
+ wxPrintf(_T("STAT %s returned:\n\n%s\n"),
file1, ftp.GetLastResult().c_str());
}
out = ftp.GetOutputStream(file2);
if ( out )
{
- printf("--- Uploading to %s ---\n", file1);
+ wxPrintf(_T("--- Uploading to %s ---\n"), file1);
out->Write("Second hello", 12);
delete out;
}
static void TestFileStream()
{
- puts("*** Testing wxFileInputStream ***");
+ wxPuts(_T("*** Testing wxFileInputStream ***"));
static const wxChar *filename = _T("testdata.fs");
{
}
wxFileInputStream fsIn(filename);
- printf("File stream size: %u\n", fsIn.GetSize());
+ wxPrintf(_T("File stream size: %u\n"), fsIn.GetSize());
while ( !fsIn.Eof() )
{
putchar(fsIn.GetC());
if ( !wxRemoveFile(filename) )
{
- printf("ERROR: failed to remove the file '%s'.\n", filename);
+ wxPrintf(_T("ERROR: failed to remove the file '%s'.\n"), filename);
}
- puts("\n*** wxFileInputStream test done ***");
+ wxPuts(_T("\n*** wxFileInputStream test done ***"));
}
static void TestMemoryStream()
{
- puts("*** Testing wxMemoryInputStream ***");
+ wxPuts(_T("*** Testing wxMemoryOutputStream ***"));
+
+ wxMemoryOutputStream memOutStream;
+ wxPrintf(_T("Initially out stream offset: %lu\n"),
+ (unsigned long)memOutStream.TellO());
+
+ for ( const wxChar *p = _T("Hello, stream!"); *p; p++ )
+ {
+ memOutStream.PutC(*p);
+ }
+
+ wxPrintf(_T("Final out stream offset: %lu\n"),
+ (unsigned long)memOutStream.TellO());
+
+ wxPuts(_T("*** Testing wxMemoryInputStream ***"));
wxChar buf[1024];
- wxStrncpy(buf, _T("Hello, stream!"), WXSIZEOF(buf));
+ size_t len = memOutStream.CopyTo(buf, WXSIZEOF(buf));
- wxMemoryInputStream memInpStream(buf, wxStrlen(buf));
- printf(_T("Memory stream size: %u\n"), memInpStream.GetSize());
+ wxMemoryInputStream memInpStream(buf, len);
+ wxPrintf(_T("Memory stream size: %u\n"), memInpStream.GetSize());
while ( !memInpStream.Eof() )
{
putchar(memInpStream.GetC());
}
- puts("\n*** wxMemoryInputStream test done ***");
+ wxPuts(_T("\n*** wxMemoryInputStream test done ***"));
}
#endif // TEST_STREAMS
static void TestStopWatch()
{
- puts("*** Testing wxStopWatch ***\n");
+ wxPuts(_T("*** Testing wxStopWatch ***\n"));
wxStopWatch sw;
sw.Pause();
- printf("Initially paused, after 2 seconds time is...");
+ wxPrintf(_T("Initially paused, after 2 seconds time is..."));
fflush(stdout);
wxSleep(2);
- printf("\t%ldms\n", sw.Time());
+ wxPrintf(_T("\t%ldms\n"), sw.Time());
- printf("Resuming stopwatch and sleeping 3 seconds...");
+ wxPrintf(_T("Resuming stopwatch and sleeping 3 seconds..."));
fflush(stdout);
sw.Resume();
wxSleep(3);
- printf("\telapsed time: %ldms\n", sw.Time());
+ wxPrintf(_T("\telapsed time: %ldms\n"), sw.Time());
sw.Pause();
- printf("Pausing agan and sleeping 2 more seconds...");
+ wxPrintf(_T("Pausing agan and sleeping 2 more seconds..."));
fflush(stdout);
wxSleep(2);
- printf("\telapsed time: %ldms\n", sw.Time());
+ wxPrintf(_T("\telapsed time: %ldms\n"), sw.Time());
sw.Resume();
- printf("Finally resuming and sleeping 2 more seconds...");
+ wxPrintf(_T("Finally resuming and sleeping 2 more seconds..."));
fflush(stdout);
wxSleep(2);
- printf("\telapsed time: %ldms\n", sw.Time());
+ wxPrintf(_T("\telapsed time: %ldms\n"), sw.Time());
wxStopWatch sw2;
- puts("\nChecking for 'backwards clock' bug...");
+ wxPuts(_T("\nChecking for 'backwards clock' bug..."));
for ( size_t n = 0; n < 70; n++ )
{
sw2.Start();
{
if ( sw.Time() < 0 || sw2.Time() < 0 )
{
- puts("\ntime is negative - ERROR!");
+ wxPuts(_T("\ntime is negative - ERROR!"));
}
}
fflush(stdout);
}
- puts(", ok.");
+ wxPuts(_T(", ok."));
}
#endif // TEST_TIMER
wxVCardObject *vcObj = vcard.GetFirstProp(&cookie);
while ( vcObj )
{
- printf("%s%s",
+ wxPrintf(_T("%s%s"),
wxString(_T('\t'), level).c_str(),
vcObj->GetName().c_str());
}
if ( !!value )
- printf(" = %s", value.c_str());
+ wxPrintf(_T(" = %s"), value.c_str());
putchar('\n');
DumpVObject(level + 1, *vcObj);
static void DumpVCardAddresses(const wxVCard& vcard)
{
- puts("\nShowing all addresses from vCard:\n");
+ wxPuts(_T("\nShowing all addresses from vCard:\n"));
size_t nAdr = 0;
void *cookie;
flagsStr << _T("work ");
}
- printf("Address %u:\n"
+ wxPrintf(_T("Address %u:\n")
"\tflags = %s\n"
"\tvalue = %s;%s;%s;%s;%s;%s;%s\n",
++nAdr,
static void DumpVCardPhoneNumbers(const wxVCard& vcard)
{
- puts("\nShowing all phone numbers from vCard:\n");
+ wxPuts(_T("\nShowing all phone numbers from vCard:\n"));
size_t nPhone = 0;
void *cookie;
flagsStr << _T("work ");
}
- printf("Phone number %u:\n"
+ wxPrintf(_T("Phone number %u:\n")
"\tflags = %s\n"
"\tvalue = %s\n",
++nPhone,
static void TestVCardRead()
{
- puts("*** Testing wxVCard reading ***\n");
+ wxPuts(_T("*** Testing wxVCard reading ***\n"));
wxVCard vcard(_T("vcard.vcf"));
if ( !vcard.IsOk() )
{
- puts("ERROR: couldn't load vCard.");
+ wxPuts(_T("ERROR: couldn't load vCard."));
}
else
{
value = _T("<none>");
}
- printf("Full name retrieved directly: %s\n", value.c_str());
+ wxPrintf(_T("Full name retrieved directly: %s\n"), value.c_str());
if ( !vcard.GetFullName(&value) )
value = _T("<none>");
}
- printf("Full name from wxVCard API: %s\n", value.c_str());
+ wxPrintf(_T("Full name from wxVCard API: %s\n"), value.c_str());
// now show how to deal with multiply occuring properties
DumpVCardAddresses(vcard);
DumpVCardPhoneNumbers(vcard);
// and finally show all
- puts("\nNow dumping the entire vCard:\n"
+ wxPuts(_T("\nNow dumping the entire vCard:\n")
"-----------------------------\n");
DumpVObject(0, vcard);
static void TestVCardWrite()
{
- puts("*** Testing wxVCard writing ***\n");
+ wxPuts(_T("*** Testing wxVCard writing ***\n"));
wxVCard vcard;
if ( !vcard.IsOk() )
{
- puts("ERROR: couldn't create vCard.");
+ wxPuts(_T("ERROR: couldn't create vCard."));
}
else
{
vcard.SetOrganization("wxWindows", "R&D");
// just dump the vCard back
- puts("Entire vCard follows:\n");
- puts(vcard.Write());
+ wxPuts(_T("Entire vCard follows:\n"));
+ wxPuts(vcard.Write());
}
}
// wxVolume tests
// ----------------------------------------------------------------------------
-#if !wxUSE_FSVOLUME
+#if !defined(__WIN32__) || !wxUSE_FSVOLUME
#undef TEST_VOLUME
#endif
#endif // TEST_VOLUME
// ----------------------------------------------------------------------------
-// wide char (Unicode) support
+// wide char and Unicode support
// ----------------------------------------------------------------------------
+#ifdef TEST_UNICODE
+
+static void TestUnicodeToFromAscii()
+{
+ wxPuts(_T("Testing wxString::To/FromAscii()\n"));
+
+ static const char *msg = "Hello, world!";
+ wxString s = wxString::FromAscii(msg);
+
+ wxPrintf(_T("Message in Unicode: %s\n"), s.c_str());
+ printf("Message in ASCII: %s\n", (const char *)s.ToAscii());
+
+ wxPutchar(_T('\n'));
+}
+
+#endif // TEST_UNICODE
+
#ifdef TEST_WCHAR
#include "wx/strconv.h"
#include "wx/encconv.h"
#include "wx/buffer.h"
-static const char textInUtf8[] =
+static const unsigned char utf8koi8r[] =
{
208, 157, 208, 181, 209, 129, 208, 186, 208, 176, 208, 183, 208, 176,
208, 189, 208, 189, 208, 190, 32, 208, 191, 208, 190, 209, 128, 208,
178, 208, 190, 209, 129, 209, 130, 209, 140, 209, 142, 0
};
+static const unsigned char utf8iso8859_1[] =
+{
+ 0x53, 0x79, 0x73, 0x74, 0xc3, 0xa8, 0x6d, 0x65, 0x73, 0x20, 0x49, 0x6e,
+ 0x74, 0xc3, 0xa9, 0x67, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x20, 0x65,
+ 0x6e, 0x20, 0x4d, 0xc3, 0xa9, 0x63, 0x61, 0x6e, 0x69, 0x71, 0x75, 0x65,
+ 0x20, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x69, 0x71, 0x75, 0x65, 0x20, 0x65,
+ 0x74, 0x20, 0x51, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x71, 0x75, 0x65, 0
+};
+
+static const unsigned char utf8Invalid[] =
+{
+ 0x3c, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x3e, 0x32, 0x30, 0x30,
+ 0x32, 0xe5, 0xb9, 0xb4, 0x30, 0x39, 0xe6, 0x9c, 0x88, 0x32, 0x35, 0xe6,
+ 0x97, 0xa5, 0x20, 0x30, 0x37, 0xe6, 0x99, 0x82, 0x33, 0x39, 0xe5, 0x88,
+ 0x86, 0x35, 0x37, 0xe7, 0xa7, 0x92, 0x3c, 0x2f, 0x64, 0x69, 0x73, 0x70,
+ 0x6c, 0x61, 0x79, 0
+};
+
+static const struct Utf8Data
+{
+ const unsigned char *text;
+ size_t len;
+ const wxChar *charset;
+ wxFontEncoding encoding;
+} utf8data[] =
+{
+ { utf8Invalid, WXSIZEOF(utf8Invalid), _T("iso8859-1"), wxFONTENCODING_ISO8859_1 },
+ { utf8koi8r, WXSIZEOF(utf8koi8r), _T("koi8-r"), wxFONTENCODING_KOI8 },
+ { utf8iso8859_1, WXSIZEOF(utf8iso8859_1), _T("iso8859-1"), wxFONTENCODING_ISO8859_1 },
+};
+
static void TestUtf8()
{
- puts("*** Testing UTF8 support ***\n");
+ wxPuts(_T("*** Testing UTF8 support ***\n"));
char buf[1024];
wchar_t wbuf[1024];
- if ( wxConvUTF8.MB2WC(wbuf, textInUtf8, WXSIZEOF(textInUtf8)) <= 0 )
- {
- puts("ERROR: UTF-8 decoding failed.");
- }
- else
+
+ for ( size_t n = 0; n < WXSIZEOF(utf8data); n++ )
{
- wxCSConv conv(_T("koi8-r"));
- if ( conv.WC2MB(buf, wbuf, 0 /* not needed wcslen(wbuf) */) <= 0 )
+ const Utf8Data& u8d = utf8data[n];
+ if ( wxConvUTF8.MB2WC(wbuf, (const char *)u8d.text,
+ WXSIZEOF(wbuf)) == (size_t)-1 )
{
- puts("ERROR: conversion to KOI8-R failed.");
+ wxPuts(_T("ERROR: UTF-8 decoding failed."));
}
else
{
- printf("The resulting string (in KOI8-R): %s\n", buf);
+ wxCSConv conv(u8d.charset);
+ if ( conv.WC2MB(buf, wbuf, WXSIZEOF(buf)) == (size_t)-1 )
+ {
+ wxPrintf(_T("ERROR: conversion to %s failed.\n"), u8d.charset);
+ }
+ else
+ {
+ wxPrintf(_T("String in %s: %s\n"), u8d.charset, buf);
+ }
}
- }
- if ( wxConvUTF8.WC2MB(buf, L"Ã la", WXSIZEOF(buf)) <= 0 )
- {
- puts("ERROR: conversion to UTF-8 failed.");
- }
- else
- {
- printf("The string in UTF-8: %s\n", buf);
+ wxString s(wxConvUTF8.cMB2WC((const char *)u8d.text), *wxConvCurrent);
+ if ( s.empty() )
+ s = _T("<< conversion failed >>");
+ wxPrintf(_T("String in current cset: %s\n"), s.c_str());
+
}
- puts("");
+ wxPuts(_T(""));
}
static void TestEncodingConverter()
// using wxEncodingConverter should give the same result as above
char buf[1024];
wchar_t wbuf[1024];
- if ( wxConvUTF8.MB2WC(wbuf, textInUtf8, WXSIZEOF(textInUtf8)) <= 0 )
+ if ( wxConvUTF8.MB2WC(wbuf, (const char *)utf8koi8r,
+ WXSIZEOF(utf8koi8r)) == (size_t)-1 )
{
- puts("ERROR: UTF-8 decoding failed.");
+ wxPuts(_T("ERROR: UTF-8 decoding failed."));
}
else
{
wxEncodingConverter ec;
ec.Init(wxFONTENCODING_UNICODE, wxFONTENCODING_KOI8);
ec.Convert(wbuf, buf);
- printf("The same string obtained using wxEC: %s\n", buf);
+ wxPrintf(_T("The same KOI8-R string using wxEC: %s\n"), buf);
}
- puts("");
+ wxPuts(_T(""));
}
#endif // TEST_WCHAR
static void TestZipStreamRead()
{
- puts("*** Testing ZIP reading ***\n");
+ wxPuts(_T("*** Testing ZIP reading ***\n"));
static const wxChar *filename = _T("foo");
wxZipInputStream istr(TESTFILE_ZIP, filename);
- printf("Archive size: %u\n", istr.GetSize());
+ wxPrintf(_T("Archive size: %u\n"), istr.GetSize());
- printf("Dumping the file '%s':\n", filename);
+ wxPrintf(_T("Dumping the file '%s':\n"), filename);
while ( !istr.Eof() )
{
putchar(istr.GetC());
fflush(stdout);
}
- puts("\n----- done ------");
+ wxPuts(_T("\n----- done ------"));
}
static void DumpZipDirectory(wxFileSystem& fs,
static void TestZipFileSystem()
{
- puts("*** Testing ZIP file system ***\n");
+ wxPuts(_T("*** Testing ZIP file system ***\n"));
wxFileSystem::AddHandler(new wxZipFSHandler);
wxFileSystem fs;
#include "wx/wfstream.h"
static const wxChar *FILENAME_GZ = _T("test.gz");
-static const char *TEST_DATA = "hello and hello again";
+static const wxChar *TEST_DATA = _T("hello and hello and hello and hello and hello");
static void TestZlibStreamWrite()
{
- puts("*** Testing Zlib stream reading ***\n");
+ wxPuts(_T("*** Testing Zlib stream reading ***\n"));
wxFileOutputStream fileOutStream(FILENAME_GZ);
- wxZlibOutputStream ostr(fileOutStream, 0);
- printf("Compressing the test string... ");
- ostr.Write(TEST_DATA, sizeof(TEST_DATA));
+ wxZlibOutputStream ostr(fileOutStream);
+ wxPrintf(_T("Compressing the test string... "));
+ ostr.Write(TEST_DATA, wxStrlen(TEST_DATA) + 1);
if ( !ostr )
{
- puts("(ERROR: failed)");
+ wxPuts(_T("(ERROR: failed)"));
}
else
{
- puts("(ok)");
+ wxPuts(_T("(ok)"));
}
- puts("\n----- done ------");
+ wxPuts(_T("\n----- done ------"));
}
static void TestZlibStreamRead()
{
- puts("*** Testing Zlib stream reading ***\n");
+ wxPuts(_T("*** Testing Zlib stream reading ***\n"));
wxFileInputStream fileInStream(FILENAME_GZ);
wxZlibInputStream istr(fileInStream);
- printf("Archive size: %u\n", istr.GetSize());
+ wxPrintf(_T("Archive size: %u\n"), istr.GetSize());
- puts("Dumping the file:");
+ wxPuts(_T("Dumping the file:"));
while ( !istr.Eof() )
{
putchar(istr.GetC());
fflush(stdout);
}
- puts("\n----- done ------");
+ wxPuts(_T("\n----- done ------"));
}
#endif // TEST_ZLIB
#include <math.h>
-#include "wx/date.h"
#include "wx/datetime.h"
// the test data
wxString Format() const
{
wxString s;
- s.Printf("%02d:%02d:%02d %10s %02d, %4d%s",
+ s.Printf(_T("%02d:%02d:%02d %10s %02d, %4d%s"),
hour, min, sec,
wxDateTime::GetMonthName(month).c_str(),
day,
abs(wxDateTime::ConvertYearToBC(year)),
- year > 0 ? "AD" : "BC");
+ year > 0 ? _T("AD") : _T("BC"));
return s;
}
wxString FormatDate() const
{
wxString s;
- s.Printf("%02d-%s-%4d%s",
+ s.Printf(_T("%02d-%s-%4d%s"),
day,
wxDateTime::GetMonthName(month, wxDateTime::Name_Abbr).c_str(),
abs(wxDateTime::ConvertYearToBC(year)),
- year > 0 ? "AD" : "BC");
+ year > 0 ? _T("AD") : _T("BC"));
return s;
}
};
static const Date testDates[] =
{
{ 1, wxDateTime::Jan, 1970, 00, 00, 00, 2440587.5, wxDateTime::Thu, 0, -3600 },
+ { 7, wxDateTime::Feb, 2036, 00, 00, 00, 2464730.5, wxDateTime::Thu, -1, -1 },
+ { 8, wxDateTime::Feb, 2036, 00, 00, 00, 2464731.5, wxDateTime::Fri, -1, -1 },
+ { 1, wxDateTime::Jan, 2037, 00, 00, 00, 2465059.5, wxDateTime::Thu, -1, -1 },
+ { 1, wxDateTime::Jan, 2038, 00, 00, 00, 2465424.5, wxDateTime::Fri, -1, -1 },
{ 21, wxDateTime::Jan, 2222, 00, 00, 00, 2532648.5, wxDateTime::Mon, -1, -1 },
{ 29, wxDateTime::May, 1976, 12, 00, 00, 2442928.0, wxDateTime::Sat, 202219200, 202212000 },
{ 29, wxDateTime::Feb, 1976, 00, 00, 00, 2442837.5, wxDateTime::Sun, 194400000, 194396400 },
// this test miscellaneous static wxDateTime functions
static void TestTimeStatic()
{
- puts("\n*** wxDateTime static methods test ***");
+ wxPuts(_T("\n*** wxDateTime static methods test ***"));
// some info about the current date
int year = wxDateTime::GetCurrentYear();
- printf("Current year %d is %sa leap one and has %d days.\n",
+ wxPrintf(_T("Current year %d is %sa leap one and has %d days.\n"),
year,
wxDateTime::IsLeapYear(year) ? "" : "not ",
wxDateTime::GetNumberOfDays(year));
wxDateTime::Month month = wxDateTime::GetCurrentMonth();
- printf("Current month is '%s' ('%s') and it has %d days\n",
+ wxPrintf(_T("Current month is '%s' ('%s') and it has %d days\n"),
wxDateTime::GetMonthName(month, wxDateTime::Name_Abbr).c_str(),
wxDateTime::GetMonthName(month).c_str(),
wxDateTime::GetNumberOfDays(month));
// first line: the years to test
{ 1990, 1976, 2000, 2030, 1984, },
- // second line: TRUE if leap, FALSE otherwise
- { FALSE, TRUE, TRUE, FALSE, TRUE }
+ // second line: true if leap, false otherwise
+ { false, true, true, false, true }
};
for ( size_t n = 0; n < nYears; n++ )
bool should = years[1][n] != 0,
is = wxDateTime::IsLeapYear(year);
- printf("Year %d is %sa leap year (%s)\n",
+ wxPrintf(_T("Year %d is %sa leap year (%s)\n"),
year,
is ? "" : "not ",
should == is ? "ok" : "ERROR");
// test constructing wxDateTime objects
static void TestTimeSet()
{
- puts("\n*** wxDateTime construction test ***");
+ wxPuts(_T("\n*** wxDateTime construction test ***"));
for ( size_t n = 0; n < WXSIZEOF(testDates); n++ )
{
wxString s1 = d1.Format(),
s2 = d2.Format();
- printf("Date: %s == %s (%s)\n",
- s1.c_str(), s2.c_str(),
- s1 == s2 ? "ok" : "ERROR");
+ wxPrintf(_T("Date: %s == %s (%s)\n"),
+ s1.c_str(), s2.c_str(),
+ s1 == s2 ? _T("ok") : _T("ERROR"));
}
}
// test time zones stuff
static void TestTimeZones()
{
- puts("\n*** wxDateTime timezone test ***");
+ wxPuts(_T("\n*** wxDateTime timezone test ***"));
wxDateTime now = wxDateTime::Now();
- printf("Current GMT time:\t%s\n", now.Format("%c", wxDateTime::GMT0).c_str());
- printf("Unix epoch (GMT):\t%s\n", wxDateTime((time_t)0).Format("%c", wxDateTime::GMT0).c_str());
- printf("Unix epoch (EST):\t%s\n", wxDateTime((time_t)0).Format("%c", wxDateTime::EST).c_str());
- printf("Current time in Paris:\t%s\n", now.Format("%c", wxDateTime::CET).c_str());
- printf(" Moscow:\t%s\n", now.Format("%c", wxDateTime::MSK).c_str());
- printf(" New York:\t%s\n", now.Format("%c", wxDateTime::EST).c_str());
+ wxPrintf(_T("Current GMT time:\t%s\n"), now.Format(_T("%c"), wxDateTime::GMT0).c_str());
+ wxPrintf(_T("Unix epoch (GMT):\t%s\n"), wxDateTime((time_t)0).Format(_T("%c"), wxDateTime::GMT0).c_str());
+ wxPrintf(_T("Unix epoch (EST):\t%s\n"), wxDateTime((time_t)0).Format(_T("%c"), wxDateTime::EST).c_str());
+ wxPrintf(_T("Current time in Paris:\t%s\n"), now.Format(_T("%c"), wxDateTime::CET).c_str());
+ wxPrintf(_T(" Moscow:\t%s\n"), now.Format(_T("%c"), wxDateTime::MSK).c_str());
+ wxPrintf(_T(" New York:\t%s\n"), now.Format(_T("%c"), wxDateTime::EST).c_str());
wxDateTime::Tm tm = now.GetTm();
if ( wxDateTime(tm) != now )
{
- printf("ERROR: got %s instead of %s\n",
- wxDateTime(tm).Format().c_str(), now.Format().c_str());
+ wxPrintf(_T("ERROR: got %s instead of %s\n"),
+ wxDateTime(tm).Format().c_str(), now.Format().c_str());
}
}
// test some minimal support for the dates outside the standard range
static void TestTimeRange()
{
- puts("\n*** wxDateTime out-of-standard-range dates test ***");
+ wxPuts(_T("\n*** wxDateTime out-of-standard-range dates test ***"));
- static const char *fmt = "%d-%b-%Y %H:%M:%S";
+ static const wxChar *fmt = _T("%d-%b-%Y %H:%M:%S");
- printf("Unix epoch:\t%s\n",
- wxDateTime(2440587.5).Format(fmt).c_str());
- printf("Feb 29, 0: \t%s\n",
- wxDateTime(29, wxDateTime::Feb, 0).Format(fmt).c_str());
- printf("JDN 0: \t%s\n",
- wxDateTime(0.0).Format(fmt).c_str());
- printf("Jan 1, 1AD:\t%s\n",
- wxDateTime(1, wxDateTime::Jan, 1).Format(fmt).c_str());
- printf("May 29, 2099:\t%s\n",
- wxDateTime(29, wxDateTime::May, 2099).Format(fmt).c_str());
+ wxPrintf(_T("Unix epoch:\t%s\n"),
+ wxDateTime(2440587.5).Format(fmt).c_str());
+ wxPrintf(_T("Feb 29, 0: \t%s\n"),
+ wxDateTime(29, wxDateTime::Feb, 0).Format(fmt).c_str());
+ wxPrintf(_T("JDN 0: \t%s\n"),
+ wxDateTime(0.0).Format(fmt).c_str());
+ wxPrintf(_T("Jan 1, 1AD:\t%s\n"),
+ wxDateTime(1, wxDateTime::Jan, 1).Format(fmt).c_str());
+ wxPrintf(_T("May 29, 2099:\t%s\n"),
+ wxDateTime(29, wxDateTime::May, 2099).Format(fmt).c_str());
}
static void TestTimeTicks()
{
- puts("\n*** wxDateTime ticks test ***");
+ wxPuts(_T("\n*** wxDateTime ticks test ***"));
for ( size_t n = 0; n < WXSIZEOF(testDates); n++ )
{
wxDateTime dt = d.DT();
long ticks = (dt.GetValue() / 1000).ToLong();
- printf("Ticks of %s:\t% 10ld", d.Format().c_str(), ticks);
+ wxPrintf(_T("Ticks of %s:\t% 10ld"), d.Format().c_str(), ticks);
if ( ticks == d.ticks )
{
- puts(" (ok)");
+ wxPuts(_T(" (ok)"));
}
else
{
- printf(" (ERROR: should be %ld, delta = %ld)\n",
- d.ticks, ticks - d.ticks);
+ wxPrintf(_T(" (ERROR: should be %ld, delta = %ld)\n"),
+ (long)d.ticks, (long)(ticks - d.ticks));
}
dt = d.DT().ToTimezone(wxDateTime::GMT0);
ticks = (dt.GetValue() / 1000).ToLong();
- printf("GMtks of %s:\t% 10ld", d.Format().c_str(), ticks);
+ wxPrintf(_T("GMtks of %s:\t% 10ld"), d.Format().c_str(), ticks);
if ( ticks == d.gmticks )
{
- puts(" (ok)");
+ wxPuts(_T(" (ok)"));
}
else
{
- printf(" (ERROR: should be %ld, delta = %ld)\n",
- d.gmticks, ticks - d.gmticks);
+ wxPrintf(_T(" (ERROR: should be %ld, delta = %ld)\n"),
+ (long)d.gmticks, (long)(ticks - d.gmticks));
}
}
- puts("");
+ wxPuts(_T(""));
}
// test conversions to JDN &c
static void TestTimeJDN()
{
- puts("\n*** wxDateTime to JDN test ***");
+ wxPuts(_T("\n*** wxDateTime to JDN test ***"));
for ( size_t n = 0; n < WXSIZEOF(testDates); n++ )
{
wxDateTime dt(d.day, d.month, d.year, d.hour, d.min, d.sec);
double jdn = dt.GetJulianDayNumber();
- printf("JDN of %s is:\t% 15.6f", d.Format().c_str(), jdn);
+ wxPrintf(_T("JDN of %s is:\t% 15.6f"), d.Format().c_str(), jdn);
if ( jdn == d.jdn )
{
- puts(" (ok)");
+ wxPuts(_T(" (ok)"));
}
else
{
- printf(" (ERROR: should be %f, delta = %f)\n",
- d.jdn, jdn - d.jdn);
+ wxPrintf(_T(" (ERROR: should be %f, delta = %f)\n"),
+ d.jdn, jdn - d.jdn);
}
}
}
// test week days computation
static void TestTimeWDays()
{
- puts("\n*** wxDateTime weekday test ***");
+ wxPuts(_T("\n*** wxDateTime weekday test ***"));
// test GetWeekDay()
size_t n;
wxDateTime dt(d.day, d.month, d.year, d.hour, d.min, d.sec);
wxDateTime::WeekDay wday = dt.GetWeekDay();
- printf("%s is: %s",
- d.Format().c_str(),
- wxDateTime::GetWeekDayName(wday).c_str());
+ wxPrintf(_T("%s is: %s"),
+ d.Format().c_str(),
+ wxDateTime::GetWeekDayName(wday).c_str());
if ( wday == d.wday )
{
- puts(" (ok)");
+ wxPuts(_T(" (ok)"));
}
else
{
- printf(" (ERROR: should be %s)\n",
- wxDateTime::GetWeekDayName(d.wday).c_str());
+ wxPrintf(_T(" (ERROR: should be %s)\n"),
+ wxDateTime::GetWeekDayName(d.wday).c_str());
}
}
- puts("");
+ wxPuts(_T(""));
// test SetToWeekDay()
struct WeekDateTestData
wxString s, which;
switch ( nWeek < -1 ? -nWeek : nWeek )
{
- case 1: which = "first"; break;
- case 2: which = "second"; break;
- case 3: which = "third"; break;
- case 4: which = "fourth"; break;
- case 5: which = "fifth"; break;
+ case 1: which = _T("first"); break;
+ case 2: which = _T("second"); break;
+ case 3: which = _T("third"); break;
+ case 4: which = _T("fourth"); break;
+ case 5: which = _T("fifth"); break;
- case -1: which = "last"; break;
+ case -1: which = _T("last"); break;
}
if ( nWeek < -1 )
{
- which += " from end";
+ which += _T(" from end");
}
- s.Printf("The %s %s of %s in %d",
+ s.Printf(_T("The %s %s of %s in %d"),
which.c_str(),
wxDateTime::GetWeekDayName(wday).c_str(),
wxDateTime::GetMonthName(month).c_str(),
{ { 3, wxDateTime::Dec, 2074 }, -5, wxDateTime::Mon, wxDateTime::Dec, 2074 },
};
- static const char *fmt = "%d-%b-%Y";
+ static const wxChar *fmt = _T("%d-%b-%Y");
wxDateTime dt;
for ( n = 0; n < WXSIZEOF(weekDatesTestData); n++ )
dt.SetToWeekDay(wd.wday, wd.nWeek, wd.month, wd.year);
- printf("%s is %s", wd.Format().c_str(), dt.Format(fmt).c_str());
+ wxPrintf(_T("%s is %s"), wd.Format().c_str(), dt.Format(fmt).c_str());
const Date& d = wd.date;
if ( d.SameDay(dt.GetTm()) )
{
- puts(" (ok)");
+ wxPuts(_T(" (ok)"));
}
else
{
dt.Set(d.day, d.month, d.year);
- printf(" (ERROR: should be %s)\n", dt.Format(fmt).c_str());
+ wxPrintf(_T(" (ERROR: should be %s)\n"), dt.Format(fmt).c_str());
}
}
}
// test the computation of (ISO) week numbers
static void TestTimeWNumber()
{
- puts("\n*** wxDateTime week number test ***");
+ wxPuts(_T("\n*** wxDateTime week number test ***"));
struct WeekNumberTestData
{
wmon2 = dt.GetWeekOfMonth(wxDateTime::Sunday_First),
dnum = dt.GetDayOfYear();
- printf("%s: the day number is %d",
- d.FormatDate().c_str(), dnum);
+ wxPrintf(_T("%s: the day number is %d"), d.FormatDate().c_str(), dnum);
if ( dnum == wn.dnum )
{
- printf(" (ok)");
+ wxPrintf(_T(" (ok)"));
}
else
{
- printf(" (ERROR: should be %d)", wn.dnum);
+ wxPrintf(_T(" (ERROR: should be %d)"), wn.dnum);
}
- printf(", week in month is %d", wmon);
- if ( wmon == wn.wmon )
+ wxPrintf(_T(", week in month = %d"), wmon);
+ if ( wmon != wn.wmon )
{
- printf(" (ok)");
- }
- else
- {
- printf(" (ERROR: should be %d)", wn.wmon);
+ wxPrintf(_T(" (ERROR: should be %d)"), wn.wmon);
}
- printf(" or %d", wmon2);
+ wxPrintf(_T(" or %d"), wmon2);
if ( wmon2 == wn.wmon2 )
{
- printf(" (ok)");
+ wxPrintf(_T(" (ok)"));
}
else
{
- printf(" (ERROR: should be %d)", wn.wmon2);
+ wxPrintf(_T(" (ERROR: should be %d)"), wn.wmon2);
}
- printf(", week in year is %d", week);
- if ( week == wn.week )
+ wxPrintf(_T(", week in year = %d"), week);
+ if ( week != wn.week )
{
- puts(" (ok)");
+ wxPrintf(_T(" (ERROR: should be %d)"), wn.week);
}
- else
+
+ wxPutchar(_T('\n'));
+
+ wxDateTime dt2(1, wxDateTime::Jan, d.year);
+ dt2.SetToTheWeek(wn.week, dt.GetWeekDay());
+ if ( dt2 != dt )
{
- printf(" (ERROR: should be %d)\n", wn.week);
+ Date d2;
+ d2.Init(dt2.GetTm());
+ wxPrintf(_T("ERROR: SetToTheWeek() returned %s\n"),
+ d2.FormatDate().c_str());
}
}
}
// test DST calculations
static void TestTimeDST()
{
- puts("\n*** wxDateTime DST test ***");
+ wxPuts(_T("\n*** wxDateTime DST test ***"));
- printf("DST is%s in effect now.\n\n",
- wxDateTime::Now().IsDST() ? "" : " not");
+ wxPrintf(_T("DST is%s in effect now.\n\n"),
+ wxDateTime::Now().IsDST() ? _T("") : _T(" not"));
// taken from http://www.energy.ca.gov/daylightsaving.html
static const Date datesDST[2][2004 - 1900 + 1] =
wxDateTime dtBegin = wxDateTime::GetBeginDST(year, wxDateTime::USA),
dtEnd = wxDateTime::GetEndDST(year, wxDateTime::USA);
- printf("DST period in the US for year %d: from %s to %s",
- year, dtBegin.Format().c_str(), dtEnd.Format().c_str());
+ wxPrintf(_T("DST period in the US for year %d: from %s to %s"),
+ year, dtBegin.Format().c_str(), dtEnd.Format().c_str());
size_t n = year - 1990;
const Date& dBegin = datesDST[0][n];
if ( dBegin.SameDay(dtBegin.GetTm()) && dEnd.SameDay(dtEnd.GetTm()) )
{
- puts(" (ok)");
+ wxPuts(_T(" (ok)"));
}
else
{
- printf(" (ERROR: should be %s %d to %s %d)\n",
- wxDateTime::GetMonthName(dBegin.month).c_str(), dBegin.day,
- wxDateTime::GetMonthName(dEnd.month).c_str(), dEnd.day);
+ wxPrintf(_T(" (ERROR: should be %s %d to %s %d)\n"),
+ wxDateTime::GetMonthName(dBegin.month).c_str(), dBegin.day,
+ wxDateTime::GetMonthName(dEnd.month).c_str(), dEnd.day);
}
}
- puts("");
+ wxPuts(_T(""));
for ( year = 1990; year < 2005; year++ )
{
- printf("DST period in Europe for year %d: from %s to %s\n",
- year,
- wxDateTime::GetBeginDST(year, wxDateTime::Country_EEC).Format().c_str(),
- wxDateTime::GetEndDST(year, wxDateTime::Country_EEC).Format().c_str());
+ wxPrintf(_T("DST period in Europe for year %d: from %s to %s\n"),
+ year,
+ wxDateTime::GetBeginDST(year, wxDateTime::Country_EEC).Format().c_str(),
+ wxDateTime::GetEndDST(year, wxDateTime::Country_EEC).Format().c_str());
}
}
// test wxDateTime -> text conversion
static void TestTimeFormat()
{
- puts("\n*** wxDateTime formatting test ***");
+ wxPuts(_T("\n*** wxDateTime formatting test ***"));
// some information may be lost during conversion, so store what kind
// of info should we recover after a round trip
static const struct
{
CompareKind compareKind;
- const char *format;
+ const wxChar *format;
} formatTestFormats[] =
{
- { CompareBoth, "---> %c" },
- { CompareDate, "Date is %A, %d of %B, in year %Y" },
- { CompareBoth, "Date is %x, time is %X" },
- { CompareTime, "Time is %H:%M:%S or %I:%M:%S %p" },
- { CompareNone, "The day of year: %j, the week of year: %W" },
- { CompareDate, "ISO date without separators: %4Y%2m%2d" },
+ { CompareBoth, _T("---> %c") },
+ { CompareDate, _T("Date is %A, %d of %B, in year %Y") },
+ { CompareBoth, _T("Date is %x, time is %X") },
+ { CompareTime, _T("Time is %H:%M:%S or %I:%M:%S %p") },
+ { CompareNone, _T("The day of year: %j, the week of year: %W") },
+ { CompareDate, _T("ISO date without separators: %Y%m%d") },
};
static const Date formatTestDates[] =
};
// an extra test (as it doesn't depend on date, don't do it in the loop)
- printf("%s\n", wxDateTime::Now().Format("Our timezone is %Z").c_str());
+ wxPrintf(_T("%s\n"), wxDateTime::Now().Format(_T("Our timezone is %Z")).c_str());
for ( size_t d = 0; d < WXSIZEOF(formatTestDates) + 1; d++ )
{
- puts("");
+ wxPuts(_T(""));
wxDateTime dt = d == 0 ? wxDateTime::Now() : formatTestDates[d - 1].DT();
for ( size_t n = 0; n < WXSIZEOF(formatTestFormats); n++ )
{
wxString s = dt.Format(formatTestFormats[n].format);
- printf("%s", s.c_str());
+ wxPrintf(_T("%s"), s.c_str());
// what can we recover?
int kind = formatTestFormats[n].compareKind;
{
// converion failed - should it have?
if ( kind == CompareNone )
- puts(" (ok)");
+ wxPuts(_T(" (ok)"));
else
- puts(" (ERROR: conversion back failed)");
+ wxPuts(_T(" (ERROR: conversion back failed)"));
}
else if ( *result )
{
// should have parsed the entire string
- puts(" (ERROR: conversion back stopped too soon)");
+ wxPuts(_T(" (ERROR: conversion back stopped too soon)"));
}
else
{
- bool equal = FALSE; // suppress compilaer warning
+ bool equal = false; // suppress compilaer warning
switch ( kind )
{
case CompareBoth:
if ( !equal )
{
- printf(" (ERROR: got back '%s' instead of '%s')\n",
+ wxPrintf(_T(" (ERROR: got back '%s' instead of '%s')\n"),
dt2.Format().c_str(), dt.Format().c_str());
}
else
{
- puts(" (ok)");
+ wxPuts(_T(" (ok)"));
}
}
}
// test text -> wxDateTime conversion
static void TestTimeParse()
{
- puts("\n*** wxDateTime parse test ***");
+ wxPuts(_T("\n*** wxDateTime parse test ***"));
struct ParseTestData
{
- const char *format;
+ const wxChar *format;
Date date;
bool good;
};
static const ParseTestData parseTestDates[] =
{
- { "Sat, 18 Dec 1999 00:46:40 +0100", { 18, wxDateTime::Dec, 1999, 00, 46, 40 }, TRUE },
- { "Wed, 1 Dec 1999 05:17:20 +0300", { 1, wxDateTime::Dec, 1999, 03, 17, 20 }, TRUE },
+ { _T("Sat, 18 Dec 1999 00:46:40 +0100"), { 18, wxDateTime::Dec, 1999, 00, 46, 40 }, true },
+ { _T("Wed, 1 Dec 1999 05:17:20 +0300"), { 1, wxDateTime::Dec, 1999, 03, 17, 20 }, true },
};
for ( size_t n = 0; n < WXSIZEOF(parseTestDates); n++ )
{
- const char *format = parseTestDates[n].format;
+ const wxChar *format = parseTestDates[n].format;
- printf("%s => ", format);
+ wxPrintf(_T("%s => "), format);
wxDateTime dt;
if ( dt.ParseRfc822Date(format) )
{
- printf("%s ", dt.Format().c_str());
+ wxPrintf(_T("%s "), dt.Format().c_str());
if ( parseTestDates[n].good )
{
wxDateTime dtReal = parseTestDates[n].date.DT();
if ( dt == dtReal )
{
- puts("(ok)");
+ wxPuts(_T("(ok)"));
}
else
{
- printf("(ERROR: should be %s)\n", dtReal.Format().c_str());
+ wxPrintf(_T("(ERROR: should be %s)\n"), dtReal.Format().c_str());
}
}
else
{
- puts("(ERROR: bad format)");
+ wxPuts(_T("(ERROR: bad format)"));
}
}
else
{
- printf("bad format (%s)\n",
+ wxPrintf(_T("bad format (%s)\n"),
parseTestDates[n].good ? "ERROR" : "ok");
}
}
static void TestDateTimeInteractive()
{
- puts("\n*** interactive wxDateTime tests ***");
+ wxPuts(_T("\n*** interactive wxDateTime tests ***"));
- char buf[128];
+ wxChar buf[128];
for ( ;; )
{
- printf("Enter a date: ");
- if ( !fgets(buf, WXSIZEOF(buf), stdin) )
+ wxPrintf(_T("Enter a date: "));
+ if ( !wxFgets(buf, WXSIZEOF(buf), stdin) )
break;
// kill the last '\n'
- buf[strlen(buf) - 1] = 0;
+ buf[wxStrlen(buf) - 1] = 0;
wxDateTime dt;
- const char *p = dt.ParseDate(buf);
+ const wxChar *p = dt.ParseDate(buf);
if ( !p )
{
- printf("ERROR: failed to parse the date '%s'.\n", buf);
+ wxPrintf(_T("ERROR: failed to parse the date '%s'.\n"), buf);
continue;
}
else if ( *p )
{
- printf("WARNING: parsed only first %u characters.\n", p - buf);
+ wxPrintf(_T("WARNING: parsed only first %u characters.\n"), p - buf);
}
- printf("%s: day %u, week of month %u/%u, week of year %u\n",
- dt.Format("%b %d, %Y").c_str(),
- dt.GetDayOfYear(),
- dt.GetWeekOfMonth(wxDateTime::Monday_First),
- dt.GetWeekOfMonth(wxDateTime::Sunday_First),
- dt.GetWeekOfYear(wxDateTime::Monday_First));
+ wxPrintf(_T("%s: day %u, week of month %u/%u, week of year %u\n"),
+ dt.Format(_T("%b %d, %Y")).c_str(),
+ dt.GetDayOfYear(),
+ dt.GetWeekOfMonth(wxDateTime::Monday_First),
+ dt.GetWeekOfMonth(wxDateTime::Sunday_First),
+ dt.GetWeekOfYear(wxDateTime::Monday_First));
}
- puts("\n*** done ***");
+ wxPuts(_T("\n*** done ***"));
}
static void TestTimeMS()
{
- puts("*** testing millisecond-resolution support in wxDateTime ***");
+ wxPuts(_T("*** testing millisecond-resolution support in wxDateTime ***"));
wxDateTime dt1 = wxDateTime::Now(),
dt2 = wxDateTime::UNow();
- printf("Now = %s\n", dt1.Format("%H:%M:%S:%l").c_str());
- printf("UNow = %s\n", dt2.Format("%H:%M:%S:%l").c_str());
- printf("Dummy loop: ");
+ wxPrintf(_T("Now = %s\n"), dt1.Format(_T("%H:%M:%S:%l")).c_str());
+ wxPrintf(_T("UNow = %s\n"), dt2.Format(_T("%H:%M:%S:%l")).c_str());
+ wxPrintf(_T("Dummy loop: "));
for ( int i = 0; i < 6000; i++ )
{
//for ( int j = 0; j < 10; j++ )
{
wxString s;
- s.Printf("%g", sqrt(i));
+ s.Printf(_T("%g"), sqrt(i));
}
if ( !(i % 100) )
putchar('.');
}
- puts(", done");
+ wxPuts(_T(", done"));
dt1 = dt2;
dt2 = wxDateTime::UNow();
- printf("UNow = %s\n", dt2.Format("%H:%M:%S:%l").c_str());
+ wxPrintf(_T("UNow = %s\n"), dt2.Format(_T("%H:%M:%S:%l")).c_str());
- printf("Loop executed in %s ms\n", (dt2 - dt1).Format("%l").c_str());
+ wxPrintf(_T("Loop executed in %s ms\n"), (dt2 - dt1).Format(_T("%l")).c_str());
- puts("\n*** done ***");
+ wxPuts(_T("\n*** done ***"));
}
static void TestTimeArithmetics()
{
- puts("\n*** testing arithmetic operations on wxDateTime ***");
+ wxPuts(_T("\n*** testing arithmetic operations on wxDateTime ***"));
static const struct ArithmData
{
- ArithmData(const wxDateSpan& sp, const char *nam)
+ ArithmData(const wxDateSpan& sp, const wxChar *nam)
: span(sp), name(nam) { }
wxDateSpan span;
- const char *name;
+ const wxChar *name;
} testArithmData[] =
{
- ArithmData(wxDateSpan::Day(), "day"),
- ArithmData(wxDateSpan::Week(), "week"),
- ArithmData(wxDateSpan::Month(), "month"),
- ArithmData(wxDateSpan::Year(), "year"),
- ArithmData(wxDateSpan(1, 2, 3, 4), "year, 2 months, 3 weeks, 4 days"),
+ ArithmData(wxDateSpan::Day(), _T("day")),
+ ArithmData(wxDateSpan::Week(), _T("week")),
+ ArithmData(wxDateSpan::Month(), _T("month")),
+ ArithmData(wxDateSpan::Year(), _T("year")),
+ ArithmData(wxDateSpan(1, 2, 3, 4), _T("year, 2 months, 3 weeks, 4 days")),
};
wxDateTime dt(29, wxDateTime::Dec, 1999), dt1, dt2;
dt1 = dt + span;
dt2 = dt - span;
- const char *name = testArithmData[n].name;
- printf("%s + %s = %s, %s - %s = %s\n",
+ const wxChar *name = testArithmData[n].name;
+ wxPrintf(_T("%s + %s = %s, %s - %s = %s\n"),
dt.FormatISODate().c_str(), name, dt1.FormatISODate().c_str(),
dt.FormatISODate().c_str(), name, dt2.FormatISODate().c_str());
- printf("Going back: %s", (dt1 - span).FormatISODate().c_str());
+ wxPrintf(_T("Going back: %s"), (dt1 - span).FormatISODate().c_str());
if ( dt1 - span == dt )
{
- puts(" (ok)");
+ wxPuts(_T(" (ok)"));
}
else
{
- printf(" (ERROR: should be %s)\n", dt.FormatISODate().c_str());
+ wxPrintf(_T(" (ERROR: should be %s)\n"), dt.FormatISODate().c_str());
}
- printf("Going forward: %s", (dt2 + span).FormatISODate().c_str());
+ wxPrintf(_T("Going forward: %s"), (dt2 + span).FormatISODate().c_str());
if ( dt2 + span == dt )
{
- puts(" (ok)");
+ wxPuts(_T(" (ok)"));
}
else
{
- printf(" (ERROR: should be %s)\n", dt.FormatISODate().c_str());
+ wxPrintf(_T(" (ERROR: should be %s)\n"), dt.FormatISODate().c_str());
}
- printf("Double increment: %s", (dt2 + 2*span).FormatISODate().c_str());
+ wxPrintf(_T("Double increment: %s"), (dt2 + 2*span).FormatISODate().c_str());
if ( dt2 + 2*span == dt1 )
{
- puts(" (ok)");
+ wxPuts(_T(" (ok)"));
}
else
{
- printf(" (ERROR: should be %s)\n", dt2.FormatISODate().c_str());
+ wxPrintf(_T(" (ERROR: should be %s)\n"), dt2.FormatISODate().c_str());
}
- puts("");
+ wxPuts(_T(""));
}
}
static void TestTimeHolidays()
{
- puts("\n*** testing wxDateTimeHolidayAuthority ***\n");
+ wxPuts(_T("\n*** testing wxDateTimeHolidayAuthority ***\n"));
wxDateTime::Tm tm = wxDateTime(29, wxDateTime::May, 2000).GetTm();
wxDateTime dtStart(1, tm.mon, tm.year),
wxDateTimeArray hol;
wxDateTimeHolidayAuthority::GetHolidaysInRange(dtStart, dtEnd, hol);
- const wxChar *format = "%d-%b-%Y (%a)";
+ const wxChar *format = _T("%d-%b-%Y (%a)");
- printf("All holidays between %s and %s:\n",
+ wxPrintf(_T("All holidays between %s and %s:\n"),
dtStart.Format(format).c_str(), dtEnd.Format(format).c_str());
size_t count = hol.GetCount();
for ( size_t n = 0; n < count; n++ )
{
- printf("\t%s\n", hol[n].Format(format).c_str());
+ wxPrintf(_T("\t%s\n"), hol[n].Format(format).c_str());
}
- puts("");
+ wxPuts(_T(""));
}
static void TestTimeZoneBug()
{
- puts("\n*** testing for DST/timezone bug ***\n");
+ wxPuts(_T("\n*** testing for DST/timezone bug ***\n"));
wxDateTime date = wxDateTime(1, wxDateTime::Mar, 2000);
for ( int i = 0; i < 31; i++ )
{
- printf("Date %s: week day %s.\n",
+ wxPrintf(_T("Date %s: week day %s.\n"),
date.Format(_T("%d-%m-%Y")).c_str(),
date.GetWeekDayName(date.GetWeekDay()).c_str());
date += wxDateSpan::Day();
}
- puts("");
+ wxPuts(_T(""));
}
static void TestTimeSpanFormat()
{
- puts("\n*** wxTimeSpan tests ***");
+ wxPuts(_T("\n*** wxTimeSpan tests ***"));
- static const char *formats[] =
+ static const wxChar *formats[] =
{
_T("(default) %H:%M:%S"),
_T("%E weeks and %D days"),
ts2(111, 222, 333);
for ( size_t n = 0; n < WXSIZEOF(formats); n++ )
{
- printf("ts1 = %s\tts2 = %s\n",
+ wxPrintf(_T("ts1 = %s\tts2 = %s\n"),
ts1.Format(formats[n]).c_str(),
ts2.Format(formats[n]).c_str());
}
- puts("");
+ wxPuts(_T(""));
}
-#if 0
+#endif // TEST_DATETIME
-// test compatibility with the old wxDate/wxTime classes
-static void TestTimeCompatibility()
-{
- puts("\n*** wxDateTime compatibility test ***");
+// ----------------------------------------------------------------------------
+// wxTextInput/OutputStream
+// ----------------------------------------------------------------------------
- printf("wxDate for JDN 0: %s\n", wxDate(0l).FormatDate().c_str());
- printf("wxDate for MJD 0: %s\n", wxDate(2400000).FormatDate().c_str());
+#ifdef TEST_TEXTSTREAM
- double jdnNow = wxDateTime::Now().GetJDN();
- long jdnMidnight = (long)(jdnNow - 0.5);
- printf("wxDate for today: %s\n", wxDate(jdnMidnight).FormatDate().c_str());
+#include "wx/txtstrm.h"
+#include "wx/wfstream.h"
- jdnMidnight = wxDate().Set().GetJulianDate();
- printf("wxDateTime for today: %s\n",
- wxDateTime((double)(jdnMidnight + 0.5)).Format("%c", wxDateTime::GMT0).c_str());
+static void TestTextInputStream()
+{
+ wxPuts(_T("\n*** wxTextInputStream test ***"));
- int flags = wxEUROPEAN;//wxFULL;
- wxDate date;
- date.Set();
- printf("Today is %s\n", date.FormatDate(flags).c_str());
- for ( int n = 0; n < 7; n++ )
+ wxFileInputStream fsIn(_T("testdata.fc"));
+ if ( !fsIn.Ok() )
{
- printf("Previous %s is %s\n",
- wxDateTime::GetWeekDayName((wxDateTime::WeekDay)n),
- date.Previous(n + 1).FormatDate(flags).c_str());
+ wxPuts(_T("ERROR: couldn't open file."));
}
-}
+ else
+ {
+ wxTextInputStream tis(fsIn);
-#endif // 0
+ size_t line = 1;
+ for ( ;; )
+ {
+ const wxString s = tis.ReadLine();
-#endif // TEST_DATETIME
+ // line could be non empty if the last line of the file isn't
+ // terminated with EOL
+ if ( fsIn.Eof() && s.empty() )
+ break;
+
+ wxPrintf(_T("Line %d: %s\n"), line++, s.c_str());
+ }
+ }
+}
+
+#endif // TEST_TEXTSTREAM
// ----------------------------------------------------------------------------
// threads
class MyDetachedThread : public wxThread
{
public:
- MyDetachedThread(size_t n, char ch)
+ MyDetachedThread(size_t n, wxChar ch)
{
m_n = n;
m_ch = ch;
- m_cancelled = FALSE;
+ m_cancelled = false;
Create();
}
private:
size_t m_n; // number of characters to write
- char m_ch; // character to write
+ wxChar m_ch; // character to write
- bool m_cancelled; // FALSE if we exit normally
+ bool m_cancelled; // false if we exit normally
};
wxThread::ExitCode MyDetachedThread::Entry()
{
if ( TestDestroy() )
{
- m_cancelled = TRUE;
+ m_cancelled = true;
break;
}
void MyDetachedThread::OnExit()
{
- wxLogTrace("thread", "Thread %ld is in OnExit", GetId());
+ wxLogTrace(_T("thread"), _T("Thread %ld is in OnExit"), GetId());
wxCriticalSectionLocker lock(gs_critsect);
if ( !--gs_counter && !m_cancelled )
static void TestDetachedThreads()
{
- puts("\n*** Testing detached threads ***");
+ wxPuts(_T("\n*** Testing detached threads ***"));
static const size_t nThreads = 3;
MyDetachedThread *threads[nThreads];
// wait until all threads terminate
gs_cond.Wait();
- puts("");
+ wxPuts(_T(""));
}
static void TestJoinableThreads()
{
- puts("\n*** Testing a joinable thread (a loooong calculation...) ***");
+ wxPuts(_T("\n*** Testing a joinable thread (a loooong calculation...) ***"));
// calc 10! in the background
MyJoinableThread thread(10);
thread.Run();
- printf("\nThread terminated with exit code %lu.\n",
+ wxPrintf(_T("\nThread terminated with exit code %lu.\n"),
(unsigned long)thread.Wait());
}
static void TestThreadSuspend()
{
- puts("\n*** Testing thread suspend/resume functions ***");
+ wxPuts(_T("\n*** Testing thread suspend/resume functions ***"));
MyDetachedThread *thread = new MyDetachedThread(15, 'X');
{
thread->Pause();
- puts("\nThread suspended");
+ wxPuts(_T("\nThread suspended"));
if ( n > 0 )
{
// don't sleep but resume immediately the first time
wxThread::Sleep(300);
}
- puts("Going to resume the thread");
+ wxPuts(_T("Going to resume the thread"));
thread->Resume();
}
- puts("Waiting until it terminates now");
+ wxPuts(_T("Waiting until it terminates now"));
// wait until the thread terminates
gs_cond.Wait();
- puts("");
+ wxPuts(_T(""));
}
static void TestThreadDelete()
// running when we delete it - deleting a detached thread which already
// terminated will lead to a crash!
- puts("\n*** Testing thread delete function ***");
+ wxPuts(_T("\n*** Testing thread delete function ***"));
MyDetachedThread *thread0 = new MyDetachedThread(30, 'W');
thread0->Delete();
- puts("\nDeleted a thread which didn't start to run yet.");
+ wxPuts(_T("\nDeleted a thread which didn't start to run yet."));
MyDetachedThread *thread1 = new MyDetachedThread(30, 'Y');
thread1->Delete();
- puts("\nDeleted a running thread.");
+ wxPuts(_T("\nDeleted a running thread."));
MyDetachedThread *thread2 = new MyDetachedThread(30, 'Z');
thread2->Delete();
- puts("\nDeleted a sleeping thread.");
+ wxPuts(_T("\nDeleted a sleeping thread."));
MyJoinableThread thread3(20);
thread3.Run();
thread3.Delete();
- puts("\nDeleted a joinable thread.");
+ wxPuts(_T("\nDeleted a joinable thread."));
MyJoinableThread thread4(2);
thread4.Run();
thread4.Delete();
- puts("\nDeleted a joinable thread which already terminated.");
+ wxPuts(_T("\nDeleted a joinable thread which already terminated."));
- puts("");
+ wxPuts(_T(""));
}
class MyWaitingThread : public wxThread
virtual ExitCode Entry()
{
- printf("Thread %lu has started running.\n", GetId());
+ wxPrintf(_T("Thread %lu has started running.\n"), GetId());
fflush(stdout);
gs_cond.Post();
- printf("Thread %lu starts to wait...\n", GetId());
+ wxPrintf(_T("Thread %lu starts to wait...\n"), GetId());
fflush(stdout);
m_mutex->Lock();
m_condition->Wait();
m_mutex->Unlock();
- printf("Thread %lu finished to wait, exiting.\n", GetId());
+ wxPrintf(_T("Thread %lu finished to wait, exiting.\n"), GetId());
fflush(stdout);
return 0;
// otherwise its difficult to understand which log messages pertain to
// which condition
- //wxLogTrace("thread", "Local condition var is %08x, gs_cond = %08x",
+ //wxLogTrace(_T("thread"), _T("Local condition var is %08x, gs_cond = %08x"),
// condition.GetId(), gs_cond.GetId());
// create and launch threads
}
// wait until all threads run
- puts("Main thread is waiting for the other threads to start");
+ wxPuts(_T("Main thread is waiting for the other threads to start"));
fflush(stdout);
size_t nRunning = 0;
nRunning++;
- printf("Main thread: %u already running\n", nRunning);
+ wxPrintf(_T("Main thread: %u already running\n"), nRunning);
fflush(stdout);
}
- puts("Main thread: all threads started up.");
+ wxPuts(_T("Main thread: all threads started up."));
fflush(stdout);
wxThread::Sleep(500);
#if 1
// now wake one of them up
- printf("Main thread: about to signal the condition.\n");
+ wxPrintf(_T("Main thread: about to signal the condition.\n"));
fflush(stdout);
condition.Signal();
#endif
wxThread::Sleep(200);
// wake all the (remaining) threads up, so that they can exit
- printf("Main thread: about to broadcast the condition.\n");
+ wxPrintf(_T("Main thread: about to broadcast the condition.\n"));
fflush(stdout);
condition.Broadcast();
virtual ExitCode Entry()
{
- wxPrintf(_T("%s: Thread %d starting to wait for semaphore...\n"),
- wxDateTime::Now().FormatTime().c_str(), m_i);
+ wxPrintf(_T("%s: Thread #%d (%ld) starting to wait for semaphore...\n"),
+ wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());
m_sem->Wait();
- wxPrintf(_T("%s: Thread %d acquired the semaphore.\n"),
- wxDateTime::Now().FormatTime().c_str(), m_i);
+ wxPrintf(_T("%s: Thread #%d (%ld) acquired the semaphore.\n"),
+ wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());
Sleep(1000);
- wxPrintf(_T("%s: Thread %d releasing the semaphore.\n"),
- wxDateTime::Now().FormatTime().c_str(), m_i);
+ wxPrintf(_T("%s: Thread #%d (%ld) releasing the semaphore.\n"),
+ wxDateTime::Now().FormatTime().c_str(), m_i, (long)GetId());
m_sem->Post();
#include "wx/arrimpl.cpp"
WX_DEFINE_OBJARRAY(ArrayBars);
-static void PrintArray(const char* name, const wxArrayString& array)
+static void PrintArray(const wxChar* name, const wxArrayString& array)
+{
+ wxPrintf(_T("Dump of the array '%s'\n"), name);
+
+ size_t nCount = array.GetCount();
+ for ( size_t n = 0; n < nCount; n++ )
+ {
+ wxPrintf(_T("\t%s[%u] = '%s'\n"), name, n, array[n].c_str());
+ }
+}
+
+static void PrintArray(const wxChar* name, const wxSortedArrayString& array)
{
- printf("Dump of the array '%s'\n", name);
+ wxPrintf(_T("Dump of the array '%s'\n"), name);
size_t nCount = array.GetCount();
for ( size_t n = 0; n < nCount; n++ )
{
- printf("\t%s[%u] = '%s'\n", name, n, array[n].c_str());
+ wxPrintf(_T("\t%s[%u] = '%s'\n"), name, n, array[n].c_str());
}
}
#define TestArrayOf(name) \
\
-static void PrintArray(const char* name, const wxSortedArray##name & array) \
+static void PrintArray(const wxChar* name, const wxSortedArray##name & array) \
{ \
- printf("Dump of the array '%s'\n", name); \
+ wxPrintf(_T("Dump of the array '%s'\n"), name); \
\
size_t nCount = array.GetCount(); \
for ( size_t n = 0; n < nCount; n++ ) \
{ \
- printf("\t%s[%u] = %d\n", name, n, array[n]); \
+ wxPrintf(_T("\t%s[%u] = %d\n"), name, n, array[n]); \
} \
} \
\
-static void PrintArray(const char* name, const wxArray##name & array) \
+static void PrintArray(const wxChar* name, const wxArray##name & array) \
{ \
- printf("Dump of the array '%s'\n", name); \
+ wxPrintf(_T("Dump of the array '%s'\n"), name); \
\
size_t nCount = array.GetCount(); \
for ( size_t n = 0; n < nCount; n++ ) \
{ \
- printf("\t%s[%u] = %d\n", name, n, array[n]); \
+ wxPrintf(_T("\t%s[%u] = %d\n"), name, n, array[n]); \
} \
} \
\
static void TestArrayOf ## name ## s() \
{ \
- printf("*** Testing wxArray%s ***\n", #name); \
+ wxPrintf(_T("*** Testing wxArray%s ***\n"), #name); \
\
wxArray##name a; \
a.Add(1); \
- a.Add(17); \
- a.Add(5); \
- a.Add(3); \
+ a.Add(17,2); \
+ a.Add(5,3); \
+ a.Add(3,4); \
\
- puts("Initially:"); \
- PrintArray("a", a); \
+ wxPuts(_T("Initially:")); \
+ PrintArray(_T("a"), a); \
\
- puts("After sort:"); \
+ wxPuts(_T("After sort:")); \
a.Sort(name ## Compare); \
- PrintArray("a", a); \
+ PrintArray(_T("a"), a); \
\
- puts("After reverse sort:"); \
+ wxPuts(_T("After reverse sort:")); \
a.Sort(name ## RevCompare); \
- PrintArray("a", a); \
+ PrintArray(_T("a"), a); \
\
wxSortedArray##name b; \
b.Add(1); \
b.Add(5); \
b.Add(3); \
\
- puts("Sorted array initially:"); \
- PrintArray("b", b); \
+ wxPuts(_T("Sorted array initially:")); \
+ PrintArray(_T("b"), b); \
}
TestArrayOf(UShort);
TestArrayOf(Int);
+static void TestStlArray()
+{
+ wxPuts(_T("*** Testing std::vector operations ***\n"));
+
+ {
+ wxArrayInt list1;
+ wxArrayInt::iterator it, en;
+ wxArrayInt::reverse_iterator rit, ren;
+ int i;
+ for ( i = 0; i < 5; ++i )
+ list1.push_back(i);
+
+ for ( it = list1.begin(), en = list1.end(), i = 0;
+ it != en; ++it, ++i )
+ if ( *it != i )
+ wxPuts(_T("Error in iterator\n"));
+
+ for ( rit = list1.rbegin(), ren = list1.rend(), i = 4;
+ rit != ren; ++rit, --i )
+ if ( *rit != i )
+ wxPuts(_T("Error in reverse_iterator\n"));
+
+ if ( *list1.rbegin() != *(list1.end()-1) ||
+ *list1.begin() != *(list1.rend()-1) )
+ wxPuts(_T("Error in iterator/reverse_iterator\n"));
+
+ it = list1.begin()+1;
+ rit = list1.rbegin()+1;
+ if ( *list1.begin() != *(it-1) ||
+ *list1.rbegin() != *(rit-1) )
+ wxPuts(_T("Error in iterator/reverse_iterator\n"));
+
+ if ( list1.front() != 0 || list1.back() != 4 )
+ wxPuts(_T("Error in front()/back()\n"));
+
+ list1.erase(list1.begin());
+ list1.erase(list1.end()-1);
+
+ for ( it = list1.begin(), en = list1.end(), i = 1;
+ it != en; ++it, ++i )
+ if ( *it != i )
+ wxPuts(_T("Error in erase()\n"));
+ }
+
+ wxPuts(_T("*** Testing std::vector operations finished ***\n"));
+}
+
static void TestArrayOfObjects()
{
- puts("*** Testing wxObjArray ***\n");
+ wxPuts(_T("*** Testing wxObjArray ***\n"));
{
ArrayBars bars;
- Bar bar("second bar");
+ Bar bar("second bar (two copies!)");
- printf("Initially: %u objects in the array, %u objects total.\n",
+ wxPrintf(_T("Initially: %u objects in the array, %u objects total.\n"),
bars.GetCount(), Bar::GetNumber());
bars.Add(new Bar("first bar"));
- bars.Add(bar);
+ bars.Add(bar,2);
- printf("Now: %u objects in the array, %u objects total.\n",
+ wxPrintf(_T("Now: %u objects in the array, %u objects total.\n"),
+ bars.GetCount(), Bar::GetNumber());
+
+ bars.RemoveAt(1, bars.GetCount() - 1);
+
+ wxPrintf(_T("After removing all but first element: %u objects in the ")
+ _T("array, %u objects total.\n"),
bars.GetCount(), Bar::GetNumber());
bars.Empty();
- printf("After Empty(): %u objects in the array, %u objects total.\n",
+ wxPrintf(_T("After Empty(): %u objects in the array, %u objects total.\n"),
bars.GetCount(), Bar::GetNumber());
}
- printf("Finally: no more objects in the array, %u objects total.\n",
+ wxPrintf(_T("Finally: no more objects in the array, %u objects total.\n"),
Bar::GetNumber());
}
static void TestStringConstruction()
{
- puts("*** Testing wxString constructores ***");
+ wxPuts(_T("*** Testing wxString constructores ***"));
#define TEST_CTOR(args, res) \
{ \
wxString s args ; \
- printf("wxString%s = %s ", #args, s.c_str()); \
+ wxPrintf(_T("wxString%s = %s "), #args, s.c_str()); \
if ( s == res ) \
{ \
- puts("(ok)"); \
+ wxPuts(_T("(ok)")); \
} \
else \
{ \
- printf("(ERROR: should be %s)\n", res); \
+ wxPrintf(_T("(ERROR: should be %s)\n"), res); \
} \
}
const wxChar *end = wxStrchr(s, _T('!'));
TEST_CTOR((start, end), _T("really"));
- puts("");
+ wxPuts(_T(""));
}
static void TestString()
for (int i = 0; i < 1000000; ++i)
{
- a = "Hello";
- b = " world";
- c = "! How'ya doin'?";
+ a = _T("Hello");
+ b = _T(" world");
+ c = _T("! How'ya doin'?");
a += b;
a += c;
- c = "Hello world! What's up?";
+ c = _T("Hello world! What's up?");
if (c != a)
- c = "Doh!";
+ c = _T("Doh!");
}
- printf ("TestString elapsed time: %ld\n", sw.Time());
+ wxPrintf(_T("TestString elapsed time: %ld\n"), sw.Time());
}
static void TestPChar()
{
wxStopWatch sw;
- char a [128];
- char b [128];
- char c [128];
+ wxChar a [128];
+ wxChar b [128];
+ wxChar c [128];
for (int i = 0; i < 1000000; ++i)
{
- strcpy (a, "Hello");
- strcpy (b, " world");
- strcpy (c, "! How'ya doin'?");
- strcat (a, b);
- strcat (a, c);
- strcpy (c, "Hello world! What's up?");
- if (strcmp (c, a) == 0)
- strcpy (c, "Doh!");
+ wxStrcpy (a, _T("Hello"));
+ wxStrcpy (b, _T(" world"));
+ wxStrcpy (c, _T("! How'ya doin'?"));
+ wxStrcat (a, b);
+ wxStrcat (a, c);
+ wxStrcpy (c, _T("Hello world! What's up?"));
+ if (wxStrcmp (c, a) == 0)
+ wxStrcpy (c, _T("Doh!"));
}
- printf ("TestPChar elapsed time: %ld\n", sw.Time());
+ wxPrintf(_T("TestPChar elapsed time: %ld\n"), sw.Time());
}
static void TestStringSub()
{
- wxString s("Hello, world!");
+ wxString s(_T("Hello, world!"));
- puts("*** Testing wxString substring extraction ***");
+ wxPuts(_T("*** Testing wxString substring extraction ***"));
- printf("String = '%s'\n", s.c_str());
- printf("Left(5) = '%s'\n", s.Left(5).c_str());
- printf("Right(6) = '%s'\n", s.Right(6).c_str());
- printf("Mid(3, 5) = '%s'\n", s(3, 5).c_str());
- printf("Mid(3) = '%s'\n", s.Mid(3).c_str());
- printf("substr(3, 5) = '%s'\n", s.substr(3, 5).c_str());
- printf("substr(3) = '%s'\n", s.substr(3).c_str());
+ wxPrintf(_T("String = '%s'\n"), s.c_str());
+ wxPrintf(_T("Left(5) = '%s'\n"), s.Left(5).c_str());
+ wxPrintf(_T("Right(6) = '%s'\n"), s.Right(6).c_str());
+ wxPrintf(_T("Mid(3, 5) = '%s'\n"), s(3, 5).c_str());
+ wxPrintf(_T("Mid(3) = '%s'\n"), s.Mid(3).c_str());
+ wxPrintf(_T("substr(3, 5) = '%s'\n"), s.substr(3, 5).c_str());
+ wxPrintf(_T("substr(3) = '%s'\n"), s.substr(3).c_str());
static const wxChar *prefixes[] =
{
{
wxString prefix = prefixes[n], rest;
bool rc = s.StartsWith(prefix, &rest);
- printf("StartsWith('%s') = %s", prefix.c_str(), rc ? "TRUE" : "FALSE");
+ wxPrintf(_T("StartsWith('%s') = %s"), prefix.c_str(), rc ? _T("true") : _T("false"));
if ( rc )
{
- printf(" (the rest is '%s')\n", rest.c_str());
+ wxPrintf(_T(" (the rest is '%s')\n"), rest.c_str());
}
else
{
}
}
- puts("");
+ wxPuts(_T(""));
}
static void TestStringFormat()
{
- puts("*** Testing wxString formatting ***");
+ wxPuts(_T("*** Testing wxString formatting ***"));
wxString s;
- s.Printf("%03d", 18);
+ s.Printf(_T("%03d"), 18);
- printf("Number 18: %s\n", wxString::Format("%03d", 18).c_str());
- printf("Number 18: %s\n", s.c_str());
+ wxPrintf(_T("Number 18: %s\n"), wxString::Format(_T("%03d"), 18).c_str());
+ wxPrintf(_T("Number 18: %s\n"), s.c_str());
- puts("");
+ wxPuts(_T(""));
}
// returns "not found" for npos, value for all others
static void TestStringFind()
{
- puts("*** Testing wxString find() functions ***");
+ wxPuts(_T("*** Testing wxString find() functions ***"));
static const wxChar *strToFind = _T("ell");
static const struct StringFindTest
const StringFindTest& ft = findTestData[n];
size_t res = wxString(ft.str).find(strToFind, ft.start);
- printf(_T("Index of '%s' in '%s' starting from %u is %s "),
+ wxPrintf(_T("Index of '%s' in '%s' starting from %u is %s "),
strToFind, ft.str, ft.start, PosToString(res).c_str());
size_t resTrue = ft.result;
if ( res == resTrue )
{
- puts(_T("(ok)"));
+ wxPuts(_T("(ok)"));
}
else
{
- printf(_T("(ERROR: should be %s)\n"),
+ wxPrintf(_T("(ERROR: should be %s)\n"),
PosToString(resTrue).c_str());
}
}
- puts("");
+ wxPuts(_T(""));
}
static void TestStringTokenizer()
{
- puts("*** Testing wxStringTokenizer ***");
+ wxPuts(_T("*** Testing wxStringTokenizer ***"));
static const wxChar *modeNames[] =
{
wxStringTokenizer tkz(tt.str, tt.delims, tt.mode);
size_t count = tkz.CountTokens();
- printf(_T("String '%s' has %u tokens delimited by '%s' (mode = %s) "),
+ wxPrintf(_T("String '%s' has %u tokens delimited by '%s' (mode = %s) "),
MakePrintable(tt.str).c_str(),
count,
MakePrintable(tt.delims).c_str(),
modeNames[tkz.GetMode()]);
if ( count == tt.count )
{
- puts(_T("(ok)"));
+ wxPuts(_T("(ok)"));
}
else
{
- printf(_T("(ERROR: should be %u)\n"), tt.count);
+ wxPrintf(_T("(ERROR: should be %u)\n"), tt.count);
continue;
}
{
wxString token = tkz.GetNextToken();
- printf(_T("\ttoken %u: '%s'"),
+ wxPrintf(_T("\ttoken %u: '%s'"),
++count2,
MakePrintable(token).c_str());
{
if ( token == s )
{
- puts(" (ok)");
+ wxPuts(_T(" (ok)"));
}
else
{
- printf(" (ERROR: should be %s)\n", s);
+ wxPrintf(_T(" (ERROR: should be %s)\n"), s);
}
s = wxStrtok(NULL, tt.delims, &last);
else
{
// nothing to compare with
- puts("");
+ wxPuts(_T(""));
}
}
if ( count2 != count )
{
- puts(_T("\tERROR: token count mismatch"));
+ wxPuts(_T("\tERROR: token count mismatch"));
}
delete [] buf;
}
- puts("");
+ wxPuts(_T(""));
}
static void TestStringReplace()
{
- puts("*** Testing wxString::replace ***");
+ wxPuts(_T("*** Testing wxString::replace ***"));
static const struct StringReplaceTestData
{
if ( original == data.result )
{
- puts("(ok)");
+ wxPuts(_T("(ok)"));
}
else
{
}
}
- puts("");
+ wxPuts(_T(""));
}
static void TestStringMatch()
wxPuts(_T(""));
}
+// Sigh, I want Test::Simple, Test::More and Test::Harness...
+void ok(int line, bool ok, const wxString& msg = wxEmptyString)
+{
+ if( !ok )
+ wxPuts(_T("NOT OK: (") + wxString::Format(_T("%d"), line) +
+ _T(") ") + msg);
+}
+
+void is(int line, const wxString& got, const wxString& expected,
+ const wxString& msg = wxEmptyString)
+{
+ bool isOk = got == expected;
+ ok(line, isOk, msg);
+ if( !isOk )
+ {
+ wxPuts(_T("Got: ") + got);
+ wxPuts(_T("Expected: ") + expected);
+ }
+}
+
+void is(int line, const wxChar& got, const wxChar& expected,
+ const wxString& msg = wxEmptyString)
+{
+ bool isOk = got == expected;
+ ok(line, isOk, msg);
+ if( !isOk )
+ {
+ wxPuts("Got: " + got);
+ wxPuts("Expected: " + expected);
+ }
+}
+
+void TestStdString()
+{
+ wxPuts(_T("*** Testing std::string operations ***\n"));
+
+ // test ctors
+ wxString s1(_T("abcdefgh")),
+ s2(_T("abcdefghijklm"), 8),
+ s3(_T("abcdefghijklm")),
+ s4(8, _T('a'));
+ wxString s5(s1),
+ s6(s3, 0, 8),
+ s7(s3.begin(), s3.begin() + 8);
+ wxString s8(s1, 4, 8), s9, s10, s11;
+
+ is( __LINE__, s1, _T("abcdefgh") );
+ is( __LINE__, s2, s1 );
+ is( __LINE__, s4, _T("aaaaaaaa") );
+ is( __LINE__, s5, _T("abcdefgh") );
+ is( __LINE__, s6, s1 );
+ is( __LINE__, s7, s1 );
+ is( __LINE__, s8, _T("efgh") );
+
+ // test append
+ s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = _T("abc");
+ s1.append(_T("def"));
+ s2.append(_T("defgh"), 3);
+ s3.append(wxString(_T("abcdef")), 3, 6);
+ s4.append(s1);
+ s5.append(3, _T('a'));
+ s6.append(s1.begin() + 3, s1.end());
+
+ is( __LINE__, s1, _T("abcdef") );
+ is( __LINE__, s2, _T("abcdef") );
+ is( __LINE__, s3, _T("abcdef") );
+ is( __LINE__, s4, _T("abcabcdef") );
+ is( __LINE__, s5, _T("abcaaa") );
+ is( __LINE__, s6, _T("abcdef") );
+
+ // test assign
+ s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = _T("abc");
+ s1.assign(_T("def"));
+ s2.assign(_T("defgh"), 3);
+ s3.assign(wxString(_T("abcdef")), 3, 6);
+ s4.assign(s1);
+ s5.assign(3, _T('a'));
+ s6.assign(s1.begin() + 1, s1.end());
+
+ is( __LINE__, s1, _T("def") );
+ is( __LINE__, s2, _T("def") );
+ is( __LINE__, s3, _T("def") );
+ is( __LINE__, s4, _T("def") );
+ is( __LINE__, s5, _T("aaa") );
+ is( __LINE__, s6, _T("ef") );
+
+ // test compare
+ s1 = _T("abcdefgh");
+ s2 = _T("abcdefgh");
+ s3 = _T("abc");
+ s4 = _T("abcdefghi");
+ s5 = _T("aaa");
+ s6 = _T("zzz");
+ s7 = _T("zabcdefg");
+
+ ok( __LINE__, s1.compare(s2) == 0 );
+ ok( __LINE__, s1.compare(s3) > 0 );
+ ok( __LINE__, s1.compare(s4) < 0 );
+ ok( __LINE__, s1.compare(s5) > 0 );
+ ok( __LINE__, s1.compare(s6) < 0 );
+ ok( __LINE__, s1.compare(1, 12, s1) > 0);
+ ok( __LINE__, s1.compare(_T("abcdefgh")) == 0);
+ ok( __LINE__, s1.compare(1, 7, _T("bcdefgh")) == 0);
+ ok( __LINE__, s1.compare(1, 7, _T("bcdefgh"), 7) == 0);
+
+ // test erase
+ s1.erase(1, 1);
+ s2.erase(4, 12);
+ wxString::iterator it = s3.erase(s3.begin() + 1);
+ wxString::iterator it2 = s4.erase(s4.begin() + 4, s4.begin() + 6);
+ wxString::iterator it3 = s7.erase(s7.begin() + 4, s7.begin() + 8);
+
+ is( __LINE__, s1, _T("acdefgh") );
+ is( __LINE__, s2, _T("abcd") );
+ is( __LINE__, s3, _T("ac") );
+ is( __LINE__, s4, _T("abcdghi") );
+ is( __LINE__, s7, _T("zabc") );
+ is( __LINE__, *it, _T('c') );
+ is( __LINE__, *it2, _T('g') );
+ ok( __LINE__, it3 == s7.end() );
+
+ // test insert
+ s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = _T("aaaa");
+ s9 = s10 = _T("cdefg");
+
+ s1.insert(1, _T("cc") );
+ s2.insert(2, _T("cdef"), 3);
+ s3.insert(2, s10);
+ s4.insert(2, s10, 3, 7);
+ s5.insert(1, 2, _T('c'));
+ it = s6.insert(s6.begin() + 3, _T('X'));
+ s7.insert(s7.begin(), s9.begin(), s9.end() - 1);
+ s8.insert(s8.begin(), 2, _T('c'));
+
+ is( __LINE__, s1, _T("accaaa") );
+ is( __LINE__, s2, _T("aacdeaa") );
+ is( __LINE__, s3, _T("aacdefgaa") );
+ is( __LINE__, s4, _T("aafgaa") );
+ is( __LINE__, s5, _T("accaaa") );
+ is( __LINE__, s6, _T("aaaXa") );
+ is( __LINE__, s7, _T("cdefaaaa") );
+ is( __LINE__, s8, _T("ccaaaa") );
+
+ s1 = s2 = s3 = _T("aaaa");
+ s1.insert(0, _T("ccc"), 2);
+ s2.insert(4, _T("ccc"), 2);
+
+ is( __LINE__, s1, _T("ccaaaa") );
+ is( __LINE__, s2, _T("aaaacc") );
+
+ // test replace
+ s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = _T("QWERTYUIOP");
+ s9 = s10 = _T("werty");
+
+ s1.replace(3, 4, _T("rtyu"));
+ s1.replace(8, 7, _T("opopop"));
+ s2.replace(10, 12, _T("WWWW"));
+ s3.replace(1, 5, s9);
+ s4.replace(1, 4, s9, 0, 4);
+ s5.replace(1, 2, s9, 1, 12);
+ s6.replace(0, 123, s9, 0, 123);
+ s7.replace(2, 7, s9);
+
+ is( __LINE__, s1, _T("QWErtyuIopopop") );
+ is( __LINE__, s2, _T("QWERTYUIOPWWWW") );
+ is( __LINE__, s3, _T("QwertyUIOP") );
+ is( __LINE__, s4, _T("QwertYUIOP") );
+ is( __LINE__, s5, _T("QertyRTYUIOP") );
+ is( __LINE__, s6, s9);
+ is( __LINE__, s7, _T("QWwertyP") );
+
+ wxPuts(_T("*** Testing std::string operations finished ***\n"));
+}
+
#endif // TEST_STRINGS
// ----------------------------------------------------------------------------
int main(int argc, char **argv)
{
+ wxApp::CheckBuildOptions(wxBuildOptions());
+
wxInitializer initializer;
if ( !initializer )
{
#if wxUSE_CMDLINE_PARSER
static const wxCmdLineEntryDesc cmdLineDesc[] =
{
- { wxCMD_LINE_SWITCH, _T("h"), _T("help"), "show this help message",
+ { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("show this help message"),
wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
- { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" },
- { wxCMD_LINE_SWITCH, "q", "quiet", "be quiet" },
+ { wxCMD_LINE_SWITCH, _T("v"), _T("verbose"), _T("be verbose") },
+ { wxCMD_LINE_SWITCH, _T("q"), _T("quiet"), _T("be quiet") },
- { wxCMD_LINE_OPTION, "o", "output", "output file" },
- { wxCMD_LINE_OPTION, "i", "input", "input dir" },
- { wxCMD_LINE_OPTION, "s", "size", "output block size",
+ { 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_VAL_NUMBER },
- { wxCMD_LINE_OPTION, "d", "date", "output file date",
+ { wxCMD_LINE_OPTION, _T("d"), _T("date"), _T("output file date"),
wxCMD_LINE_VAL_DATE },
- { wxCMD_LINE_PARAM, NULL, NULL, "input file",
+ { wxCMD_LINE_PARAM, NULL, NULL, _T("input file"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE },
{ wxCMD_LINE_NONE }
};
+#if wxUSE_UNICODE
+ wxChar **wargv = new wxChar *[argc + 1];
+
+ {
+ for ( int n = 0; n < argc; n++ )
+ {
+ wxMB2WXbuf warg = wxConvertMB2WX(argv[n]);
+ wargv[n] = wxStrdup(warg);
+ }
+
+ wargv[n] = NULL;
+ }
+
+ #define argv wargv
+#endif // wxUSE_UNICODE
+
wxCmdLineParser parser(cmdLineDesc, argc, argv);
- parser.AddOption("project_name", "", "full path to project file",
+#if wxUSE_UNICODE
+ {
+ for ( int n = 0; n < argc; n++ )
+ free(wargv[n]);
+
+ delete [] wargv;
+ }
+#endif // wxUSE_UNICODE
+
+ parser.AddOption(_T("project_name"), _T(""), _T("full path to project file"),
wxCMD_LINE_VAL_STRING,
wxCMD_LINE_OPTION_MANDATORY | wxCMD_LINE_NEEDS_SEPARATOR);
switch ( parser.Parse() )
{
case -1:
- wxLogMessage("Help was given, terminating.");
+ wxLogMessage(_T("Help was given, terminating."));
break;
case 0:
break;
default:
- wxLogMessage("Syntax error detected, aborting.");
+ wxLogMessage(_T("Syntax error detected, aborting."));
break;
}
#endif // wxUSE_CMDLINE_PARSER
{
TestStringMatch();
}
+
+ TestStdString();
#endif // TEST_STRINGS
#ifdef TEST_ARRAYS
- if ( TEST_ALL )
+ if ( 1 || TEST_ALL )
{
wxArrayString a1;
- a1.Add("tiger");
- a1.Add("cat");
- a1.Add("lion");
- a1.Add("dog");
- a1.Add("human");
- a1.Add("ape");
+ a1.Add(_T("tiger"));
+ a1.Add(_T("cat"));
+ a1.Add(_T("lion"), 3);
+ a1.Add(_T("dog"));
+ a1.Add(_T("human"));
+ a1.Add(_T("ape"));
- puts("*** Initially:");
+ wxPuts(_T("*** Initially:"));
- PrintArray("a1", a1);
+ PrintArray(_T("a1"), a1);
wxArrayString a2(a1);
- PrintArray("a2", a2);
+ PrintArray(_T("a2"), a2);
+#if !wxUSE_STL
wxSortedArrayString a3(a1);
- PrintArray("a3", a3);
+#else
+ wxSortedArrayString a3;
+ for (wxArrayString::iterator it = a1.begin(), en = a1.end();
+ it != en; ++it)
+ a3.Add(*it);
+#endif
+ PrintArray(_T("a3"), a3);
- puts("*** After deleting a string from a1");
- a1.Remove(2);
+ wxPuts(_T("*** After deleting three strings from a1"));
+ a1.RemoveAt(2,3);
- PrintArray("a1", a1);
- PrintArray("a2", a2);
- PrintArray("a3", a3);
+ PrintArray(_T("a1"), a1);
+ PrintArray(_T("a2"), a2);
+ PrintArray(_T("a3"), a3);
- puts("*** After reassigning a1 to a2 and a3");
+#if !wxUSE_STL
+ wxPuts(_T("*** After reassigning a1 to a2 and a3"));
a3 = a2 = a1;
- PrintArray("a2", a2);
- PrintArray("a3", a3);
+ PrintArray(_T("a2"), a2);
+ PrintArray(_T("a3"), a3);
+#endif
- puts("*** After sorting a1");
- a1.Sort();
- PrintArray("a1", a1);
+ wxPuts(_T("*** After sorting a1"));
+ a1.Sort(wxStringCompareAscending);
+ PrintArray(_T("a1"), a1);
- puts("*** After sorting a1 in reverse order");
- a1.Sort(TRUE);
- PrintArray("a1", a1);
+ wxPuts(_T("*** After sorting a1 in reverse order"));
+ a1.Sort(wxStringCompareDescending);
+ PrintArray(_T("a1"), a1);
- puts("*** After sorting a1 by the string length");
- a1.Sort(StringLenCompare);
- PrintArray("a1", a1);
+#if !wxUSE_STL
+ wxPuts(_T("*** After sorting a1 by the string length"));
+ a1.Sort(&StringLenCompare);
+ PrintArray(_T("a1"), a1);
+#endif
TestArrayOfObjects();
TestArrayOfUShorts();
}
TestArrayOfInts();
+ TestStlArray();
#endif // TEST_ARRAYS
#ifdef TEST_DIR
if ( TEST_ALL )
{
+ TestDirExists();
TestDirEnum();
- TestDirTraverse();
}
+ TestDirTraverse();
#endif // TEST_DIR
#ifdef TEST_DLLLOADER
#ifdef TEST_LIST
TestListCtor();
+ TestList();
#endif // TEST_LIST
#ifdef TEST_LOCALE
#endif // TEST_LOCALE
#ifdef TEST_LOG
+ wxPuts(_T("*** Testing wxLog ***"));
+
wxString s;
for ( size_t n = 0; n < 8000; n++ )
{
- s << (char)('A' + (n % 26));
+ s << (wxChar)(_T('A') + (n % 26));
}
+ wxLogWarning(_T("The length of the string is %lu"),
+ (unsigned long)s.length());
+
wxString msg;
- msg.Printf("A very very long message: '%s', the end!\n", s.c_str());
+ msg.Printf(_T("A very very long message: '%s', the end!\n"), s.c_str());
// this one shouldn't be truncated
- printf(msg);
+ wxPrintf(msg);
// but this one will because log functions use fixed size buffer
// (note that it doesn't need '\n' at the end neither - will be added
// by wxLog anyhow)
- wxLogMessage("A very very long message 2: '%s', the end!", s.c_str());
+ wxLogMessage(_T("A very very long message 2: '%s', the end!"), s.c_str());
#endif // TEST_LOG
#ifdef TEST_FILE
if ( 0 )
{
wxFileName fn;
- fn.Assign("c:\\foo", "bar.baz");
+ fn.Assign(_T("c:\\foo"), _T("bar.baz"));
+ fn.Assign(_T("/u/os9-port/Viewer/tvision/WEI2HZ-3B3-14_05-04-00MSC1.asc"));
DumpFileName(fn);
}
+ TestFileNameConstruction();
if ( TEST_ALL )
{
TestFileNameConstruction();
TestFileNameMakeRelative();
+ TestFileNameMakeAbsolute();
TestFileNameSplit();
TestFileNameTemp();
TestFileNameCwd();
#ifdef TEST_FILETIME
TestFileGetTimes();
+ if ( 0 )
TestFileSetTimes();
#endif // TEST_FILETIME
TestLongLongConversion();
TestBitOperations();
TestLongLongComparison();
- TestLongLongPrint();
+ TestLongLongToString();
+ TestLongLongPrintf();
}
#endif // TEST_LONGLONG
{
TestMimeEnum();
TestMimeOverride();
- TestMimeFilename();
+ TestMimeAssociate();
}
-
- TestMimeAssociate();
+ TestMimeFilename();
#endif // TEST_MIME
#ifdef TEST_INFO_FUNCTIONS
TestDbOpen();
#endif // TEST_ODBC
+#ifdef TEST_PRINTF
+ TestPrintf();
+#endif // TEST_PRINTF
+
#ifdef TEST_REGCONF
TestRegConfWrite();
#endif // TEST_REGCONF
#endif // TEST_SOCKETS
#ifdef TEST_STREAMS
- TestFileStream();
- TestMemoryStream();
+ if ( TEST_ALL )
+ {
+ TestFileStream();
+ }
+ TestMemoryStream();
#endif // TEST_STREAMS
+#ifdef TEST_TEXTSTREAM
+ TestTextInputStream();
+#endif // TEST_TEXTSTREAM
+
#ifdef TEST_THREADS
int nCPUs = wxThread::GetCPUCount();
- printf("This system has %d CPUs\n", nCPUs);
+ wxPrintf(_T("This system has %d CPUs\n"), nCPUs);
if ( nCPUs != -1 )
wxThread::SetConcurrency(nCPUs);
+ TestDetachedThreads();
if ( TEST_ALL )
{
- TestDetachedThreads();
TestJoinableThreads();
TestThreadSuspend();
TestThreadDelete();
TestThreadConditions();
TestThreadExec();
+ TestSemaphore();
}
-
- TestSemaphore();
#endif // TEST_THREADS
#ifdef TEST_TIMER
TestTimeZoneBug();
}
+ TestTimeWNumber();
+
if ( TEST_INTERACTIVE )
TestDateTimeInteractive();
#endif // TEST_DATETIME
+#ifdef TEST_SCOPEGUARD
+ TestScopeGuard();
+#endif
+
#ifdef TEST_USLEEP
- puts("Sleeping for 3 seconds... z-z-z-z-z...");
+ wxPuts(_T("Sleeping for 3 seconds... z-z-z-z-z..."));
wxUsleep(3000);
#endif // TEST_USLEEP
TestFSVolume();
#endif // TEST_VOLUME
+#ifdef TEST_UNICODE
+ TestUnicodeToFromAscii();
+#endif // TEST_UNICODE
+
#ifdef TEST_WCHAR
TestUtf8();
TestEncodingConverter();
projects / wxWidgets.git / blobdiff