Re-enable wxAny<double>::GetAs<wxString>() test.

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

diff --git a/tests/misc/misctests.cpp b/tests/misc/misctests.cpp
index 9e42f1cca36810cc62712690489c665a3b2503ef..d50f0a2460dd519c91658ac42a7dda1104a82df1 100644 (file)
--- a/tests/misc/misctests.cpp
+++ b/tests/misc/misctests.cpp
@@ -50,15 +50,17 @@ 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
 {
 
-void 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;
 }
 
 } // anonymous namespace
@@ -99,19 +101,35 @@ 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()
 {
+#if wxUSE_TARSTREAM
     wxTarEntry tarEntry;
     CPPUNIT_ASSERT( wxStaticCast(&tarEntry, wxArchiveEntry) );
 
     wxArchiveEntry *entry = &tarEntry;
     CPPUNIT_ASSERT( wxStaticCast(entry, wxTarEntry) );
 
+#if wxUSE_ZIPSTREAM
     wxZipEntry zipEntry;
     entry = &zipEntry;
     CPPUNIT_ASSERT( wxStaticCast(entry, wxZipEntry) );
+    WX_ASSERT_FAILS_WITH_ASSERT( IsNull(wxStaticCast(&zipEntry, wxTarEntry)) );
+#endif // wxUSE_ZIPSTREAM
 
-    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)) );
+#endif // wxUSE_TARSTREAM
 }