No real changes, just avoid an unnecessary heap allocation in a test.
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:
@@ -711,16 +711,16 @@ 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[] =
|
||||||
{
|
{
|
||||||
@@ -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()
|
||||||
|
Reference in New Issue
Block a user