Fix wxFindWindowAtPoint() unit test to pass under GTK.

[wxWidgets.git] / tests / misc / metatest.cpp

diff --git a/tests/misc/metatest.cpp b/tests/misc/metatest.cpp
index ed1d4c388e927c84649aae44f95093282f9e0ebe..6d5261a55a1df1b4d54e11d6f59cf5c488901089 100644 (file)
--- a/tests/misc/metatest.cpp
+++ b/tests/misc/metatest.cpp
@@ -36,11 +36,13 @@ private:
         CPPUNIT_TEST( IsPod );
         CPPUNIT_TEST( IsMovable );
         CPPUNIT_TEST( ImplicitConversion );
         CPPUNIT_TEST( IsPod );
         CPPUNIT_TEST( IsMovable );
         CPPUNIT_TEST( ImplicitConversion );

+        CPPUNIT_TEST( MinMax );

     CPPUNIT_TEST_SUITE_END();
 
     void IsPod();
     void IsMovable();
     void ImplicitConversion();
     CPPUNIT_TEST_SUITE_END();
 
     void IsPod();
     void IsMovable();
     void ImplicitConversion();

+    void MinMax();

 
     DECLARE_NO_COPY_CLASS(MetaProgrammingTestCase)
 };
 
     DECLARE_NO_COPY_CLASS(MetaProgrammingTestCase)
 };


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

-// 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( MetaProgrammingTestCase,
                                        "MetaProgrammingTestCase" );
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MetaProgrammingTestCase,
                                        "MetaProgrammingTestCase" );
 


@@ -77,13 +79,6 @@ void MetaProgrammingTestCase::IsMovable()
 
 void MetaProgrammingTestCase::ImplicitConversion()
 {
 
 void MetaProgrammingTestCase::ImplicitConversion()
 {

-    // wxImplicitConversionType<> is used to implement wxMax(). We test it
-    // indirectly through that here.
-
-    // test that wxMax(1.1,1) returns float, not long int
-    float f = wxMax(1.1f, 1l);
-    CPPUNIT_ASSERT_EQUAL( 1.1f, f);
-

 #ifndef wxNO_RTTI
     CPPUNIT_ASSERT(typeid(wxImplicitConversionType<char,int>::value) == typeid(int));
     CPPUNIT_ASSERT(typeid(wxImplicitConversionType<int,unsigned>::value) == typeid(unsigned));
 #ifndef wxNO_RTTI
     CPPUNIT_ASSERT(typeid(wxImplicitConversionType<char,int>::value) == typeid(int));
     CPPUNIT_ASSERT(typeid(wxImplicitConversionType<int,unsigned>::value) == typeid(unsigned));


@@ -92,3 +87,19 @@ void MetaProgrammingTestCase::ImplicitConversion()
 #endif
 #endif // !wxNO_RTTI
 }
 #endif
 #endif // !wxNO_RTTI
 }

+
+void MetaProgrammingTestCase::MinMax()
+{
+    // test that wxMax(1.1,1) returns float, not long int
+    float f = wxMax(1.1f, 1l);
+    CPPUNIT_ASSERT_EQUAL( 1.1f, f);
+
+    // test that comparing signed and unsigned correctly returns unsigned: this
+    // may seem counterintuitive in this case but this is consistent with the
+    // standard C conversions
+    CPPUNIT_ASSERT_EQUAL( 1, wxMin(-1, 1u) );
+
+    CPPUNIT_ASSERT_EQUAL( -1., wxClip(-1.5, -1, 1) );
+    CPPUNIT_ASSERT_EQUAL( 0, wxClip(0, -1, 1) );
+    CPPUNIT_ASSERT_EQUAL( 1, wxClip(2l, -1, 1) );
+}