diff --git a/tests/file/filetest.cpp b/tests/file/filetest.cpp index 85e70ab8e6..446a59fa8d 100644 --- a/tests/file/filetest.cpp +++ b/tests/file/filetest.cpp @@ -34,15 +34,19 @@ public: private: CPPUNIT_TEST_SUITE( FileTestCase ); +#if wxUSE_UNICODE CPPUNIT_TEST( RoundTripUTF8 ); CPPUNIT_TEST( RoundTripUTF16 ); CPPUNIT_TEST( RoundTripUTF32 ); +#endif // wxUSE_UNICODE CPPUNIT_TEST( TempFile ); CPPUNIT_TEST_SUITE_END(); +#if wxUSE_UNICODE void RoundTripUTF8() { DoRoundTripTest(wxConvUTF8); } void RoundTripUTF16() { DoRoundTripTest(wxMBConvUTF16()); } void RoundTripUTF32() { DoRoundTripTest(wxMBConvUTF32()); } +#endif // wxUSE_UNICODE void DoRoundTripTest(const wxMBConv& conv); void TempFile(); @@ -61,6 +65,8 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( FileTestCase, "FileTestCase" ); // tests implementation // ---------------------------------------------------------------------------- +#if wxUSE_UNICODE + void FileTestCase::DoRoundTripTest(const wxMBConv& conv) { TestFile tf; @@ -83,17 +89,12 @@ void FileTestCase::DoRoundTripTest(const wxMBConv& conv) CPPUNIT_ASSERT_EQUAL( len, fin.Read(buf.data(), len) ); wxWCharBuffer wbuf(conv.cMB2WC(buf)); -#if wxUSE_UNICODE CPPUNIT_ASSERT_EQUAL( data, wbuf ); -#else // !wxUSE_UNICODE - CPPUNIT_ASSERT - ( - memcmp(wbuf, L"Hello\0UTF", data.length()*sizeof(wchar_t)) == 0 - ); -#endif // wxUSE_UNICODE/!wxUSE_UNICODE } } +#endif // wxUSE_UNICODE + void FileTestCase::TempFile() { wxTempFile tmpFile;