first round of debug/release merge: introduce wxDEBUG_LEVEL, for now defined as 1...

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

diff --git a/tests/longlong/longlongtest.cpp b/tests/longlong/longlongtest.cpp
index 3d4815db0958732bcea2874aeb852b344fce76d6..a9142a6fb5dba21cd896c7ea448ed7dc8c9929ff 100644 (file)
--- a/tests/longlong/longlongtest.cpp
+++ b/tests/longlong/longlongtest.cpp
@@ -24,6 +24,8 @@
 #include "wx/longlong.h"
 #include "wx/timer.h"
 
+#if wxUSE_LONGLONG
+
 // ----------------------------------------------------------------------------
 // helpers for testing
 // ----------------------------------------------------------------------------
@@ -66,6 +68,7 @@ private:
         CPPUNIT_TEST( Division );
         CPPUNIT_TEST( BitOperations );
         CPPUNIT_TEST( ToString );
+        CPPUNIT_TEST( LoHi );
     CPPUNIT_TEST_SUITE_END();
 
     void Conversion();
@@ -75,6 +78,7 @@ private:
     void Division();
     void BitOperations();
     void ToString();
+    void LoHi();
 
     DECLARE_NO_COPY_CLASS(LongLongTestCase)
 };
@@ -233,7 +237,7 @@ void LongLongTestCase::Division()
 
 void LongLongTestCase::BitOperations()
 {
-    for ( size_t n = 0; n < ITEMS; n++ )
+    for ( size_t m = 0; m < ITEMS; m++ )
     {
         wxLongLong a = RAND_LL();
 
@@ -303,7 +307,7 @@ void LongLongTestCase::ToString()
     a.Negate();
     CPPUNIT_ASSERT( a.ToString() == _T("-1311768467139281697") );
 
-    wxLongLong llMin(LONG_MIN, 0);
+    wxLongLong llMin(-2147483647L - 1L, 0);
     CPPUNIT_ASSERT( llMin.ToString() == _T("-9223372036854775808") );
 
 #if wxUSE_LONGLONG_WX
@@ -322,3 +326,15 @@ void LongLongTestCase::ToString()
 
 }
 
+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