Change reference from GetForce to CanVeto

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

diff --git a/tests/longlong/longlongtest.cpp b/tests/longlong/longlongtest.cpp
index 93ef09515074c2cd48870c7161426012c132b98c..3d4815db0958732bcea2874aeb852b344fce76d6 100644 (file)
--- a/tests/longlong/longlongtest.cpp
+++ b/tests/longlong/longlongtest.cpp
@@ -11,7 +11,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#include "wx/wxprec.h"
+#include "testprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -24,8 +24,6 @@
 #include "wx/longlong.h"
 #include "wx/timer.h"
 
 #include "wx/longlong.h"
 #include "wx/timer.h"
 

-#include "wx/cppunit.h"
-

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


@@ -242,30 +240,30 @@ void LongLongTestCase::BitOperations()
         for ( size_t n = 0; n < 33; n++ )
         {
             wxLongLong b(a.GetHi(), a.GetLo()), c, d = b, e;
         for ( size_t n = 0; n < 33; n++ )
         {
             wxLongLong b(a.GetHi(), a.GetLo()), c, d = b, e;

-            d >>= n; 
-            c = b >> n; 
+            d >>= n;
+            c = b >> n;

             CPPUNIT_ASSERT( c == d );
             CPPUNIT_ASSERT( c == d );

-            d <<= n; 
-            e = c << n; 
+            d <<= n;
+            e = c << n;

             CPPUNIT_ASSERT( d == e );
 
 #if wxUSE_LONGLONG_WX
             wxLongLongWx b1(a.GetHi(), a.GetLo()), c1, d1 = b1, e1;
             CPPUNIT_ASSERT( d == e );
 
 #if wxUSE_LONGLONG_WX
             wxLongLongWx b1(a.GetHi(), a.GetLo()), c1, d1 = b1, e1;

-            d1 >>= n; 
-            c1 = b1 >> n; 
+            d1 >>= n;
+            c1 = b1 >> n;

             CPPUNIT_ASSERT( c1 == d1 );
             CPPUNIT_ASSERT( c1 == d1 );

-            d1 <<= n; 
-            e1 = c1 << n; 
+            d1 <<= n;
+            e1 = c1 << n;

             CPPUNIT_ASSERT( d1 == e1 );
 #endif
 
 #if wxUSE_LONGLONG_NATIVE
             wxLongLongNative b2(a.GetHi(), a.GetLo()), c2, d2 = b2, e2;
             CPPUNIT_ASSERT( d1 == e1 );
 #endif
 
 #if wxUSE_LONGLONG_NATIVE
             wxLongLongNative b2(a.GetHi(), a.GetLo()), c2, d2 = b2, e2;

-            d2 >>= n; 
-            c2 = b2 >> n; 
+            d2 >>= n;
+            c2 = b2 >> n;

             CPPUNIT_ASSERT( c2 == d2 );
             CPPUNIT_ASSERT( c2 == d2 );

-            d2 <<= n; 
-            e2 = c2 << n; 
+            d2 <<= n;
+            e2 = c2 << n;

             CPPUNIT_ASSERT( d2 == e2 );
 #endif
         }
             CPPUNIT_ASSERT( d2 == e2 );
 #endif
         }


@@ -283,6 +281,10 @@ void LongLongTestCase::ToString()
         s2 = a.ToString();
         CPPUNIT_ASSERT( s1 == s2 );
 
         s2 = a.ToString();
         CPPUNIT_ASSERT( s1 == s2 );
 

+        s2 = wxEmptyString;
+        s2 << a;
+        CPPUNIT_ASSERT( s1 == s2 );
+

 #if wxUSE_LONGLONG_WX
         wxLongLongWx a1 = testLongs[n];
         s2 = a1.ToString();
 #if wxUSE_LONGLONG_WX
         wxLongLongWx a1 = testLongs[n];
         s2 = a1.ToString();


@@ -301,6 +303,9 @@ void LongLongTestCase::ToString()
     a.Negate();
     CPPUNIT_ASSERT( a.ToString() == _T("-1311768467139281697") );
 
     a.Negate();
     CPPUNIT_ASSERT( a.ToString() == _T("-1311768467139281697") );
 

+    wxLongLong llMin(LONG_MIN, 0);
+    CPPUNIT_ASSERT( llMin.ToString() == _T("-9223372036854775808") );
+

 #if wxUSE_LONGLONG_WX
     wxLongLongWx a1(a.GetHi(), a.GetLo());
     CPPUNIT_ASSERT( a1.ToString() == _T("-1311768467139281697") );
 #if wxUSE_LONGLONG_WX
     wxLongLongWx a1(a.GetHi(), a.GetLo());
     CPPUNIT_ASSERT( a1.ToString() == _T("-1311768467139281697") );