1. made CRT wrappers definitions indepenent of wxUSE_UNICODE: both ANSI and Unicode variants are now defined
2. split wxcrt.h into wxcrtbase.h with lowlevel compiler-specific definitions and wxcrt.h with ANSI- and Unicode-compatible wx wrappers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -36,9 +36,15 @@ public:
|
||||
private:
|
||||
CPPUNIT_TEST_SUITE( CrtTestCase );
|
||||
CPPUNIT_TEST( SetGetEnv );
|
||||
CPPUNIT_TEST( Strcmp );
|
||||
CPPUNIT_TEST( Strspn );
|
||||
CPPUNIT_TEST( Strcspn );
|
||||
CPPUNIT_TEST_SUITE_END();
|
||||
|
||||
void SetGetEnv();
|
||||
void Strcmp();
|
||||
void Strspn();
|
||||
void Strcspn();
|
||||
|
||||
DECLARE_NO_COPY_CLASS(CrtTestCase)
|
||||
};
|
||||
@@ -61,3 +67,112 @@ void CrtTestCase::SetGetEnv()
|
||||
CPPUNIT_ASSERT( wxUnsetEnv(_T("TESTVAR")) );
|
||||
CPPUNIT_ASSERT( wxGetEnv(_T("TESTVAR"), NULL) == false );
|
||||
}
|
||||
|
||||
void CrtTestCase::Strcmp()
|
||||
{
|
||||
// this code tests if all possible ways of calling wxStrcmp() compile:
|
||||
const char * const char1 = "first";
|
||||
const wchar_t * const wchar1 = L"first";
|
||||
wxString str1("first");
|
||||
wxCStrData cstr1(str1.c_str());
|
||||
wxCharBuffer charbuf1(char1);
|
||||
wxWCharBuffer wcharbuf1(wchar1);
|
||||
|
||||
const char * const char2 = "last";
|
||||
const wchar_t * const wchar2 = L"last";
|
||||
wxString str2("last");
|
||||
wxCStrData cstr2(str2.c_str());
|
||||
wxCharBuffer charbuf2(char2);
|
||||
wxWCharBuffer wcharbuf2(wchar2);
|
||||
|
||||
CPPUNIT_ASSERT( wxStrcmp(char1, char2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(char1, wchar2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(char1, str2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(char1, cstr2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(char1, charbuf2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(char1, wcharbuf2) < 0 );
|
||||
|
||||
CPPUNIT_ASSERT( wxStrcmp(wchar1, char2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(wchar1, wchar2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(wchar1, str2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(wchar1, cstr2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(wchar1, charbuf2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(wchar1, wcharbuf2) < 0 );
|
||||
|
||||
CPPUNIT_ASSERT( wxStrcmp(str1, char2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(str1, wchar2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(str1, str2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(str1, cstr2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(str1, charbuf2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(str1, wcharbuf2) < 0 );
|
||||
|
||||
CPPUNIT_ASSERT( wxStrcmp(cstr1, char2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(cstr1, wchar2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(cstr1, str2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(cstr1, cstr2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(cstr1, charbuf2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(cstr1, wcharbuf2) < 0 );
|
||||
|
||||
CPPUNIT_ASSERT( wxStrcmp(charbuf1, char2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(charbuf1, wchar2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(charbuf1, str2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(charbuf1, cstr2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(charbuf1, charbuf2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(charbuf1, wcharbuf2) < 0 );
|
||||
|
||||
CPPUNIT_ASSERT( wxStrcmp(wcharbuf1, char2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(wcharbuf1, wchar2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(wcharbuf1, str2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(wcharbuf1, cstr2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(wcharbuf1, charbuf2) < 0 );
|
||||
CPPUNIT_ASSERT( wxStrcmp(wcharbuf1, wcharbuf2) < 0 );
|
||||
}
|
||||
|
||||
void CrtTestCase::Strspn()
|
||||
{
|
||||
const char *strMB = "hello, world";
|
||||
const char *strWC = "hello, world";
|
||||
const wxString strWX("hello, world");
|
||||
|
||||
CPPUNIT_ASSERT( wxStrspn(strMB, "xyz") == 0 );
|
||||
CPPUNIT_ASSERT( wxStrspn(strWC, "xyz") == 0 );
|
||||
CPPUNIT_ASSERT( wxStrspn(strWX, "xyz") == 0 );
|
||||
CPPUNIT_ASSERT( wxStrspn(strMB, L"xyz") == 0 );
|
||||
CPPUNIT_ASSERT( wxStrspn(strWC, L"xyz") == 0 );
|
||||
CPPUNIT_ASSERT( wxStrspn(strWX, L"xyz") == 0 );
|
||||
|
||||
CPPUNIT_ASSERT( wxStrspn(strMB, "hleo") == 5 );
|
||||
CPPUNIT_ASSERT( wxStrspn(strWC, "hleo") == 5 );
|
||||
CPPUNIT_ASSERT( wxStrspn(strWX, "hleo") == 5 );
|
||||
|
||||
CPPUNIT_ASSERT( wxStrspn(strMB, "ld") == 0 );
|
||||
CPPUNIT_ASSERT( wxStrspn(strWC, "ld") == 0 );
|
||||
CPPUNIT_ASSERT( wxStrspn(strWX, "ld") == 0 );
|
||||
|
||||
CPPUNIT_ASSERT( wxStrspn(strMB, strWC) == strWX.length() );
|
||||
CPPUNIT_ASSERT( wxStrspn(strWC, strWX) == strWX.length() );
|
||||
CPPUNIT_ASSERT( wxStrspn(strWX, strMB) == strWX.length() );
|
||||
}
|
||||
|
||||
void CrtTestCase::Strcspn()
|
||||
{
|
||||
const char *strMB = "hello, world";
|
||||
const char *strWC = "hello, world";
|
||||
const wxString strWX("hello, world");
|
||||
|
||||
CPPUNIT_ASSERT( wxStrcspn(strMB, strWX) == 0 );
|
||||
CPPUNIT_ASSERT( wxStrcspn(strWC, strMB) == 0 );
|
||||
CPPUNIT_ASSERT( wxStrcspn(strWX, strWC) == 0 );
|
||||
|
||||
CPPUNIT_ASSERT( wxStrcspn(strMB, ", ") == 5 );
|
||||
CPPUNIT_ASSERT( wxStrcspn(strWC, ", ") == 5 );
|
||||
CPPUNIT_ASSERT( wxStrcspn(strWX, ", ") == 5 );
|
||||
|
||||
CPPUNIT_ASSERT( wxStrcspn(strMB, "hel") == 0 );
|
||||
CPPUNIT_ASSERT( wxStrcspn(strWC, "hel") == 0 );
|
||||
CPPUNIT_ASSERT( wxStrcspn(strWX, "hel") == 0 );
|
||||
|
||||
CPPUNIT_ASSERT( wxStrcspn(strMB, "xy") == strWX.length() );
|
||||
CPPUNIT_ASSERT( wxStrcspn(strWC, "xy") == strWX.length() );
|
||||
CPPUNIT_ASSERT( wxStrcspn(strWX, "xy") == strWX.length() );
|
||||
}
|
||||
|
Reference in New Issue
Block a user