X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b268b083fcaf775f65d0cd091ff9aa487778dc8b..0d58bb65789a8efec581d2beb2117669d1d1db9d:/samples/console/console.cpp diff --git a/samples/console/console.cpp b/samples/console/console.cpp index 702be27023..67a1b7f2b2 100644 --- a/samples/console/console.cpp +++ b/samples/console/console.cpp @@ -17,6 +17,12 @@ // headers // ---------------------------------------------------------------------------- +#include + +#if wxUSE_GUI + #error "This sample can't be compiled in GUI mode." +#endif // wxUSE_GUI + #include #include @@ -36,8 +42,9 @@ // 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 @@ -49,11 +56,15 @@ //#define TEST_HASH //#define TEST_INFO_FUNCTIONS //#define TEST_LIST +//#define TEST_LOCALE //#define TEST_LOG //#define TEST_LONGLONG //#define TEST_MIME //#define TEST_PATHLIST +//#define TEST_REGCONF +#define TEST_REGEX //#define TEST_REGISTRY +//#define TEST_SNGLINST //#define TEST_SOCKETS //#define TEST_STREAMS //#define TEST_STRINGS @@ -61,14 +72,12 @@ //#define TEST_TIMER //#define TEST_VCARD -- don't enable this (VZ) //#define TEST_WCHAR -#define TEST_ZIP +//#define TEST_ZIP //#define TEST_ZLIB - -#ifdef TEST_DATETIME -#include -#endif - +#ifdef TEST_SNGLINST + #include +#endif // TEST_SNGLINST // ---------------------------------------------------------------------------- // test class for container objects @@ -119,6 +128,46 @@ static wxString MakePrintable(const wxChar *s) #endif // MakePrintable() is used +// ---------------------------------------------------------------------------- +// wxFontMapper::CharsetToEncoding +// ---------------------------------------------------------------------------- + +#ifdef TEST_CHARSET + +#include + +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 // ---------------------------------------------------------------------------- @@ -169,6 +218,16 @@ static void ShowCmdLine(const wxCmdLineParser& parser) #include +#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) @@ -191,6 +250,8 @@ static void TestDirEnumHelper(wxDir& dir, static void TestDirEnum() { + puts("*** Testing wxDir::GetFirst/GetNext ***"); + wxDir dir(wxGetCwd()); puts("Enumerating everything in current directory:"); @@ -211,13 +272,7 @@ static void TestDirEnum() 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); @@ -236,6 +291,55 @@ static void TestDirEnum() 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 // ---------------------------------------------------------------------------- @@ -325,7 +429,7 @@ static void TestEnvironment() 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 @@ -808,6 +912,301 @@ 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... + }; + + 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 // ---------------------------------------------------------------------------- @@ -1233,6 +1632,7 @@ static void TestBitOperations() static void TestLongLongComparison() { +#if wxUSE_LONGLONG_WX puts("*** Testing wxLongLong comparison ***\n"); static const long testLongs[] = @@ -1278,6 +1678,7 @@ static void TestLongLongComparison() res == (ls[m] == testLongs[n]) ? "ok" : "ERROR"); } } +#endif // wxUSE_LONGLONG_WX } #undef MAKE_LL @@ -1311,14 +1712,249 @@ static void TestPathList() #endif // TEST_PATHLIST // ---------------------------------------------------------------------------- -// registry +// regular expressions +// ---------------------------------------------------------------------------- + +#ifdef TEST_REGEX + +#include + +static void TestRegExCompile() +{ + wxPuts(_T("*** Testing RE compilation ***\n")); + + static struct RegExCompTestData + { + const wxChar *pattern; + 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 }, + }; + + wxRegEx re; + for ( size_t n = 0; n < WXSIZEOF(regExCompTestData); n++ ) + { + const RegExCompTestData& data = regExCompTestData[n]; + bool ok = re.Compile(data.pattern); + + wxPrintf(_T("'%s' is %sa valid RE (%s)\n"), + data.pattern, + ok ? _T("") : _T("not "), + ok == data.correct ? _T("ok") : _T("ERROR")); + } +} + +static void TestRegExMatch() +{ + wxPuts(_T("*** Testing RE matching ***\n")); + + static struct RegExMatchTestData + { + const wxChar *pattern; + const wxChar *text; + 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 }, + }; + + for ( size_t n = 0; n < WXSIZEOF(regExMatchTestData); n++ ) + { + const RegExMatchTestData& data = regExMatchTestData[n]; + + wxRegEx re(data.pattern); + bool ok = re.Matches(data.text); + + wxPrintf(_T("'%s' %s %s (%s)\n"), + data.pattern, + ok ? _T("matches") : _T("doesn't match"), + data.text, + ok == data.correct ? _T("ok") : _T("ERROR")); + } +} + +static void TestRegExSubmatch() +{ + wxPuts(_T("*** Testing RE subexpressions ***\n")); + + wxRegEx re(_T("([[:alpha:]]+) ([[:alpha:]]+) ([[:digit:]]+).*([[:digit:]]+)$")); + if ( !re.IsValid() ) + { + wxPuts(_T("ERROR: compilation failed.")); + return; + } + + wxString text = _T("Fri Jul 13 18:37:52 CEST 2001"); + + if ( !re.Matches(text) ) + { + wxPuts(_T("ERROR: match expected.")); + } + else + { + wxPrintf(_T("Entire match: %s\n"), re.GetMatch(text).c_str()); + + wxPrintf(_T("Date: %s/%s/%s, wday: %s\n"), + re.GetMatch(text, 3).c_str(), + re.GetMatch(text, 2).c_str(), + re.GetMatch(text, 4).c_str(), + re.GetMatch(text, 1).c_str()); + } +} + +static void TestRegExReplacement() +{ + wxPuts(_T("*** Testing RE replacement ***")); + + static struct RegExReplTestData + { + const wxChar *text; + const wxChar *repl; + const wxChar *result; + size_t count; + } regExReplTestData[] = + { + { _T("foo123"), _T("bar"), _T("bar"), 1 }, + { _T("foo123"), _T("\\2\\1"), _T("123foo"), 1 }, + { _T("foo_123"), _T("\\2\\1"), _T("123foo"), 1 }, + { _T("123foo"), _T("bar"), _T("123foo"), 0 }, + { _T("123foo456foo"), _T("&&"), _T("123foo456foo456foo"), 1 }, + { _T("foo123foo123"), _T("bar"), _T("barbar"), 2 }, + { _T("foo123_foo456_foo789"), _T("bar"), _T("bar_bar_bar"), 3 }, + }; + + const wxChar *pattern = _T("([a-z]+)[^0-9]*([0-9]+)"); + wxRegEx re = pattern; + + wxPrintf(_T("Using pattern '%s' for replacement.\n"), pattern); + + for ( size_t n = 0; n < WXSIZEOF(regExReplTestData); n++ ) + { + const RegExReplTestData& data = regExReplTestData[n]; + + wxString text = data.text; + size_t nRepl = re.Replace(&text, data.repl); + + wxPrintf(_T("%s =~ s/RE/%s/g: %u match%s, result = '%s' ("), + data.text, data.repl, + nRepl, nRepl == 1 ? _T("") : _T("es"), + text.c_str()); + if ( text == data.result && nRepl == data.count ) + { + wxPuts(_T("ok)")); + } + else + { + wxPrintf(_T("ERROR: should be %u and '%s')\n"), + data.count, data.result); + } + } +} + +static void TestRegExInteractive() +{ + wxPuts(_T("*** Testing RE interactively ***")); + + for ( ;; ) + { + char pattern[128]; + printf("\nEnter a pattern: "); + if ( !fgets(pattern, WXSIZEOF(pattern), stdin) ) + break; + + // kill the last '\n' + pattern[strlen(pattern) - 1] = 0; + + wxRegEx re; + if ( !re.Compile(pattern) ) + { + continue; + } + + char text[128]; + for ( ;; ) + { + printf("Enter text to match: "); + if ( !fgets(text, WXSIZEOF(text), stdin) ) + break; + + // kill the last '\n' + text[strlen(text) - 1] = 0; + + if ( !re.Matches(text) ) + { + printf("No match.\n"); + } + else + { + printf("Pattern matches at '%s'\n", re.GetMatch(text).c_str()); + + size_t start, len; + for ( size_t n = 1; ; n++ ) + { + if ( !re.GetMatch(&start, &len, n) ) + { + break; + } + + printf("Subexpr %u matched '%s'\n", + n, wxString(text + start, len).c_str()); + } + } + } + } +} + +#endif // TEST_REGEX + +// ---------------------------------------------------------------------------- +// registry and related stuff // ---------------------------------------------------------------------------- // this is for MSW only #ifndef __WXMSW__ + #undef TEST_REGCONF #undef TEST_REGISTRY #endif +#ifdef TEST_REGCONF + +#include +#include + +static void TestRegConfWrite() +{ + wxRegConfig regconf(_T("console"), _T("wxwindows")); + regconf.Write(_T("Hello"), wxString(_T("world"))); +} + +#endif // TEST_REGCONF + #ifdef TEST_REGISTRY #include @@ -2422,6 +3058,8 @@ static void TestZlibStreamRead() #ifdef TEST_DATETIME +#include + #include #include @@ -4137,6 +4775,44 @@ static void TestStringReplace() 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 // ---------------------------------------------------------------------------- @@ -4145,15 +4821,38 @@ static void TestStringReplace() 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[] = @@ -4199,16 +4898,14 @@ int main(int argc, char **argv) { TestPChar(); TestString(); - } TestStringSub(); - if ( 0 ) - { TestStringConstruction(); TestStringFormat(); TestStringFind(); TestStringTokenizer(); TestStringReplace(); } + TestStringMatch(); #endif // TEST_STRINGS #ifdef TEST_ARRAYS @@ -4262,7 +4959,9 @@ int main(int argc, char **argv) #endif // TEST_ARRAYS #ifdef TEST_DIR - TestDirEnum(); + if ( 0 ) + TestDirEnum(); + TestDirTraverse(); #endif // TEST_DIR #ifdef TEST_DLLLOADER @@ -4285,6 +4984,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++ ) @@ -4324,6 +5027,27 @@ int main(int argc, char **argv) } #endif // TEST_FILENAME +#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_THREADS int nCPUs = wxThread::GetCPUCount(); printf("This system has %d CPUs\n", nCPUs); @@ -4388,6 +5112,22 @@ int main(int argc, char **argv) TestPathList(); #endif // TEST_PATHLIST +#ifdef TEST_REGCONF + TestRegConfWrite(); +#endif // TEST_REGCONF + +#ifdef TEST_REGEX + // TODO: write a real test using src/regex/tests file + if ( 0 ) + { + TestRegExCompile(); + TestRegExMatch(); + TestRegExSubmatch(); + TestRegExInteractive(); + } + TestRegExReplacement(); +#endif // TEST_REGEX + #ifdef TEST_REGISTRY if ( 0 ) TestRegistryRead(); @@ -4402,27 +5142,6 @@ int main(int argc, char **argv) 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(); @@ -4458,6 +5177,11 @@ int main(int argc, char **argv) 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(); @@ -4480,8 +5204,6 @@ int main(int argc, char **argv) TestZlibStreamRead(); #endif // TEST_ZLIB - wxUninitialize(); - return 0; }