X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6dfec4b8d901b13f11745a1371083a0b8c1c6980..b075a3bbfd9ea0cd175456109981d1042730029c:/samples/console/console.cpp diff --git a/samples/console/console.cpp b/samples/console/console.cpp index 7b1313c567..f8995d43d9 100644 --- a/samples/console/console.cpp +++ b/samples/console/console.cpp @@ -40,16 +40,21 @@ //#define TEST_DATETIME //#define TEST_DIR //#define TEST_DLLLOADER +//#define TEST_ENVIRON //#define TEST_EXECUTE //#define TEST_FILE //#define TEST_FILECONF +//#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_REGISTRY +//#define TEST_PATHLIST +//#define TEST_REGISTRY //#define TEST_SOCKETS //#define TEST_STREAMS //#define TEST_STRINGS @@ -60,6 +65,12 @@ //#define TEST_ZIP //#define TEST_ZLIB + +#ifdef TEST_DATETIME +#include +#endif + + // ---------------------------------------------------------------------------- // test class for container objects // ---------------------------------------------------------------------------- @@ -283,6 +294,43 @@ static void TestDllLoad() #endif // TEST_DLLLOADER +// ---------------------------------------------------------------------------- +// wxGet/SetEnv +// ---------------------------------------------------------------------------- + +#ifdef TEST_ENVIRON + +#include + +static wxString MyGetEnv(const wxString& var) +{ + wxString val; + if ( !wxGetEnv(var, &val) ) + val = _T(""); + else + val = wxString(_T('\'')) + val + _T('\''); + + return val; +} + +static void TestEnvironment() +{ + const wxChar *var = _T("wxTestVar"); + + puts("*** testing environment access functions ***"); + + printf("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()); + wxSetEnv(var, _T("another value")); + 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"))); +} + +#endif // TEST_ENVIRON + // ---------------------------------------------------------------------------- // wxExecute // ---------------------------------------------------------------------------- @@ -296,9 +344,9 @@ static void TestExecute() puts("*** testing wxExecute ***"); #ifdef __UNIX__ - #define COMMAND "echo hi" + #define COMMAND "cat -n ../../Makefile" // "echo hi" #define SHELL_COMMAND "echo hi from shell" - #define REDIRECT_COMMAND "date" + #define REDIRECT_COMMAND COMMAND // "date" #elif defined(__WXMSW__) #define COMMAND "command.com -c 'echo hi'" #define SHELL_COMMAND "echo hi" @@ -357,6 +405,7 @@ static void TestExecute() #ifdef TEST_FILE #include +#include #include static void TestFileRead() @@ -433,6 +482,55 @@ static void TestTextFileRead() puts(""); } +static void TestFileCopy() +{ + puts("*** 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"); + } + else + { + wxFFile f1(filename1, "rb"), + f2(filename2, "rb"); + + if ( !f1.IsOpened() || !f2.IsOpened() ) + { + puts("ERROR: failed to open file(s)"); + } + else + { + wxString s1, s2; + if ( !f1.ReadAll(&s1) || !f2.ReadAll(&s2) ) + { + puts("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!"); + } + else + { + puts("File was copied ok."); + } + } + } + } + + if ( !wxRemoveFile(filename2) ) + { + puts("ERROR: failed to remove the file"); + } + + puts(""); +} + #endif // TEST_FILE // ---------------------------------------------------------------------------- @@ -498,6 +596,95 @@ static void TestFileConfRead() #endif // TEST_FILECONF +// ---------------------------------------------------------------------------- +// wxFileName +// ---------------------------------------------------------------------------- + +#ifdef TEST_FILENAME + +#include + +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 ***"); + + for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) + { + 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("ERROR (couldn't be normalized)"); + } + else + { + printf("normalized: '%s'\n", fn.GetFullPath().c_str()); + } + } + + puts(""); +} + +static void TestFileNameSplit() +{ + puts("*** testing wxFileName splitting ***"); + + for ( size_t n = 0; n < WXSIZEOF(filenames); n++ ) + { + const FileNameInfo &fni = filenames[n]; + wxString path, name, ext; + wxFileName::SplitPath(fni.fullname, &path, &name, &ext); + + printf("%s -> path = '%s', name = '%s', ext = '%s'", + fni.fullname, path.c_str(), name.c_str(), ext.c_str()); + if ( path != fni.path ) + printf(" (ERROR: path = '%s')", fni.path); + if ( name != fni.name ) + printf(" (ERROR: name = '%s')", fni.name); + if ( ext != fni.ext ) + printf(" (ERROR: ext = '%s')", fni.ext); + puts(""); + } + + puts(""); +} + +static void TestFileNameComparison() +{ + // TODO! +} + +static void TestFileNameOperations() +{ + // TODO! +} + +static void TestFileNameCwd() +{ + // TODO! +} + +#endif // TEST_FILENAME + // ---------------------------------------------------------------------------- // wxHashTable // ---------------------------------------------------------------------------- @@ -622,6 +809,293 @@ static void TestListCtor() #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... + }; + + for ( size_t n = 0; n < WXSIZEOF(langStrings); n++ ) + { + const char *langStr = langStrings[n]; + if ( langStr ) + 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 // ---------------------------------------------------------------------------- @@ -630,13 +1104,13 @@ static void TestListCtor() #include -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); @@ -645,7 +1119,8 @@ static void TestMimeEnum() 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", @@ -669,21 +1144,34 @@ static void TestMimeEnum() 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"); - 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")); + 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); + + puts(""); } static void TestMimeFilename() @@ -701,7 +1189,7 @@ 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()); @@ -723,6 +1211,36 @@ static void TestMimeFilename() delete ft; } } + + puts(""); +} + +static void TestMimeAssociate() +{ + wxPuts(_T("*** Testing creation of filetype association ***\n")); + + 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 + { + // TODO: read it back + delete ft; + } + + puts(""); } #endif // TEST_MIME @@ -1055,6 +1573,31 @@ static void TestLongLongComparison() #endif // TEST_LONGLONG +// ---------------------------------------------------------------------------- +// 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 // ---------------------------------------------------------------------------- @@ -1134,6 +1677,39 @@ static void TestRegistryRead() } } +static void TestRegistryAssociation() +{ + /* + The second call to deleteself genertaes an error message, with a + messagebox saying .flo is crucial to system operation, while the .ddf + call also fails, but with no error message + */ + + wxRegKey key; + + key.SetName("HKEY_CLASSES_ROOT\\.ddf" ); + key.Create(); + key = "ddxf_auto_file" ; + key.SetName("HKEY_CLASSES_ROOT\\.flo" ); + key.Create(); + key = "ddxf_auto_file" ; + key.SetName("HKEY_CLASSES_ROOT\\ddxf_auto_file\\DefaultIcon"); + key.Create(); + key = "program,0" ; + key.SetName("HKEY_CLASSES_ROOT\\ddxf_auto_file\\shell\\open\\command"); + key.Create(); + key = "program \"%1\"" ; + + key.SetName("HKEY_CLASSES_ROOT\\.ddf" ); + key.DeleteSelf(); + key.SetName("HKEY_CLASSES_ROOT\\.flo" ); + key.DeleteSelf(); + key.SetName("HKEY_CLASSES_ROOT\\ddxf_auto_file\\DefaultIcon"); + key.DeleteSelf(); + key.SetName("HKEY_CLASSES_ROOT\\ddxf_auto_file\\shell\\open\\command"); + key.DeleteSelf(); +} + #endif // TEST_REGISTRY // ---------------------------------------------------------------------------- @@ -1144,7 +1720,6 @@ static void TestRegistryRead() #include #include -#include #include static void TestSocketServer() @@ -1267,56 +1842,84 @@ static void TestSocketClient() } } -static void TestProtocolFtp() -{ - puts("*** Testing wxFTP download ***\n"); +#endif // TEST_SOCKETS - wxLog::AddTraceMask(_T("ftp")); +// ---------------------------------------------------------------------------- +// FTP +// ---------------------------------------------------------------------------- + +#ifdef TEST_FTP + +#include + +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 FTP connect ***"); + +#ifdef FTP_ANONYMOUS static const char *hostname = "ftp.wxwindows.org"; - printf("--- Attempting to connect to %s:21...\n", hostname); + 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 - wxFTP ftp; 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()); - if ( !ftp.ChDir(_T("pub")) ) - { - puts("ERROR: failed to cd to pub"); - } - - wxArrayString files; - if ( !ftp.GetList(files) ) - { - puts("ERROR: failed to get list of files"); - } - else - { - printf("List of files under '%s':\n", ftp.Pwd().c_str()); - size_t count = files.GetCount(); - for ( size_t n = 0; n < count; n++ ) - { - printf("\t%s\n", files[n].c_str()); - } - puts("End of the file list"); - } + } - if ( !ftp.ChDir(_T("..")) ) - { - puts("ERROR: failed to cd to .."); - } + return TRUE; +} - static const char *filename = "welcome.msg"; +// test (fixed?) wxFTP bug with wu-ftpd >= 2.6.0? +static void TestFtpWuFtpd() +{ + wxFTP ftp; + static const char *hostname = "ftp.eudora.com"; + if ( !ftp.Connect(hostname) ) + { + printf("ERROR: failed to connect to %s\n", hostname); + } + else + { + static const char *filename = "eudora/pubs/draft-gellens-submit-09.txt"; wxInputStream *in = ftp.GetInputStream(filename); if ( !in ) { - puts("ERROR: couldn't get input stream"); + printf("ERROR: couldn't get input stream for %s\n", filename); } else { @@ -1330,7 +1933,7 @@ static void TestProtocolFtp() } else { - printf("\nContents of %s:\n%s\n", filename, data); + printf("Successfully retrieved the file.\n"); } delete [] data; @@ -1339,50 +1942,231 @@ static void TestProtocolFtp() } } -static void TestProtocolFtpUpload() +static void TestFtpList() { - puts("*** Testing wxFTP uploading ***\n"); + puts("*** Testing wxFTP file listing ***\n"); - wxLog::AddTraceMask(_T("ftp")); + // test CWD + if ( !ftp.ChDir(directory) ) + { + printf("ERROR: failed to cd to %s\n", directory); + } - static const char *hostname = "localhost"; + printf("Current directory is '%s'\n", ftp.Pwd().c_str()); - printf("--- Attempting to connect to %s:21...\n", hostname); + // test NLIST and LIST + wxArrayString files; + if ( !ftp.GetFilesList(files) ) + { + puts("ERROR: failed to get NLIST of files"); + } + else + { + printf("Brief list of files under '%s':\n", ftp.Pwd().c_str()); + size_t count = files.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + printf("\t%s\n", files[n].c_str()); + } + puts("End of the file list"); + } - wxFTP ftp; - ftp.SetUser("zeitlin"); - ftp.SetPassword("insert your password here"); - if ( !ftp.Connect(hostname) ) + if ( !ftp.GetDirList(files) ) { - printf("ERROR: failed to connect to %s\n", hostname); + puts("ERROR: failed to get LIST of files"); } else { - printf("--- Connected to %s, current directory is '%s'\n", - hostname, ftp.Pwd().c_str()); + printf("Detailed list of files under '%s':\n", ftp.Pwd().c_str()); + size_t count = files.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + printf("\t%s\n", files[n].c_str()); + } + puts("End of the file list"); + } + + if ( !ftp.ChDir(_T("..")) ) + { + puts("ERROR: failed to cd to .."); + } + + printf("Current directory is '%s'\n", ftp.Pwd().c_str()); +} + +static void TestFtpDownload() +{ + puts("*** Testing wxFTP download ***\n"); - // upload a file - static const char *file1 = "test1"; - static const char *file2 = "test2"; - wxOutputStream *out = ftp.GetOutputStream(file1); - if ( out ) + // 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: read error"); + } + else { - printf("--- Uploading to %s ---\n", file1); - out->Write("First hello", 11); - delete out; + printf("\nContents of %s:\n%s\n", filename, data); } - out = ftp.GetOutputStream(file2); - if ( out ) + delete [] data; + delete in; + } +} + +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" ) + { + wxString wildcard; + if ( strlen(buf) > 4 ) + wildcard = buf + 5; + + wxArrayString files; + if ( !ftp.GetList(files, wildcard, start == "LIST") ) + { + printf("ERROR: failed to get %s of files\n", start.c_str()); + } + else + { + printf("--- %s of '%s' under '%s':\n", + start.c_str(), wildcard.c_str(), ftp.Pwd().c_str()); + size_t count = files.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + printf("\t%s\n", files[n].c_str()); + } + puts("--- End of the file list"); + } + } + else // !list { - printf("--- Uploading to %s ---\n", file1); - out->Write("Second hello", 12); - delete out; + char ch = ftp.SendCommand(buf); + printf("Command %s", ch ? "succeeded" : "failed"); + if ( ch ) + { + printf(" (return code %c)", ch); + } + + printf(", server reply:\n%s\n\n", ftp.GetLastResult().c_str()); } } + + puts("\n*** done ***"); } -#endif // TEST_SOCKETS +static void TestFtpUpload() +{ + puts("*** Testing wxFTP uploading ***\n"); + + // upload a file + static const char *file1 = "test1"; + static const char *file2 = "test2"; + wxOutputStream *out = ftp.GetOutputStream(file1); + if ( out ) + { + printf("--- Uploading to %s ---\n", file1); + out->Write("First hello", 11); + delete out; + } + + // send a command to check the remote file + if ( ftp.SendCommand(wxString("STAT ") + file1) != '2' ) + { + printf("ERROR: STAT %s failed\n", file1); + } + else + { + printf("STAT %s returned:\n\n%s\n", + file1, ftp.GetLastResult().c_str()); + } + + out = ftp.GetOutputStream(file2); + if ( out ) + { + printf("--- Uploading to %s ---\n", file1); + out->Write("Second hello", 12); + delete out; + } +} + +#endif // TEST_FTP // ---------------------------------------------------------------------------- // streams @@ -1390,8 +2174,34 @@ static void TestProtocolFtpUpload() #ifdef TEST_STREAMS +#include #include +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 ***"); @@ -1710,37 +2520,49 @@ static void TestVCardWrite() #ifdef TEST_WCHAR #include +#include +#include #include 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 @@ -1751,16 +2573,21 @@ static void TestUtf8() #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()); @@ -1770,6 +2597,59 @@ static void TestZipStreamRead() 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 // ---------------------------------------------------------------------------- @@ -2617,7 +3497,7 @@ static void TestTimeParse() } } -static void TestInteractive() +static void TestDateTimeInteractive() { puts("\n*** interactive wxDateTime tests ***"); @@ -2797,6 +3677,32 @@ static void TestTimeZoneBug() 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 @@ -3084,11 +3990,57 @@ static void PrintArray(const char* name, const wxArrayString& array) } } -static int StringLenCompare(const wxString& first, const wxString& second) +static void PrintArray(const char* name, const wxArrayInt& array) +{ + printf("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]); + } +} + +int wxCMPFUNC_CONV StringLenCompare(const wxString& first, + const wxString& second) { return first.length() - second.length(); } +int wxCMPFUNC_CONV IntCompare(int *first, + int *second) +{ + return *first - *second; +} + +int wxCMPFUNC_CONV IntRevCompare(int *first, + int *second) +{ + return *second - *first; +} + +static void TestArrayOfInts() +{ + puts("*** Testing wxArrayInt ***\n"); + + wxArrayInt a; + a.Add(1); + a.Add(17); + a.Add(5); + a.Add(3); + + puts("Initially:"); + PrintArray("a", a); + + puts("After sort:"); + a.Sort(IntCompare); + PrintArray("a", a); + + puts("After reverse sort:"); + a.Sort(IntRevCompare); + PrintArray("a", a); +} + #include "wx/dynarray.h" WX_DECLARE_OBJARRAY(Bar, ArrayBars); @@ -3548,6 +4500,8 @@ int main(int argc, char **argv) #endif // TEST_STRINGS #ifdef TEST_ARRAYS + if ( 0 ) + { wxArrayString a1; a1.Add("tiger"); a1.Add("cat"); @@ -3591,6 +4545,8 @@ int main(int argc, char **argv) PrintArray("a1", a1); TestArrayOfObjects(); + } + TestArrayOfInts(); #endif // TEST_ARRAYS #ifdef TEST_DIR @@ -3601,6 +4557,10 @@ int main(int argc, char **argv) TestDllLoad(); #endif // TEST_DLLLOADER +#ifdef TEST_ENVIRON + TestEnvironment(); +#endif // TEST_ENVIRON + #ifdef TEST_EXECUTE TestExecute(); #endif // TEST_EXECUTE @@ -3613,6 +4573,10 @@ int main(int argc, char **argv) TestListCtor(); #endif // TEST_LIST +#ifdef TEST_LOCALE + TestDefaultLang(); +#endif // TEST_LOCALE + #ifdef TEST_LOG wxString s; for ( size_t n = 0; n < 8000; n++ ) @@ -3634,10 +4598,24 @@ int main(int argc, char **argv) #ifdef TEST_FILE if ( 0 ) + { TestFileRead(); - TestTextFileRead(); + TestTextFileRead(); + } + TestFileCopy(); #endif // TEST_FILE +#ifdef TEST_FILENAME + TestFileNameSplit(); + if ( 0 ) + { + TestFileNameConstruction(); + TestFileNameCwd(); + TestFileNameComparison(); + TestFileNameOperations(); + } +#endif // TEST_FILENAME + #ifdef TEST_THREADS int nCPUs = wxThread::GetCPUCount(); printf("This system has %d CPUs\n", nCPUs); @@ -3683,10 +4661,14 @@ int main(int argc, char **argv) #ifdef TEST_MIME wxLog::AddTraceMask(_T("mime")); - if ( 0 ) + if ( 1 ) + { TestMimeEnum(); - TestMimeOverride(); - TestMimeFilename(); + TestMimeOverride(); + TestMimeFilename(); + } + else + TestMimeAssociate(); #endif // TEST_MIME #ifdef TEST_INFO_FUNCTIONS @@ -3694,21 +4676,48 @@ int main(int argc, char **argv) TestUserInfo(); #endif // TEST_INFO_FUNCTIONS +#ifdef TEST_PATHLIST + TestPathList(); +#endif // TEST_PATHLIST + #ifdef TEST_REGISTRY - TestRegistryRead(); + if ( 0 ) + TestRegistryRead(); + TestRegistryAssociation(); #endif // TEST_REGISTRY #ifdef TEST_SOCKETS if ( 0 ) { TestSocketServer(); - TestSocketClient(); - TestProtocolFtp(); } - TestProtocolFtpUpload(); + TestSocketClient(); #endif // TEST_SOCKETS +#ifdef TEST_FTP + 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 ) + TestFtpWuFtpd(); +#endif // TEST_FTP + #ifdef TEST_STREAMS + if ( 0 ) + TestFileStream(); TestMemoryStream(); #endif // TEST_STREAMS @@ -3736,8 +4745,9 @@ int main(int argc, char **argv) TestTimeZoneBug(); } + TestTimeSpanFormat(); if ( 0 ) - TestInteractive(); + TestDateTimeInteractive(); #endif // TEST_DATETIME #ifdef TEST_VCARD @@ -3751,7 +4761,9 @@ int main(int argc, char **argv) #endif // TEST_WCHAR #ifdef TEST_ZIP - TestZipStreamRead(); + if ( 0 ) + TestZipStreamRead(); + TestZipFileSystem(); #endif // TEST_ZIP #ifdef TEST_ZLIB