]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix unit test build with wxUSE_ZIPSTREAM or wxUSE_TARSTREAM == 0.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 15 Jan 2012 12:28:57 +0000 (12:28 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 15 Jan 2012 12:28:57 +0000 (12:28 +0000)
Disable the tests using wxZipEntry when it's unavailable. Also do the same for
wxTarEntry.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

tests/misc/misctests.cpp

index fed7b1e4ff7164d8799658adbc5acc3157489f63..d50f0a2460dd519c91658ac42a7dda1104a82df1 100644 (file)
@@ -115,17 +115,21 @@ bool IsNull(void *p)
 
 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( IsNull(wxStaticCast(entry, wxTarEntry)) );
-    WX_ASSERT_FAILS_WITH_ASSERT( IsNull(wxStaticCast(&zipEntry, wxTarEntry)) );
+#endif // wxUSE_TARSTREAM
 }