Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unit test build with wxUSE_ZIPSTREAM or wxUSE_TARSTREAM == 0.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2012-01-15 12:28:57 +00:00
parent 28c2cd426a
commit 2db3b9a6a4
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/misc/misctests.cpp
View File

@@ -115,17 +115,21 @@ bool IsNull(void *p)
void MiscTestCase::StaticCast() void MiscTestCase::StaticCast()
{ {
#if wxUSE_TARSTREAM
wxTarEntry tarEntry; wxTarEntry tarEntry;
CPPUNIT_ASSERT( wxStaticCast(&tarEntry, wxArchiveEntry) ); CPPUNIT_ASSERT( wxStaticCast(&tarEntry, wxArchiveEntry) );
wxArchiveEntry *entry = &tarEntry; wxArchiveEntry *entry = &tarEntry;
CPPUNIT_ASSERT( wxStaticCast(entry, wxTarEntry) ); CPPUNIT_ASSERT( wxStaticCast(entry, wxTarEntry) );
#if wxUSE_ZIPSTREAM
wxZipEntry zipEntry; wxZipEntry zipEntry;
entry = &zipEntry; entry = &zipEntry;
CPPUNIT_ASSERT( wxStaticCast(entry, wxZipEntry) ); 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(entry, wxTarEntry)) );
WX_ASSERT_FAILS_WITH_ASSERT( IsNull(wxStaticCast(&zipEntry, wxTarEntry)) ); #endif // wxUSE_TARSTREAM
} }