X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a17023d37640250b419e0a4dc508de76be33a09a..c29c95fe24973b94fd724db767193171ca7c513d:/tests/misc/misctests.cpp

diff --git a/tests/misc/misctests.cpp b/tests/misc/misctests.cpp
index 3e63c5d034..fed7b1e4ff 100644
--- 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 );
 
-// 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
@@ -58,7 +58,8 @@ namespace
 
 bool AssertIfOdd(int n)
 {
-    wxASSERT_MSG( !(n % 2), "parameter must be even" );
+    wxCHECK_MSG( !(n % 2), false, "parameter must be even" );
+
     return true;
 }
 
@@ -100,6 +101,18 @@ void MiscTestCase::Delete()
 #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;
@@ -112,7 +125,7 @@ void MiscTestCase::StaticCast()
     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)) );
 }