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

No real changes, just avoid an unnecessary heap allocation in a test.

Browse Source 
We don't need to allocate the locale object in StringTestCase::ToDouble() on
the heap (and then delete it -- or not, if an assertion fails before the
function end), it's enough and simpler to just create it as a local variable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-05-31 11:55:37 +00:00
parent cd49ac33b3
commit 1a39b0131f
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/strings/strings.cpp
View File

@@ -590,7 +590,7 @@ void StringTestCase::ToLong()
if ( ld.flags & (Number_LongLong | Number_Unsigned) ) if ( ld.flags & (Number_LongLong | Number_Unsigned) )
continue; continue;
// NOTE: unless you're using some exotic locale, ToCLong and ToLong // NOTE: unless you're using some exotic locale, ToCLong and ToLong
// should behave the same for our test data set: // should behave the same for our test data set:
@@ -631,7 +631,7 @@ void StringTestCase::ToULong()
CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToCULong(&ul) ); CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToCULong(&ul) );
if ( ld.IsOk() ) if ( ld.IsOk() )
CPPUNIT_ASSERT_EQUAL( ld.ULValue(), ul ); CPPUNIT_ASSERT_EQUAL( ld.ULValue(), ul );
CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToULong(&ul) ); CPPUNIT_ASSERT_EQUAL( ld.IsOk(), wxString(ld.str).ToULong(&ul) );
if ( ld.IsOk() ) if ( ld.IsOk() )
CPPUNIT_ASSERT_EQUAL( ld.ULValue(), ul ); CPPUNIT_ASSERT_EQUAL( ld.ULValue(), ul );
@@ -711,17 +711,17 @@ void StringTestCase::ToDouble()
// test ToDouble() now: // test ToDouble() now:
// NOTE: for the test to be reliable, we need to set the locale explicitely // NOTE: for the test to be reliable, we need to set the locale explicitly
// so that we know the decimal point character to use // so that we know the decimal point character to use
if (!wxLocale::IsAvailable(wxLANGUAGE_FRENCH)) if (!wxLocale::IsAvailable(wxLANGUAGE_FRENCH))
return; // you should have french support installed to continue this test! return; // you should have french support installed to continue this test!
wxLocale *locale = new wxLocale; wxLocale locale;
// don't load default catalog, it may be unavailable: // don't load default catalog, it may be unavailable:
CPPUNIT_ASSERT( locale->Init(wxLANGUAGE_FRENCH, wxLOCALE_DONT_LOAD_DEFAULT) ); CPPUNIT_ASSERT( locale.Init(wxLANGUAGE_FRENCH, wxLOCALE_DONT_LOAD_DEFAULT) );
static const struct ToDoubleData doubleData2[] = static const struct ToDoubleData doubleData2[] =
{ {
{ wxT("1"), 1, true }, { wxT("1"), 1, true },
@@ -745,8 +745,6 @@ void StringTestCase::ToDouble()
if ( ld.ok ) if ( ld.ok )
CPPUNIT_ASSERT_EQUAL( ld.value, d ); CPPUNIT_ASSERT_EQUAL( ld.value, d );
} }
delete locale;
} }
void StringTestCase::StringBuf() void StringTestCase::StringBuf()