Don't use wxWindow::ClearBackground() in the image sample and explain why.

[wxWidgets.git] / tests / strings / strings.cpp

diff --git a/tests/strings/strings.cpp b/tests/strings/strings.cpp
index 98b5230666caf0d1cb3ee1b89a7ad545a69397f1..a925df605e31f156336dc07611bb3a916261461a 100644 (file)
--- a/tests/strings/strings.cpp
+++ b/tests/strings/strings.cpp
@@ -567,7 +567,7 @@ static const struct ToLongData
     { wxT("--1"), 0, Number_Invalid },
 
     { wxT("-1"), -1, Number_Signed | Number_Long },
-    // this is surprizing but consistent with strtoul() behaviour
+    // this is surprising but consistent with strtoul() behaviour
     { wxT("-1"), ULONG_MAX, Number_Unsigned | Number_Long },
 
     // this must overflow, even with 64 bit long
@@ -602,6 +602,17 @@ void StringTestCase::ToLong()
         if ( ld.IsOk() )
             CPPUNIT_ASSERT_EQUAL( ld.LValue(), l );
     }
+
+    // special case: check that the output is not modified if the parsing
+    // failed completely
+    l = 17;
+    CPPUNIT_ASSERT( !wxString("foo").ToLong(&l) );
+    CPPUNIT_ASSERT_EQUAL( 17, l );
+
+    // also check that it is modified if we did parse something successfully in
+    // the beginning of the string
+    CPPUNIT_ASSERT( !wxString("9 cats").ToLong(&l) );
+    CPPUNIT_ASSERT_EQUAL( 9, l );
 }
 
 void StringTestCase::ToULong()
@@ -709,7 +720,7 @@ void StringTestCase::ToDouble()
     wxLocale *locale = new wxLocale;
     
     // don't load default catalog, it may be unavailable:
-    CPPUNIT_ASSERT( locale->Init(wxLANGUAGE_FRENCH, wxLOCALE_CONV_ENCODING) );
+    CPPUNIT_ASSERT( locale->Init(wxLANGUAGE_FRENCH, wxLOCALE_DONT_LOAD_DEFAULT) );
     
     static const struct ToDoubleData doubleData2[] =
     {