Don't reset bullet number and outline number when applying style sheet.

[wxWidgets.git] / tests / longlong / longlongtest.cpp

diff --git a/tests/longlong/longlongtest.cpp b/tests/longlong/longlongtest.cpp
index 043a259cefdbe5094a38ee0266618d7cfbd93bf5..f7790a1658bd69d2fa9582408f7559d0134835f5 100644 (file)
--- a/tests/longlong/longlongtest.cpp
+++ b/tests/longlong/longlongtest.cpp
@@ -24,6 +24,8 @@
 #include "wx/longlong.h"
 #include "wx/timer.h"
 
 #include "wx/longlong.h"
 #include "wx/timer.h"
 

+#if wxUSE_LONGLONG
+

 // ----------------------------------------------------------------------------
 // helpers for testing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // helpers for testing
 // ----------------------------------------------------------------------------


@@ -66,6 +68,7 @@ private:
         CPPUNIT_TEST( Division );
         CPPUNIT_TEST( BitOperations );
         CPPUNIT_TEST( ToString );
         CPPUNIT_TEST( Division );
         CPPUNIT_TEST( BitOperations );
         CPPUNIT_TEST( ToString );

+        CPPUNIT_TEST( LoHi );

     CPPUNIT_TEST_SUITE_END();
 
     void Conversion();
     CPPUNIT_TEST_SUITE_END();
 
     void Conversion();


@@ -75,6 +78,7 @@ private:
     void Division();
     void BitOperations();
     void ToString();
     void Division();
     void BitOperations();
     void ToString();

+    void LoHi();

 
     DECLARE_NO_COPY_CLASS(LongLongTestCase)
 };
 
     DECLARE_NO_COPY_CLASS(LongLongTestCase)
 };


@@ -233,7 +237,7 @@ void LongLongTestCase::Division()
 
 void LongLongTestCase::BitOperations()
 {
 
 void LongLongTestCase::BitOperations()
 {

-    for ( size_t n = 0; n < ITEMS; n++ )
+    for ( size_t m = 0; m < ITEMS; m++ )

     {
         wxLongLong a = RAND_LL();
 
     {
         wxLongLong a = RAND_LL();
 


@@ -277,7 +281,7 @@ void LongLongTestCase::ToString()
     for ( size_t n = 0; n < WXSIZEOF(testLongs); n++ )
     {
         wxLongLong a = testLongs[n];
     for ( size_t n = 0; n < WXSIZEOF(testLongs); n++ )
     {
         wxLongLong a = testLongs[n];

-        s1 = wxString::Format(_T("%ld"), testLongs[n]);
+        s1 = wxString::Format(wxT("%ld"), testLongs[n]);

         s2 = a.ToString();
         CPPUNIT_ASSERT( s1 == s2 );
 
         s2 = a.ToString();
         CPPUNIT_ASSERT( s1 == s2 );
 


@@ -299,26 +303,38 @@ void LongLongTestCase::ToString()
     }
 
     wxLongLong a(0x12345678, 0x87654321);
     }
 
     wxLongLong a(0x12345678, 0x87654321);

-    CPPUNIT_ASSERT( a.ToString() == _T("1311768467139281697") );
+    CPPUNIT_ASSERT( a.ToString() == wxT("1311768467139281697") );

     a.Negate();
     a.Negate();

-    CPPUNIT_ASSERT( a.ToString() == _T("-1311768467139281697") );
+    CPPUNIT_ASSERT( a.ToString() == wxT("-1311768467139281697") );

 
 

-    wxLongLong llMin(LONG_MIN, 0);
-    CPPUNIT_ASSERT( a.ToString() == _T("-9223372036854775808") );
+    wxLongLong llMin(-2147483647L - 1L, 0);
+    CPPUNIT_ASSERT( llMin.ToString() == wxT("-9223372036854775808") );

 
 #if wxUSE_LONGLONG_WX
     wxLongLongWx a1(a.GetHi(), a.GetLo());
 
 #if wxUSE_LONGLONG_WX
     wxLongLongWx a1(a.GetHi(), a.GetLo());

-    CPPUNIT_ASSERT( a1.ToString() == _T("-1311768467139281697") );
+    CPPUNIT_ASSERT( a1.ToString() == wxT("-1311768467139281697") );

     a1.Negate();
     a1.Negate();

-    CPPUNIT_ASSERT( a1.ToString() == _T("1311768467139281697") );
+    CPPUNIT_ASSERT( a1.ToString() == wxT("1311768467139281697") );

 #endif
 
 #if wxUSE_LONGLONG_NATIVE
     wxLongLongNative a2(a.GetHi(), a.GetLo());
 #endif
 
 #if wxUSE_LONGLONG_NATIVE
     wxLongLongNative a2(a.GetHi(), a.GetLo());

-    CPPUNIT_ASSERT( a2.ToString() == _T("-1311768467139281697") );
+    CPPUNIT_ASSERT( a2.ToString() == wxT("-1311768467139281697") );

     a2.Negate();
     a2.Negate();

-    CPPUNIT_ASSERT( a2.ToString() == _T("1311768467139281697") );
+    CPPUNIT_ASSERT( a2.ToString() == wxT("1311768467139281697") );

 #endif
 
 }
 
 #endif
 
 }
 

+void LongLongTestCase::LoHi()
+{
+    wxLongLong ll(123, 456);
+    CPPUNIT_ASSERT_EQUAL( 456u, ll.GetLo() );
+    CPPUNIT_ASSERT_EQUAL( 123, ll.GetHi() );
+
+    wxULongLong ull(987, 654);
+    CPPUNIT_ASSERT_EQUAL( 654u, ull.GetLo() );
+    CPPUNIT_ASSERT_EQUAL( 987u, ull.GetHi() );
+}
+
+#endif // wxUSE_LONGLONG