Don't use GetThreadId() in wxMSW code.

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

diff --git a/tests/strings/numformatter.cpp b/tests/strings/numformatter.cpp
index 7ab235bc8188761cd79348689e374f21376a84d9..f5262b289f8211f7f8c382ba88f0d163512edbb2 100644 (file)
--- a/tests/strings/numformatter.cpp
+++ b/tests/strings/numformatter.cpp
@@ -27,22 +27,22 @@
 class NumFormatterTestCase : public CppUnit::TestCase
 {
 public:
 class NumFormatterTestCase : public CppUnit::TestCase
 {
 public:

-    NumFormatterTestCase()
+    NumFormatterTestCase() { m_locale = NULL; }
+
+    virtual void setUp()

     {
         // We need to use a locale with known decimal point and which uses the
         // thousands separator for the tests to make sense.
         m_locale = new wxLocale(wxLANGUAGE_ENGLISH_UK,
                                 wxLOCALE_DONT_LOAD_DEFAULT);
         if ( !m_locale->IsOk() )
     {
         // We need to use a locale with known decimal point and which uses the
         // thousands separator for the tests to make sense.
         m_locale = new wxLocale(wxLANGUAGE_ENGLISH_UK,
                                 wxLOCALE_DONT_LOAD_DEFAULT);
         if ( !m_locale->IsOk() )

-        {
-            delete m_locale;
-            m_locale = NULL;
-        }
+            tearDown();

     }
 
     }
 

-    virtual ~NumFormatterTestCase()
+    virtual void tearDown()

     {
         delete m_locale;
     {
         delete m_locale;

+        m_locale = NULL;

     }
 
 private:
     }
 
 private:


@@ -80,7 +80,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( NumFormatterTestCase );
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( NumFormatterTestCase );
 

-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone

 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( NumFormatterTestCase, "NumFormatterTestCase" );
 
 // ----------------------------------------------------------------------------
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( NumFormatterTestCase, "NumFormatterTestCase" );
 
 // ----------------------------------------------------------------------------


@@ -93,13 +93,21 @@ void NumFormatterTestCase::LongToString()
         return;
 
     CPPUNIT_ASSERT_EQUAL(          "1", wxNumberFormatter::ToString(         1L));
         return;
 
     CPPUNIT_ASSERT_EQUAL(          "1", wxNumberFormatter::ToString(         1L));

+    CPPUNIT_ASSERT_EQUAL(         "-1", wxNumberFormatter::ToString(        -1L));

     CPPUNIT_ASSERT_EQUAL(         "12", wxNumberFormatter::ToString(        12L));
     CPPUNIT_ASSERT_EQUAL(         "12", wxNumberFormatter::ToString(        12L));

+    CPPUNIT_ASSERT_EQUAL(        "-12", wxNumberFormatter::ToString(       -12L));

     CPPUNIT_ASSERT_EQUAL(        "123", wxNumberFormatter::ToString(       123L));
     CPPUNIT_ASSERT_EQUAL(        "123", wxNumberFormatter::ToString(       123L));

+    CPPUNIT_ASSERT_EQUAL(       "-123", wxNumberFormatter::ToString(      -123L));

     CPPUNIT_ASSERT_EQUAL(      "1,234", wxNumberFormatter::ToString(      1234L));
     CPPUNIT_ASSERT_EQUAL(      "1,234", wxNumberFormatter::ToString(      1234L));

+    CPPUNIT_ASSERT_EQUAL(     "-1,234", wxNumberFormatter::ToString(     -1234L));

     CPPUNIT_ASSERT_EQUAL(     "12,345", wxNumberFormatter::ToString(     12345L));
     CPPUNIT_ASSERT_EQUAL(     "12,345", wxNumberFormatter::ToString(     12345L));

+    CPPUNIT_ASSERT_EQUAL(    "-12,345", wxNumberFormatter::ToString(    -12345L));

     CPPUNIT_ASSERT_EQUAL(    "123,456", wxNumberFormatter::ToString(    123456L));
     CPPUNIT_ASSERT_EQUAL(    "123,456", wxNumberFormatter::ToString(    123456L));

+    CPPUNIT_ASSERT_EQUAL(   "-123,456", wxNumberFormatter::ToString(   -123456L));

     CPPUNIT_ASSERT_EQUAL(  "1,234,567", wxNumberFormatter::ToString(   1234567L));
     CPPUNIT_ASSERT_EQUAL(  "1,234,567", wxNumberFormatter::ToString(   1234567L));

+    CPPUNIT_ASSERT_EQUAL( "-1,234,567", wxNumberFormatter::ToString(  -1234567L));

     CPPUNIT_ASSERT_EQUAL( "12,345,678", wxNumberFormatter::ToString(  12345678L));
     CPPUNIT_ASSERT_EQUAL( "12,345,678", wxNumberFormatter::ToString(  12345678L));

+    CPPUNIT_ASSERT_EQUAL("-12,345,678", wxNumberFormatter::ToString( -12345678L));

     CPPUNIT_ASSERT_EQUAL("123,456,789", wxNumberFormatter::ToString( 123456789L));
 }
 
     CPPUNIT_ASSERT_EQUAL("123,456,789", wxNumberFormatter::ToString( 123456789L));
 }