// what to test (in alphabetic order)?
//#define TEST_ARRAYS
+//#define TEST_CHARSET
//#define TEST_CMDLINE
-#define TEST_DATETIME
+//#define TEST_DATETIME
//#define TEST_DIR
//#define TEST_DLLLOADER
//#define TEST_ENVIRON
//#define TEST_FILENAME
//#define TEST_FTP
//#define TEST_HASH
+//#define TEST_INFO_FUNCTIONS
//#define TEST_LIST
+//#define TEST_LOCALE
//#define TEST_LOG
//#define TEST_LONGLONG
//#define TEST_MIME
-//#define TEST_INFO_FUNCTIONS
+//#define TEST_PATHLIST
+//#define TEST_REGCONF
//#define TEST_REGISTRY
+//#define TEST_SNGLINST
//#define TEST_SOCKETS
//#define TEST_STREAMS
-//#define TEST_STRINGS
+#define TEST_STRINGS
//#define TEST_THREADS
//#define TEST_TIMER
//#define TEST_VCARD -- don't enable this (VZ)
//#define TEST_ZIP
//#define TEST_ZLIB
+#ifdef TEST_SNGLINST
+ #include <wx/snglinst.h>
+#endif // TEST_SNGLINST
+
// ----------------------------------------------------------------------------
// test class for container objects
// ----------------------------------------------------------------------------
#endif // MakePrintable() is used
+// ----------------------------------------------------------------------------
+// wxFontMapper::CharsetToEncoding
+// ----------------------------------------------------------------------------
+
+#ifdef TEST_CHARSET
+
+#include <wx/fontmap.h>
+
+static void TestCharset()
+{
+ static const wxChar *charsets[] =
+ {
+ // some vali charsets
+ _T("us-ascii "),
+ _T("iso8859-1 "),
+ _T("iso-8859-12 "),
+ _T("koi8-r "),
+ _T("utf-7 "),
+ _T("cp1250 "),
+ _T("windows-1252"),
+
+ // and now some bogus ones
+ _T(" "),
+ _T("cp1249 "),
+ _T("iso--8859-1 "),
+ _T("iso-8859-19 "),
+ };
+
+ for ( size_t n = 0; n < WXSIZEOF(charsets); n++ )
+ {
+ wxFontEncoding enc = wxTheFontMapper->CharsetToEncoding(charsets[n]);
+ wxPrintf(_T("Charset: %s\tEncoding: %s (%s)\n"),
+ charsets[n],
+ wxTheFontMapper->GetEncodingName(enc).c_str(),
+ wxTheFontMapper->GetEncodingDescription(enc).c_str());
+ }
+}
+
+#endif // TEST_CHARSET
+
// ----------------------------------------------------------------------------
// wxCmdLineParser
// ----------------------------------------------------------------------------
#include <wx/dir.h>
+#ifdef __UNIX__
+ static const wxChar *ROOTDIR = _T("/");
+ static const wxChar *TESTDIR = _T("/usr");
+#elif defined(__WXMSW__)
+ static const wxChar *ROOTDIR = _T("c:\\");
+ static const wxChar *TESTDIR = _T("d:\\");
+#else
+ #error "don't know where the root directory is"
+#endif
+
static void TestDirEnumHelper(wxDir& dir,
int flags = wxDIR_DEFAULT,
const wxString& filespec = wxEmptyString)
static void TestDirEnum()
{
+ puts("*** Testing wxDir::GetFirst/GetNext ***");
+
wxDir dir(wxGetCwd());
puts("Enumerating everything in current directory:");
puts("Enumerating files including hidden in current directory:");
TestDirEnumHelper(dir, wxDIR_FILES | wxDIR_HIDDEN);
-#ifdef __UNIX__
- dir.Open("/");
-#elif defined(__WXMSW__)
- dir.Open("c:\\");
-#else
- #error "don't know where the root directory is"
-#endif
+ dir.Open(ROOTDIR);
puts("Enumerating everything in root directory:");
TestDirEnumHelper(dir, wxDIR_DEFAULT);
TestDirEnumHelper(dirNo);
}
+class DirPrintTraverser : public wxDirTraverser
+{
+public:
+ virtual wxDirTraverseResult OnFile(const wxString& filename)
+ {
+ return wxDIR_CONTINUE;
+ }
+
+ virtual wxDirTraverseResult OnDir(const wxString& dirname)
+ {
+ wxString path, name, ext;
+ wxSplitPath(dirname, &path, &name, &ext);
+
+ if ( !ext.empty() )
+ name << _T('.') << ext;
+
+ wxString indent;
+ for ( const wxChar *p = path.c_str(); *p; p++ )
+ {
+ if ( wxIsPathSeparator(*p) )
+ indent += _T(" ");
+ }
+
+ printf("%s%s\n", indent.c_str(), name.c_str());
+
+ return wxDIR_CONTINUE;
+ }
+};
+
+static void TestDirTraverse()
+{
+ puts("*** 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);
+ if ( n > 1 )
+ {
+ printf("First one is '%s'\n", files[0u].c_str());
+ printf(" last one is '%s'\n", files[n - 1].c_str());
+ }
+
+ // enum again with custom traverser
+ wxDir dir(TESTDIR);
+ DirPrintTraverser traverser;
+ dir.Traverse(traverser, _T(""), wxDIR_DIRS | wxDIR_HIDDEN);
+}
+
#endif // TEST_DIR
// ----------------------------------------------------------------------------
printf("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")));
+ printf("PATH = %s\n", MyGetEnv(_T("PATH")).c_str());
}
#endif // TEST_ENVIRON
#include <wx/filename.h>
+static struct FileNameInfo
+{
+ const wxChar *fullname;
+ const wxChar *path;
+ const wxChar *name;
+ const wxChar *ext;
+} filenames[] =
+{
+ { _T("/usr/bin/ls"), _T("/usr/bin"), _T("ls"), _T("") },
+ { _T("/usr/bin/"), _T("/usr/bin"), _T(""), _T("") },
+ { _T("~/.zshrc"), _T("~"), _T(".zshrc"), _T("") },
+ { _T("../../foo"), _T("../.."), _T("foo"), _T("") },
+ { _T("foo.bar"), _T(""), _T("foo"), _T("bar") },
+ { _T("~/foo.bar"), _T("~"), _T("foo"), _T("bar") },
+ { _T("Mahogany-0.60/foo.bar"), _T("Mahogany-0.60"), _T("foo"), _T("bar") },
+ { _T("/tmp/wxwin.tar.bz"), _T("/tmp"), _T("wxwin.tar"), _T("bz") },
+};
+
static void TestFileNameConstruction()
{
puts("*** testing wxFileName construction ***");
- static const wxChar *filenames[] =
- {
- _T("/usr/bin/ls"),
- _T("/usr/bin/"),
- _T("~/.zshrc"),
- _T("../../foo"),
- };
-
for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
{
- wxFileName fn(filenames[n], wxPATH_UNIX);
+ wxFileName fn(filenames[n].fullname, wxPATH_UNIX);
printf("Filename: '%s'\t", fn.GetFullPath().c_str());
if ( !fn.Normalize(wxPATH_NORM_ALL, _T(""), wxPATH_UNIX) )
puts("");
}
+static void TestFileNameSplit()
+{
+ puts("*** testing wxFileName splitting ***");
+
+ for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
+ {
+ const FileNameInfo &fni = filenames[n];
+ wxString path, name, ext;
+ wxFileName::SplitPath(fni.fullname, &path, &name, &ext);
+
+ printf("%s -> path = '%s', name = '%s', ext = '%s'",
+ fni.fullname, path.c_str(), name.c_str(), ext.c_str());
+ if ( path != fni.path )
+ printf(" (ERROR: path = '%s')", fni.path);
+ if ( name != fni.name )
+ printf(" (ERROR: name = '%s')", fni.name);
+ if ( ext != fni.ext )
+ printf(" (ERROR: ext = '%s')", fni.ext);
+ puts("");
+ }
+
+ puts("");
+}
+
static void TestFileNameComparison()
{
// TODO!
#endif // TEST_LIST
+// ----------------------------------------------------------------------------
+// wxLocale
+// ----------------------------------------------------------------------------
+
+#ifdef TEST_LOCALE
+
+#include "wx/intl.h"
+#include "wx/utils.h" // for wxSetEnv
+
+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",
+ };
+
+ if ( (size_t)lang < WXSIZEOF(languageNames) )
+ return languageNames[lang];
+ else
+ return "INVALID";
+}
+
+static void TestDefaultLang()
+{
+ puts("*** Testing wxLocale::GetSystemLanguage ***");
+
+ static const wxChar *langStrings[] =
+ {
+ NULL, // system default
+ _T("C"),
+ _T("fr"),
+ _T("fr_FR"),
+ _T("en"),
+ _T("en_GB"),
+ _T("en_US"),
+ _T("de_DE.iso88591"),
+ _T("german"),
+ _T("?"), // invalid lang spec
+ _T("klingonese"), // I bet on some systems it does exist...
+ };
+
+ wxPrintf(_T("The default system encoding is %s (%d)\n"),
+ wxLocale::GetSystemEncodingName().c_str(),
+ wxLocale::GetSystemEncoding());
+
+ for ( size_t n = 0; n < WXSIZEOF(langStrings); n++ )
+ {
+ const char *langStr = langStrings[n];
+ if ( langStr )
+ {
+ // FIXME: this doesn't do anything at all under Windows, we need
+ // to create a new wxLocale!
+ wxSetEnv(_T("LC_ALL"), langStr);
+ }
+
+ int lang = gs_localeDefault.GetSystemLanguage();
+ printf("Locale for '%s' is %s.\n",
+ langStr ? langStr : "system default", GetLangName(lang));
+ }
+}
+
+#endif // TEST_LOCALE
+
// ----------------------------------------------------------------------------
// MIME types
// ----------------------------------------------------------------------------
#include <wx/mimetype.h>
-static wxMimeTypesManager g_mimeManager;
-
static void TestMimeEnum()
{
+ wxPuts(_T("*** Testing wxMimeTypesManager::EnumAllFileTypes() ***\n"));
+
wxArrayString mimetypes;
- size_t count = g_mimeManager.EnumAllFileTypes(mimetypes);
+ size_t count = wxTheMimeTypesManager->EnumAllFileTypes(mimetypes);
printf("*** All %u known filetypes: ***\n", count);
for ( size_t n = 0; n < count; n++ )
{
- wxFileType *filetype = g_mimeManager.GetFileTypeFromMimeType(mimetypes[n]);
+ wxFileType *filetype =
+ wxTheMimeTypesManager->GetFileTypeFromMimeType(mimetypes[n]);
if ( !filetype )
{
printf("nothing known about the filetype '%s'!\n",
printf("\t%s: %s (%s)\n",
mimetypes[n].c_str(), desc.c_str(), extsAll.c_str());
}
+
+ puts("");
}
static void TestMimeOverride()
{
wxPuts(_T("*** Testing wxMimeTypesManager additional files loading ***\n"));
- wxString mailcap = _T("/tmp/mailcap"),
- mimetypes = _T("/tmp/mime.types");
+ static const wxChar *mailcap = _T("/tmp/mailcap");
+ static const wxChar *mimetypes = _T("/tmp/mime.types");
+
+ if ( wxFile::Exists(mailcap) )
+ wxPrintf(_T("Loading mailcap from '%s': %s\n"),
+ mailcap,
+ wxTheMimeTypesManager->ReadMailcap(mailcap) ? _T("ok") : _T("ERROR"));
+ else
+ wxPrintf(_T("WARN: mailcap file '%s' doesn't exist, not loaded.\n"),
+ mailcap);
+
+ if ( wxFile::Exists(mimetypes) )
+ wxPrintf(_T("Loading mime.types from '%s': %s\n"),
+ mimetypes,
+ wxTheMimeTypesManager->ReadMimeTypes(mimetypes) ? _T("ok") : _T("ERROR"));
+ else
+ wxPrintf(_T("WARN: mime.types file '%s' doesn't exist, not loaded.\n"),
+ mimetypes);
- wxPrintf(_T("Loading mailcap from '%s': %s\n"),
- mailcap.c_str(),
- g_mimeManager.ReadMailcap(mailcap) ? _T("ok") : _T("ERROR"));
- wxPrintf(_T("Loading mime.types from '%s': %s\n"),
- mimetypes.c_str(),
- g_mimeManager.ReadMimeTypes(mimetypes) ? _T("ok") : _T("ERROR"));
+ puts("");
}
static void TestMimeFilename()
{
const wxString fname = filenames[n];
wxString ext = fname.AfterLast(_T('.'));
- wxFileType *ft = g_mimeManager.GetFileTypeFromExtension(ext);
+ wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
if ( !ft )
{
wxPrintf(_T("WARNING: extension '%s' is unknown.\n"), ext.c_str());
delete ft;
}
}
+
+ puts("");
}
static void TestMimeAssociate()
{
wxPuts(_T("*** Testing creation of filetype association ***\n"));
- wxFileType *ft = g_mimeManager.Associate
- (
- _T(".xyz"),
- _T("application/x-xyz"),
- _T("XYZFile"), // filetype (MSW only)
- _T("XYZ File") // description (Unix only)
- );
+ wxFileTypeInfo ftInfo(
+ _T("application/x-xyz"),
+ _T("xyzview '%s'"), // open cmd
+ _T(""), // print cmd
+ _T("XYZ File") // description
+ _T(".xyz"), // extensions
+ NULL // end of extensions
+ );
+ ftInfo.SetShortDesc(_T("XYZFile")); // used under Win32 only
+
+ wxFileType *ft = wxTheMimeTypesManager->Associate(ftInfo);
if ( !ft )
{
wxPuts(_T("ERROR: failed to create association!"));
}
else
{
- if ( !ft->SetOpenCommand(_T("myprogram")) )
- {
- wxPuts(_T("ERROR: failed to set open command!"));
- }
-
+ // TODO: read it back
delete ft;
}
+
+ puts("");
}
#endif // TEST_MIME
static void TestLongLongComparison()
{
+#if wxUSE_LONGLONG_WX
puts("*** Testing wxLongLong comparison ***\n");
static const long testLongs[] =
res == (ls[m] == testLongs[n]) ? "ok" : "ERROR");
}
}
+#endif // wxUSE_LONGLONG_WX
}
#undef MAKE_LL
#endif // TEST_LONGLONG
// ----------------------------------------------------------------------------
-// registry
+// path list
+// ----------------------------------------------------------------------------
+
+#ifdef TEST_PATHLIST
+
+static void TestPathList()
+{
+ puts("*** Testing wxPathList ***\n");
+
+ wxPathList pathlist;
+ pathlist.AddEnvList("PATH");
+ wxString path = pathlist.FindValidPath("ls");
+ if ( path.empty() )
+ {
+ printf("ERROR: command not found in the path.\n");
+ }
+ else
+ {
+ printf("Command found in the path as '%s'.\n", path.c_str());
+ }
+}
+
+#endif // TEST_PATHLIST
+
+// ----------------------------------------------------------------------------
+// registry and related stuff
// ----------------------------------------------------------------------------
// this is for MSW only
#ifndef __WXMSW__
+ #undef TEST_REGCONF
#undef TEST_REGISTRY
#endif
+#ifdef TEST_REGCONF
+
+#include <wx/confbase.h>
+#include <wx/msw/regconf.h>
+
+static void TestRegConfWrite()
+{
+ wxRegConfig regconf(_T("console"), _T("wxwindows"));
+ regconf.Write(_T("Hello"), wxString(_T("world")));
+}
+
+#endif // TEST_REGCONF
+
#ifdef TEST_REGISTRY
#include <wx/msw/registry.h>
#endif // TEST_SOCKETS
+// ----------------------------------------------------------------------------
+// FTP
+// ----------------------------------------------------------------------------
+
#ifdef TEST_FTP
#include <wx/protocol/ftp.h>
-static void TestProtocolFtp()
+static wxFTP ftp;
+
+#define FTP_ANONYMOUS
+
+#ifdef FTP_ANONYMOUS
+ static const char *directory = "/pub";
+ static const char *filename = "welcome.msg";
+#else
+ static const char *directory = "/etc";
+ static const char *filename = "issue";
+#endif
+
+static bool TestFtpConnect()
{
- puts("*** Testing wxFTP download ***\n");
+ puts("*** Testing FTP connect ***");
- wxFTP ftp;
+#ifdef FTP_ANONYMOUS
+ static const char *hostname = "ftp.wxwindows.org";
+
+ printf("--- Attempting to connect to %s:21 anonymously...\n", hostname);
+#else // !FTP_ANONYMOUS
+ static const char *hostname = "localhost";
+
+ char user[256];
+ fgets(user, WXSIZEOF(user), stdin);
+ user[strlen(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'
+ ftp.SetPassword(password);
+
+ printf("--- 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);
+
+ return FALSE;
+ }
+ else
+ {
+ printf("--- Connected to %s, current directory is '%s'\n",
+ hostname, ftp.Pwd().c_str());
+ }
-#ifdef TEST_WUFTPD // test (fixed?) wxFTP bug with wu-ftpd >= 2.6.0?
+ return TRUE;
+}
+
+// test (fixed?) wxFTP bug with wu-ftpd >= 2.6.0?
+static void TestFtpWuFtpd()
+{
+ wxFTP ftp;
static const char *hostname = "ftp.eudora.com";
if ( !ftp.Connect(hostname) )
{
delete in;
}
}
-#else // !TEST_WUFTPD
-
-#if 1
- static const char *hostname = "ftp.wxwindows.org";
- static const char *directory = "pub";
- static const char *filename = "welcome.msg";
+}
- printf("--- Attempting to connect to %s:21 anonymously...\n", hostname);
-#else
- static const char *hostname = "localhost";
- static const char *user = "zeitlin";
- static const char *directory = "/tmp";
+static void TestFtpList()
+{
+ puts("*** Testing wxFTP file listing ***\n");
- ftp.SetUser(user);
- ftp.SetPassword("password");
+ // test CWD
+ if ( !ftp.ChDir(directory) )
+ {
+ printf("ERROR: failed to cd to %s\n", directory);
+ }
- printf("--- Attempting to connect to %s:21 as %s...\n", hostname, user);
-#endif
+ printf("Current directory is '%s'\n", ftp.Pwd().c_str());
- if ( !ftp.Connect(hostname) )
+ // test NLIST and LIST
+ wxArrayString files;
+ if ( !ftp.GetFilesList(files) )
{
- printf("ERROR: failed to connect to %s\n", hostname);
+ puts("ERROR: failed to get NLIST of files");
}
else
{
- printf("--- Connected to %s, current directory is '%s'\n",
- hostname, ftp.Pwd().c_str());
-
- // test CWD
- if ( !ftp.ChDir(directory) )
+ printf("Brief list of files under '%s':\n", ftp.Pwd().c_str());
+ size_t count = files.GetCount();
+ for ( size_t n = 0; n < count; n++ )
{
- printf("ERROR: failed to cd to %s\n", directory);
+ printf("\t%s\n", files[n].c_str());
}
+ puts("End of the file list");
+ }
- // test NLIST and LIST
- wxArrayString files;
- if ( !ftp.GetFilesList(files) )
- {
- puts("ERROR: failed to get NLIST of files");
- }
- else
+ if ( !ftp.GetDirList(files) )
+ {
+ puts("ERROR: failed to get LIST of files");
+ }
+ else
+ {
+ printf("Detailed list of files under '%s':\n", ftp.Pwd().c_str());
+ size_t count = files.GetCount();
+ for ( size_t n = 0; n < count; n++ )
{
- printf("Brief list of files under '%s':\n", ftp.Pwd().c_str());
- size_t count = files.GetCount();
- for ( size_t n = 0; n < count; n++ )
- {
- printf("\t%s\n", files[n].c_str());
- }
- puts("End of the file list");
+ printf("\t%s\n", files[n].c_str());
}
+ puts("End of the file list");
+ }
+
+ if ( !ftp.ChDir(_T("..")) )
+ {
+ puts("ERROR: failed to cd to ..");
+ }
+
+ printf("Current directory is '%s'\n", ftp.Pwd().c_str());
+}
- if ( !ftp.GetDirList(files) )
+static void TestFtpDownload()
+{
+ puts("*** Testing wxFTP download ***\n");
+
+ // test RETR
+ wxInputStream *in = ftp.GetInputStream(filename);
+ if ( !in )
+ {
+ printf("ERROR: couldn't get input stream for %s\n", filename);
+ }
+ else
+ {
+ size_t size = in->StreamSize();
+ printf("Reading file %s (%u bytes)...", filename, size);
+ fflush(stdout);
+
+ char *data = new char[size];
+ if ( !in->Read(data, size) )
{
- puts("ERROR: failed to get LIST of files");
+ puts("ERROR: read error");
}
else
{
- printf("Detailed list of files under '%s':\n", ftp.Pwd().c_str());
- size_t count = files.GetCount();
- for ( size_t n = 0; n < count; n++ )
- {
- printf("\t%s\n", files[n].c_str());
- }
- puts("End of the file list");
+ printf("\nContents of %s:\n%s\n", filename, data);
}
- if ( !ftp.ChDir(_T("..")) )
- {
- puts("ERROR: failed to cd to ..");
- }
+ delete [] data;
+ delete in;
+ }
+}
- // test RETR
- wxInputStream *in = ftp.GetInputStream(filename);
- if ( !in )
- {
- printf("ERROR: couldn't get input stream for %s\n", filename);
- }
+static void TestFtpFileSize()
+{
+ puts("*** Testing FTP SIZE command ***");
+
+ if ( !ftp.ChDir(directory) )
+ {
+ printf("ERROR: failed to cd to %s\n", directory);
+ }
+
+ printf("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);
else
+ printf("Size of '%s' is %d bytes.\n", filename, size);
+ }
+ else
+ {
+ printf("ERROR: '%s' doesn't exist\n", filename);
+ }
+}
+
+static void TestFtpMisc()
+{
+ puts("*** Testing miscellaneous wxFTP functions ***");
+
+ if ( ftp.SendCommand("STAT") != '2' )
+ {
+ puts("ERROR: STAT failed");
+ }
+ else
+ {
+ printf("STAT returned:\n\n%s\n", ftp.GetLastResult().c_str());
+ }
+
+ if ( ftp.SendCommand("HELP SITE") != '2' )
+ {
+ puts("ERROR: HELP SITE failed");
+ }
+ else
+ {
+ printf("The list of site-specific commands:\n\n%s\n",
+ ftp.GetLastResult().c_str());
+ }
+}
+
+static void TestFtpInteractive()
+{
+ puts("\n*** Interactive wxFTP test ***");
+
+ char buf[128];
+
+ for ( ;; )
+ {
+ printf("Enter FTP command: ");
+ if ( !fgets(buf, WXSIZEOF(buf), stdin) )
+ break;
+
+ // kill the last '\n'
+ buf[strlen(buf) - 1] = 0;
+
+ // special handling of LIST and NLST as they require data connection
+ wxString start(buf, 4);
+ start.MakeUpper();
+ if ( start == "LIST" || start == "NLST" )
{
- size_t size = in->StreamSize();
- printf("Reading file %s (%u bytes)...", filename, size);
+ wxString wildcard;
+ if ( strlen(buf) > 4 )
+ wildcard = buf + 5;
- char *data = new char[size];
- if ( !in->Read(data, size) )
+ wxArrayString files;
+ if ( !ftp.GetList(files, wildcard, start == "LIST") )
{
- puts("ERROR: read error");
+ printf("ERROR: failed to get %s of files\n", start.c_str());
}
else
{
- printf("\nContents of %s:\n%s\n", filename, data);
+ printf("--- %s of '%s' under '%s':\n",
+ start.c_str(), wildcard.c_str(), ftp.Pwd().c_str());
+ size_t count = files.GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ printf("\t%s\n", files[n].c_str());
+ }
+ puts("--- End of the file list");
}
-
- delete [] data;
- delete in;
}
-
- // test some other FTP commands
- if ( ftp.SendCommand("STAT") != '2' )
- {
- puts("ERROR: STAT failed");
- }
- else
+ else // !list
{
- printf("STAT returned:\n\n%s\n", ftp.GetLastResult().c_str());
- }
+ char ch = ftp.SendCommand(buf);
+ printf("Command %s", ch ? "succeeded" : "failed");
+ if ( ch )
+ {
+ printf(" (return code %c)", ch);
+ }
- if ( ftp.SendCommand("HELP SITE") != '2' )
- {
- puts("ERROR: HELP SITE failed");
- }
- else
- {
- printf("The list of site-specific commands:\n\n%s\n",
- ftp.GetLastResult().c_str());
+ printf(", server reply:\n%s\n\n", ftp.GetLastResult().c_str());
}
}
-#endif // TEST_WUFTPD/!TEST_WUFTPD
+
+ puts("\n*** done ***");
}
-static void TestProtocolFtpUpload()
+static void TestFtpUpload()
{
puts("*** Testing wxFTP uploading ***\n");
- static const char *hostname = "localhost";
-
- printf("--- Attempting to connect to %s:21...\n", hostname);
+ // upload a file
+ static const char *file1 = "test1";
+ static const char *file2 = "test2";
+ wxOutputStream *out = ftp.GetOutputStream(file1);
+ if ( out )
+ {
+ printf("--- Uploading to %s ---\n", file1);
+ out->Write("First hello", 11);
+ delete out;
+ }
- wxFTP ftp;
- ftp.SetUser("zeitlin");
- ftp.SetPassword("password");
- if ( !ftp.Connect(hostname) )
+ // send a command to check the remote file
+ if ( ftp.SendCommand(wxString("STAT ") + file1) != '2' )
{
- printf("ERROR: failed to connect to %s\n", hostname);
+ printf("ERROR: STAT %s failed\n", file1);
}
else
{
- printf("--- Connected to %s, current directory is '%s'\n",
- hostname, ftp.Pwd().c_str());
-
- // upload a file
- static const char *file1 = "test1";
- static const char *file2 = "test2";
- wxOutputStream *out = ftp.GetOutputStream(file1);
- if ( out )
- {
- printf("--- Uploading to %s ---\n", file1);
- out->Write("First hello", 11);
- delete out;
- }
-
- // send a command to check the remote file
- if ( ftp.SendCommand(wxString("STAT ") + file1) != '2' )
- {
- printf("ERROR: STAT %s failed\n", file1);
- }
- else
- {
- printf("STAT %s returned:\n\n%s\n",
- file1, ftp.GetLastResult().c_str());
- }
+ printf("STAT %s returned:\n\n%s\n",
+ file1, ftp.GetLastResult().c_str());
+ }
- out = ftp.GetOutputStream(file2);
- if ( out )
- {
- printf("--- Uploading to %s ---\n", file1);
- out->Write("Second hello", 12);
- delete out;
- }
+ out = ftp.GetOutputStream(file2);
+ if ( out )
+ {
+ printf("--- Uploading to %s ---\n", file1);
+ out->Write("Second hello", 12);
+ delete out;
}
}
#ifdef TEST_STREAMS
+#include <wx/wfstream.h>
#include <wx/mstream.h>
+static void TestFileStream()
+{
+ puts("*** Testing wxFileInputStream ***");
+
+ static const wxChar *filename = _T("testdata.fs");
+ {
+ wxFileOutputStream fsOut(filename);
+ fsOut.Write("foo", 3);
+ }
+
+ wxFileInputStream fsIn(filename);
+ printf("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);
+ }
+
+ puts("\n*** wxFileInputStream test done ***");
+}
+
static void TestMemoryStream()
{
puts("*** Testing wxMemoryInputStream ***");
#ifdef TEST_WCHAR
#include <wx/strconv.h>
+#include <wx/fontenc.h>
+#include <wx/encconv.h>
#include <wx/buffer.h>
static void TestUtf8()
{
puts("*** Testing UTF8 support ***\n");
- wxString testString = "français";
-#if 0
-"************ French - Français ****************"
-"Juste un petit exemple pour dire que les français aussi"
-"ont à cœur de pouvoir utiliser tous leurs caractères ! :)";
-#endif
-
- wxWCharBuffer wchBuf = testString.wc_str(wxConvUTF8);
- const wchar_t *pwz = (const wchar_t *)wchBuf;
- wxString testString2(pwz, wxConvLocal);
-
- printf("Decoding '%s' => '%s'\n", testString.c_str(), testString2.c_str());
+ static const char textInUtf8[] =
+ {
+ 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,
+ 176, 208, 180, 208, 190, 208, 178, 208, 176, 208, 187, 32, 208, 188,
+ 208, 181, 208, 189, 209, 143, 32, 209, 129, 208, 178, 208, 190, 208,
+ 181, 208, 185, 32, 208, 186, 209, 128, 209, 131, 209, 130, 208, 181,
+ 208, 185, 209, 136, 208, 181, 208, 185, 32, 208, 189, 208, 190, 208,
+ 178, 208, 190, 209, 129, 209, 130, 209, 140, 209, 142, 0
+ };
- char *psz = "fran" "\xe7" "ais";
- size_t len = strlen(psz);
- wchar_t *pwz2 = new wchar_t[len + 1];
- for ( size_t n = 0; n <= len; n++ )
+ char buf[1024];
+ wchar_t wbuf[1024];
+ if ( wxConvUTF8.MB2WC(wbuf, textInUtf8, WXSIZEOF(textInUtf8)) <= 0 )
{
- pwz2[n] = (wchar_t)(unsigned char)psz[n];
+ puts("ERROR: UTF-8 decoding failed.");
}
+ else
+ {
+ // using wxEncodingConverter
+#if 0
+ wxEncodingConverter ec;
+ ec.Init(wxFONTENCODING_UNICODE, wxFONTENCODING_KOI8);
+ ec.Convert(wbuf, buf);
+#else // using wxCSConv
+ wxCSConv conv(_T("koi8-r"));
+ if ( conv.WC2MB(buf, wbuf, 0 /* not needed wcslen(wbuf) */) <= 0 )
+ {
+ puts("ERROR: conversion to KOI8-R failed.");
+ }
+ else
+#endif
- wxString testString3(pwz2, wxConvUTF8);
- delete [] pwz2;
-
- printf("Encoding '%s' -> '%s'\n", psz, testString3.c_str());
+ printf("The resulting string (in koi8-r): %s\n", buf);
+ }
}
#endif // TEST_WCHAR
#ifdef TEST_ZIP
+#include "wx/filesys.h"
+#include "wx/fs_zip.h"
#include "wx/zipstrm.h"
+static const wxChar *TESTFILE_ZIP = _T("testdata.zip");
+
static void TestZipStreamRead()
{
puts("*** Testing ZIP reading ***\n");
- wxZipInputStream istr(_T("idx.zip"), _T("IDX.txt"));
+ static const wxChar *filename = _T("foo");
+ wxZipInputStream istr(TESTFILE_ZIP, filename);
printf("Archive size: %u\n", istr.GetSize());
- puts("Dumping the file:");
+ printf("Dumping the file '%s':\n", filename);
while ( !istr.Eof() )
{
putchar(istr.GetC());
puts("\n----- done ------");
}
+static void DumpZipDirectory(wxFileSystem& fs,
+ const wxString& dir,
+ const wxString& indent)
+{
+ wxString prefix = wxString::Format(_T("%s#zip:%s"),
+ TESTFILE_ZIP, dir.c_str());
+ wxString wildcard = prefix + _T("/*");
+
+ wxString dirname = fs.FindFirst(wildcard, wxDIR);
+ while ( !dirname.empty() )
+ {
+ if ( !dirname.StartsWith(prefix + _T('/'), &dirname) )
+ {
+ wxPrintf(_T("ERROR: unexpected wxFileSystem::FindNext result\n"));
+
+ break;
+ }
+
+ wxPrintf(_T("%s%s\n"), indent.c_str(), dirname.c_str());
+
+ DumpZipDirectory(fs, dirname,
+ indent + wxString(_T(' '), 4));
+
+ dirname = fs.FindNext();
+ }
+
+ wxString filename = fs.FindFirst(wildcard, wxFILE);
+ while ( !filename.empty() )
+ {
+ if ( !filename.StartsWith(prefix, &filename) )
+ {
+ wxPrintf(_T("ERROR: unexpected wxFileSystem::FindNext result\n"));
+
+ break;
+ }
+
+ wxPrintf(_T("%s%s\n"), indent.c_str(), filename.c_str());
+
+ filename = fs.FindNext();
+ }
+}
+
+static void TestZipFileSystem()
+{
+ puts("*** Testing ZIP file system ***\n");
+
+ wxFileSystem::AddHandler(new wxZipFSHandler);
+ wxFileSystem fs;
+ wxPrintf(_T("Dumping all files in the archive %s:\n"), TESTFILE_ZIP);
+
+ DumpZipDirectory(fs, _T(""), wxString(_T(' '), 4));
+}
+
#endif // TEST_ZIP
// ----------------------------------------------------------------------------
#ifdef TEST_DATETIME
+#include <math.h>
+
#include <wx/date.h>
#include <wx/datetime.h>
}
}
-static void TestInteractive()
+static void TestDateTimeInteractive()
{
puts("\n*** interactive wxDateTime tests ***");
puts("");
}
+static void TestTimeSpanFormat()
+{
+ puts("\n*** wxTimeSpan tests ***");
+
+ static const char *formats[] =
+ {
+ _T("(default) %H:%M:%S"),
+ _T("%E weeks and %D days"),
+ _T("%l milliseconds"),
+ _T("(with ms) %H:%M:%S:%l"),
+ _T("100%% of minutes is %M"), // test "%%"
+ _T("%D days and %H hours"),
+ };
+
+ wxTimeSpan ts1(1, 2, 3, 4),
+ ts2(111, 222, 333);
+ for ( size_t n = 0; n < WXSIZEOF(formats); n++ )
+ {
+ printf("ts1 = %s\tts2 = %s\n",
+ ts1.Format(formats[n]).c_str(),
+ ts2.Format(formats[n]).c_str());
+ }
+
+ puts("");
+}
+
#if 0
// test compatibility with the old wxDate/wxTime classes
puts("");
}
+static void TestStringMatch()
+{
+ wxPuts(_T("*** Testing wxString::Matches() ***"));
+
+ static const struct StringMatchTestData
+ {
+ const wxChar *text;
+ const wxChar *wildcard;
+ bool matches;
+ } stringMatchTestData[] =
+ {
+ { _T("foobar"), _T("foo*"), 1 },
+ { _T("foobar"), _T("*oo*"), 1 },
+ { _T("foobar"), _T("*bar"), 1 },
+ { _T("foobar"), _T("??????"), 1 },
+ { _T("foobar"), _T("f??b*"), 1 },
+ { _T("foobar"), _T("f?b*"), 0 },
+ { _T("foobar"), _T("*goo*"), 0 },
+ { _T("foobar"), _T("*foo"), 0 },
+ { _T("foobarfoo"), _T("*foo"), 1 },
+ { _T(""), _T("*"), 1 },
+ { _T(""), _T("?"), 0 },
+ };
+
+ for ( size_t n = 0; n < WXSIZEOF(stringMatchTestData); n++ )
+ {
+ const StringMatchTestData& data = stringMatchTestData[n];
+ bool matches = wxString(data.text).Matches(data.wildcard);
+ wxPrintf(_T("'%s' %s '%s' (%s)\n"),
+ data.wildcard,
+ matches ? _T("matches") : _T("doesn't match"),
+ data.text,
+ matches == data.matches ? _T("ok") : _T("ERROR"));
+ }
+
+ wxPuts(_T(""));
+}
+
#endif // TEST_STRINGS
// ----------------------------------------------------------------------------
int main(int argc, char **argv)
{
- if ( !wxInitialize() )
+ wxInitializer initializer;
+ if ( !initializer )
{
fprintf(stderr, "Failed to initialize the wxWindows library, aborting.");
+
+ return -1;
}
-#ifdef TEST_USLEEP
- puts("Sleeping for 3 seconds... z-z-z-z-z...");
- wxUsleep(3000);
-#endif // TEST_USLEEP
+#ifdef TEST_SNGLINST
+ wxSingleInstanceChecker checker;
+ if ( checker.Create(_T(".wxconsole.lock")) )
+ {
+ if ( checker.IsAnotherRunning() )
+ {
+ wxPrintf(_T("Another instance of the program is running, exiting.\n"));
+
+ return 1;
+ }
+
+ // wait some time to give time to launch another instance
+ wxPrintf(_T("Press \"Enter\" to continue..."));
+ wxFgetc(stdin);
+ }
+ else // failed to create
+ {
+ wxPrintf(_T("Failed to init wxSingleInstanceChecker.\n"));
+ }
+#endif // TEST_SNGLINST
+
+#ifdef TEST_CHARSET
+ TestCharset();
+#endif // TEST_CHARSET
#ifdef TEST_CMDLINE
static const wxCmdLineEntryDesc cmdLineDesc[] =
{
TestPChar();
TestString();
- }
TestStringSub();
- if ( 0 )
- {
TestStringConstruction();
TestStringFormat();
TestStringFind();
TestStringTokenizer();
TestStringReplace();
}
+ TestStringMatch();
#endif // TEST_STRINGS
#ifdef TEST_ARRAYS
#endif // TEST_ARRAYS
#ifdef TEST_DIR
- TestDirEnum();
+ if ( 0 )
+ TestDirEnum();
+ TestDirTraverse();
#endif // TEST_DIR
#ifdef TEST_DLLLOADER
TestListCtor();
#endif // TEST_LIST
+#ifdef TEST_LOCALE
+ TestDefaultLang();
+#endif // TEST_LOCALE
+
#ifdef TEST_LOG
wxString s;
for ( size_t n = 0; n < 8000; n++ )
#endif // TEST_FILE
#ifdef TEST_FILENAME
- TestFileNameConstruction();
+ TestFileNameSplit();
if ( 0 )
{
+ TestFileNameConstruction();
TestFileNameCwd();
TestFileNameComparison();
TestFileNameOperations();
#ifdef TEST_MIME
wxLog::AddTraceMask(_T("mime"));
- if ( 0 )
+ if ( 1 )
{
TestMimeEnum();
TestMimeOverride();
TestMimeFilename();
}
- TestMimeAssociate();
+ else
+ TestMimeAssociate();
#endif // TEST_MIME
#ifdef TEST_INFO_FUNCTIONS
TestUserInfo();
#endif // TEST_INFO_FUNCTIONS
+#ifdef TEST_PATHLIST
+ TestPathList();
+#endif // TEST_PATHLIST
+
+#ifdef TEST_REGCONF
+ TestRegConfWrite();
+#endif // TEST_REGCONF
+
#ifdef TEST_REGISTRY
if ( 0 )
TestRegistryRead();
#endif // TEST_SOCKETS
#ifdef TEST_FTP
- wxLog::AddTraceMask(_T("ftp"));
- TestProtocolFtp();
+ wxLog::AddTraceMask(FTP_TRACE_MASK);
+ if ( TestFtpConnect() )
+ {
+ TestFtpFileSize();
+ if ( 0 )
+ {
+ TestFtpList();
+ TestFtpDownload();
+ TestFtpMisc();
+ TestFtpUpload();
+ }
+ if ( 0 )
+ TestFtpInteractive();
+ }
+ //else: connecting to the FTP server failed
+
if ( 0 )
- TestProtocolFtpUpload();
+ TestFtpWuFtpd();
#endif // TEST_FTP
#ifdef TEST_STREAMS
+ if ( 0 )
+ TestFileStream();
TestMemoryStream();
#endif // TEST_STREAMS
#endif // TEST_TIMER
#ifdef TEST_DATETIME
- if ( 1 )
+ if ( 0 )
{
TestTimeSet();
TestTimeStatic();
TestTimeZoneBug();
}
+ TestTimeSpanFormat();
if ( 0 )
- TestInteractive();
+ TestDateTimeInteractive();
#endif // TEST_DATETIME
+#ifdef TEST_USLEEP
+ puts("Sleeping for 3 seconds... z-z-z-z-z...");
+ wxUsleep(3000);
+#endif // TEST_USLEEP
+
#ifdef TEST_VCARD
if ( 0 )
TestVCardRead();
#endif // TEST_WCHAR
#ifdef TEST_ZIP
- TestZipStreamRead();
+ if ( 0 )
+ TestZipStreamRead();
+ TestZipFileSystem();
#endif // TEST_ZIP
#ifdef TEST_ZLIB
TestZlibStreamRead();
#endif // TEST_ZLIB
- wxUninitialize();
-
return 0;
}
projects / wxWidgets.git / blobdiff