Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disable the test if we have no strtoll()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-16 02:30:40 +00:00
parent 79c723cb5e
commit 64ec9666a6
1 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
tests/strings/strings.cpp
View File

@@ -519,7 +519,7 @@ void StringTestCase::ToULong()
} }
} }
#ifdef wxLongLong_t #ifdef wxHAS_STRTOLL
void StringTestCase::ToLongLong() void StringTestCase::ToLongLong()
{ {
@@ -531,10 +531,32 @@ void StringTestCase::ToLongLong()
if ( ld.flags & (Number_Long | Number_Unsigned) ) if ( ld.flags & (Number_Long | Number_Unsigned) )
continue; continue;
CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToLongLong(&l) );
if ( ld.IsOk() ) if ( ld.IsOk() )
{
CPPUNIT_ASSERT_MESSAGE
(
std::string(wxString::Format
(
_T("Conversion of \"%s\" to long long failed"),
ld.str
).mb_str()),
wxString(ld.str).ToLongLong(&l)
);
CPPUNIT_ASSERT_EQUAL( ld.LLValue(), l ); CPPUNIT_ASSERT_EQUAL( ld.LLValue(), l );
} }
else
{
CPPUNIT_ASSERT_MESSAGE
(
std::string(wxString::Format
(
_T("Conversion of \"%s\" to long long succeeded"),
ld.str
).mb_str()),
!wxString(ld.str).ToLongLong(&l)
);
}
}
} }
void StringTestCase::ToULongLong() void StringTestCase::ToULongLong()
@@ -547,13 +569,35 @@ void StringTestCase::ToULongLong()
if ( ld.flags & (Number_Long | Number_Signed) ) if ( ld.flags & (Number_Long | Number_Signed) )
continue; continue;
CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToULongLong(&ul) );
if ( ld.IsOk() ) if ( ld.IsOk() )
{
CPPUNIT_ASSERT_MESSAGE
(
std::string(wxString::Format
(
_T("Conversion of \"%s\" to unsigned long long failed"),
ld.str
).mb_str()),
wxString(ld.str).ToULongLong(&ul)
);
CPPUNIT_ASSERT_EQUAL( ld.ULLValue(), ul ); CPPUNIT_ASSERT_EQUAL( ld.ULLValue(), ul );
} }
else
{
CPPUNIT_ASSERT_MESSAGE
(
std::string(wxString::Format
(
_T("Conversion of \"%s\" to unsigned long long succeeded"),
ld.str
).mb_str()),
!wxString(ld.str).ToULongLong(&ul)
);
}
}
} }
#endif // wxLongLong_t #endif // wxHAS_STRTOLL
void StringTestCase::ToDouble() void StringTestCase::ToDouble()
{ {