From 174649c955f5f51673b6a392ea4cf9edbb1e7f45 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 25 Mar 2009 13:32:53 +0000 Subject: [PATCH] fix tests for the release builds git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/misc/misctests.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/tests/misc/misctests.cpp b/tests/misc/misctests.cpp index 3e63c5d034..25459a11c9 100644 --- a/tests/misc/misctests.cpp +++ b/tests/misc/misctests.cpp @@ -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)) ); } -- 2.47.2