///////////////////////////////////////////////////////////////////////////////
-// Name: tests/uris/uris.cpp
+// Name: tests/streams/textstreamtest.cpp
// Purpose: wxTextXXXStream unit test
// Author: Ryan Norton, Vince Harron
// Created: 2004-08-14
private:
CPPUNIT_TEST_SUITE( TextStreamTestCase );
CPPUNIT_TEST( Endline );
+ CPPUNIT_TEST( MiscTests );
#if wxUSE_LONGLONG
CPPUNIT_TEST( TestLongLong );
CPPUNIT_TEST_SUITE_END();
void Endline();
+ void MiscTests();
#if wxUSE_LONGLONG
void TestLongLong();
void TestEmbeddedZerosUTF16BEInput();
void TestEmbeddedZerosUTF32LEInput();
void TestEmbeddedZerosUTF32BEInput();
- void TestInput(wxFontEncoding encoding,
+ void TestInput(const wxMBConv& conv,
const void* encodedText,
size_t encodedSize );
#endif // wxUSE_UNICODE
// register in the unnamed registry so that these tests are run by default
CPPUNIT_TEST_SUITE_REGISTRATION( TextStreamTestCase );
-// 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( TextStreamTestCase, "TextStreamTestCase" );
TextStreamTestCase::TextStreamTestCase()
void TextStreamTestCase::Endline()
{
- wxFileOutputStream* pOutFile = new wxFileOutputStream(_T("test.txt"));
+ wxFileOutputStream* pOutFile = new wxFileOutputStream(wxT("test.txt"));
wxTextOutputStream* pOutText = new wxTextOutputStream(*pOutFile);
- *pOutText << _T("Test text") << endl
- << _T("More Testing Text (There should be newline before this)");
+ *pOutText << wxT("Test text") << endl
+ << wxT("More Testing Text (There should be newline before this)");
delete pOutText;
delete pOutFile;
- wxFileInputStream* pInFile = new wxFileInputStream(_T("test.txt"));
+ wxFileInputStream* pInFile = new wxFileInputStream(wxT("test.txt"));
char szIn[9 + NEWLINELEN];
delete pInFile;
}
+void TextStreamTestCase::MiscTests()
+{
+ wxString filename = wxT("testdata.fc");
+ wxFileInputStream fsIn(filename);
+ if ( !fsIn.Ok() )
+ {
+ return;
+ }
+
+ wxTextInputStream tis(fsIn);
+ CPPUNIT_ASSERT_EQUAL("# this is the test data file for wxFileConfig tests", tis.ReadLine());
+ CPPUNIT_ASSERT_EQUAL("value1=one", tis.ReadLine());
+ CPPUNIT_ASSERT_EQUAL("# a comment here", tis.ReadLine());
+ CPPUNIT_ASSERT_EQUAL("value2=two", tis.ReadLine());
+ CPPUNIT_ASSERT_EQUAL("value\\ with\\ spaces\\ inside\\ it=nothing special", tis.ReadLine());
+ CPPUNIT_ASSERT_EQUAL("path=$PATH", tis.ReadLine());
+}
+
#if wxUSE_LONGLONG
template <typename T>
static void DoTestRoundTrip(const T *values, size_t numValues)
{
{
- wxFileOutputStream fileOut(_T("test.txt"));
+ wxFileOutputStream fileOut(wxT("test.txt"));
wxTextOutputStream textOut(fileOut);
for ( size_t n = 0; n < numValues; n++ )
}
{
- wxFileInputStream fileIn(_T("test.txt"));
+ wxFileInputStream fileIn(wxT("test.txt"));
wxTextInputStream textIn(fileIn);
T value;
#if wxUSE_UNICODE
-const static wchar_t txtWchar[4] =
+static const wchar_t txtWchar[4] =
{
0x0041, // LATIN CAPITAL LETTER A
0x0100, // A WITH BREVE, LATIN SMALL LETTER
0x0100, // A WITH BREVE, LATIN SMALL LETTER
};
-const static unsigned char txtUtf8[6] =
+static const unsigned char txtUtf8[6] =
{
0x41, 0xc4, 0x80, 0x41, 0xc4, 0x80,
};
-const static unsigned char txtUtf16le[8] =
+static const unsigned char txtUtf16le[8] =
{
0x41, 0x00, 0x00, 0x01, 0x41, 0x00, 0x00, 0x01,
};
-const static unsigned char txtUtf16be[8] =
+static const unsigned char txtUtf16be[8] =
{
0x00, 0x41, 0x01, 0x00, 0x00, 0x41, 0x01, 0x00,
};
-const static unsigned char txtUtf32le[16] =
+static const unsigned char txtUtf32le[16] =
{
0x41, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
0x41, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
};
-const static unsigned char txtUtf32be[16] =
+static const unsigned char txtUtf32be[16] =
{
0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x01, 0x00,
0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x01, 0x00,
void TextStreamTestCase::TestUTF8Input()
{
- TestInput(wxFONTENCODING_UTF8, txtUtf8, sizeof(txtUtf8));
+ TestInput(wxConvUTF8, txtUtf8, sizeof(txtUtf8));
+ TestInput(wxCSConv(wxFONTENCODING_UTF8), txtUtf8, sizeof(txtUtf8));
}
void TextStreamTestCase::TestEmbeddedZerosUTF16LEInput()
{
- TestInput(wxFONTENCODING_UTF16LE, txtUtf16le, sizeof(txtUtf16le));
+ TestInput(wxMBConvUTF16LE(), txtUtf16le, sizeof(txtUtf16le));
+ TestInput(wxCSConv(wxFONTENCODING_UTF16LE), txtUtf16le, sizeof(txtUtf16le));
}
void TextStreamTestCase::TestEmbeddedZerosUTF16BEInput()
{
- TestInput(wxFONTENCODING_UTF16BE, txtUtf16be, sizeof(txtUtf16be));
+ TestInput(wxMBConvUTF16BE(), txtUtf16be, sizeof(txtUtf16be));
+ TestInput(wxCSConv(wxFONTENCODING_UTF16BE), txtUtf16be, sizeof(txtUtf16be));
}
void TextStreamTestCase::TestEmbeddedZerosUTF32LEInput()
{
- TestInput(wxFONTENCODING_UTF32LE, txtUtf32le, sizeof(txtUtf32le));
+ TestInput(wxMBConvUTF32LE(), txtUtf32le, sizeof(txtUtf32le));
+ TestInput(wxCSConv(wxFONTENCODING_UTF32LE), txtUtf32le, sizeof(txtUtf32le));
}
void TextStreamTestCase::TestEmbeddedZerosUTF32BEInput()
{
- TestInput(wxFONTENCODING_UTF32BE, txtUtf32be, sizeof(txtUtf32be));
+ TestInput(wxMBConvUTF32BE(), txtUtf32be, sizeof(txtUtf32be));
+ TestInput(wxCSConv(wxFONTENCODING_UTF32BE), txtUtf32be, sizeof(txtUtf32be));
}
-void TextStreamTestCase::TestInput(wxFontEncoding encoding,
+void TextStreamTestCase::TestInput(const wxMBConv& conv,
const void *encodedText,
size_t encodedSize)
{
- wxCSConv conv(encoding);
wxMemoryInputStream byteIn(encodedText, encodedSize);
wxTextInputStream textIn(byteIn, wxT("\n"), conv);
CPPUNIT_ASSERT_EQUAL( WXSIZEOF(txtWchar), temp.length() );
- CPPUNIT_ASSERT_EQUAL( 0, memcmp(txtWchar, temp.c_str(), sizeof(txtWchar)) );
+ CPPUNIT_ASSERT_EQUAL( 0, memcmp(txtWchar, temp.wc_str(), sizeof(txtWchar)) );
}
#endif // wxUSE_UNICODE