Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/tests/misc/misctests.cpp b/tests/misc/misctests.cpp
index 3e63c5d034dc416c060b526ca687cf98102832ad..fed7b1e4ff7164d8799658adbc5acc3157489f63 100644 (file)
--- a/tests/misc/misctests.cpp
+++ b/tests/misc/misctests.cpp
@@ -50,7 +50,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( MiscTestCase );
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( MiscTestCase );
 

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


@@ -58,7 +58,8 @@ namespace
 
 bool AssertIfOdd(int n)
 {
 
 bool AssertIfOdd(int n)
 {

-    wxASSERT_MSG( !(n % 2), "parameter must be even" );
+    wxCHECK_MSG( !(n % 2), false, "parameter must be even" );
+

     return true;
 }
 
     return true;
 }
 


@@ -100,6 +101,18 @@ void MiscTestCase::Delete()
 #endif
 }
 
 #endif
 }
 

+namespace
+{
+
+// helper function used just to avoid warnings about value computed not being
+// used in WX_ASSERT_FAILS_WITH_ASSERT() in StaticCast() below
+bool IsNull(void *p)
+{
+    return p == NULL;
+}
+
+} // anonymous namespace
+

 void MiscTestCase::StaticCast()
 {
     wxTarEntry tarEntry;
 void MiscTestCase::StaticCast()
 {
     wxTarEntry tarEntry;


@@ -112,7 +125,7 @@ void MiscTestCase::StaticCast()
     entry = &zipEntry;
     CPPUNIT_ASSERT( wxStaticCast(entry, wxZipEntry) );
 
     entry = &zipEntry;
     CPPUNIT_ASSERT( wxStaticCast(entry, wxZipEntry) );
 

-    WX_ASSERT_FAILS_WITH_ASSERT( wxStaticCast(entry, wxTarEntry) );
-    WX_ASSERT_FAILS_WITH_ASSERT( wxStaticCast(&zipEntry, wxTarEntry) );
+    WX_ASSERT_FAILS_WITH_ASSERT( IsNull(wxStaticCast(entry, wxTarEntry)) );
+    WX_ASSERT_FAILS_WITH_ASSERT( IsNull(wxStaticCast(&zipEntry, wxTarEntry)) );

 }
 
 }