227989f3e9
This function was broken for conversions using more than one byte per character (e.g. UTF-16 or UTF-32) and also even for UTF-8 for strings containing NUL bytes as it used strlen() to determine the number of bytes to write out instead of using the really needed number. Fix this by using the wxCharBuffer::length() method which always returns the correct value. Also add a wxFile unit test verifying that it can correctly read back a string written using any of UTF-8, UTF-16 or UTF-32. Closes #11192. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
96 lines
2.7 KiB
C++
96 lines
2.7 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: tests/file/filetest.cpp
|
|
// Purpose: wxFile unit test
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2009-09-12
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#include "testprec.h"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#if wxUSE_FILE
|
|
|
|
#include "wx/file.h"
|
|
|
|
#include "testfile.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// test class
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class FileTestCase : public CppUnit::TestCase
|
|
{
|
|
public:
|
|
FileTestCase() { }
|
|
|
|
private:
|
|
CPPUNIT_TEST_SUITE( FileTestCase );
|
|
CPPUNIT_TEST( RoundTripUTF8 );
|
|
CPPUNIT_TEST( RoundTripUTF16 );
|
|
CPPUNIT_TEST( RoundTripUTF32 );
|
|
CPPUNIT_TEST_SUITE_END();
|
|
|
|
void RoundTripUTF8() { DoRoundTripTest(wxConvUTF8); }
|
|
void RoundTripUTF16() { DoRoundTripTest(wxMBConvUTF16()); }
|
|
void RoundTripUTF32() { DoRoundTripTest(wxMBConvUTF32()); }
|
|
|
|
void DoRoundTripTest(const wxMBConv& conv);
|
|
|
|
wxDECLARE_NO_COPY_CLASS(FileTestCase);
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// CppUnit macros
|
|
// ----------------------------------------------------------------------------
|
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION( FileTestCase );
|
|
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( FileTestCase, "FileTestCase" );
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// tests implementation
|
|
// ----------------------------------------------------------------------------
|
|
|
|
void FileTestCase::DoRoundTripTest(const wxMBConv& conv)
|
|
{
|
|
TestFile tf;
|
|
|
|
const wxString data = "Hello\0UTF";
|
|
|
|
{
|
|
wxFile fout(tf.GetName(), wxFile::write);
|
|
CPPUNIT_ASSERT( fout.IsOpened() );
|
|
|
|
CPPUNIT_ASSERT( fout.Write(data, conv) );
|
|
}
|
|
|
|
{
|
|
wxFile fin(tf.GetName(), wxFile::read);
|
|
CPPUNIT_ASSERT( fin.IsOpened() );
|
|
|
|
const wxFileOffset len = fin.Length();
|
|
wxCharBuffer buf(len);
|
|
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_FILE
|