X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/764471557e06c8816b8cc8eb9924a1e3c78509d8..d1c063b90f4d09656f7b9b42dbad8e8f59c752b5:/tests/streams/memstream.cpp?ds=sidebyside diff --git a/tests/streams/memstream.cpp b/tests/streams/memstream.cpp index 731a9f6a0d..a9e8cd6ac1 100644 --- a/tests/streams/memstream.cpp +++ b/tests/streams/memstream.cpp @@ -4,7 +4,7 @@ // Author: Hans Van Leemputten // RCS-ID: $Id$ // Copyright: (c) 2004 Hans Van Leemputten -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". @@ -44,6 +44,7 @@ public: CPPUNIT_TEST(Input_Read); CPPUNIT_TEST(Input_Eof); CPPUNIT_TEST(Input_LastRead); + CPPUNIT_TEST(Input_CanRead); CPPUNIT_TEST(Input_SeekI); CPPUNIT_TEST(Input_TellI); CPPUNIT_TEST(Input_Peek); @@ -113,16 +114,16 @@ void memStream::Ctor_InFromIn() wxMemoryInputStream *pMemInStream2 = new wxMemoryInputStream(*pMemInStream1); CPPUNIT_ASSERT(pMemInStream2->IsOk()); CPPUNIT_ASSERT_EQUAL(pMemInStream1->GetLength(), pMemInStream2->GetLength()); - size_t len = pMemInStream2->GetLength(); + wxFileOffset len = pMemInStream2->GetLength(); char *dat = new char[len]; pMemInStream2->Read(dat, len); - CPPUNIT_ASSERT_EQUAL(len, pMemInStream2->LastRead()); + CPPUNIT_ASSERT_EQUAL(len, (wxFileOffset)pMemInStream2->LastRead()); wxStreamBuffer *buf = pMemInStream1->GetInputStreamBuffer(); void *pIn = buf->GetBufferStart(); CPPUNIT_ASSERT(memcmp(pIn, dat, len) == 0); delete pMemInStream2; - size_t len2 = len / 2; + wxFileOffset len2 = len / 2; CPPUNIT_ASSERT(len2); CPPUNIT_ASSERT(pMemInStream1->SeekI(-len2, wxFromCurrent) != wxInvalidOffset); pIn = buf->GetBufferPos(); @@ -130,7 +131,7 @@ void memStream::Ctor_InFromIn() CPPUNIT_ASSERT(pMemInStream2->IsOk()); CPPUNIT_ASSERT_EQUAL((wxFileOffset)len2, pMemInStream2->GetLength()); pMemInStream2->Read(dat, len2); - CPPUNIT_ASSERT_EQUAL(len2, pMemInStream2->LastRead()); + CPPUNIT_ASSERT_EQUAL(len2, (wxFileOffset)pMemInStream2->LastRead()); CPPUNIT_ASSERT(memcmp(pIn, dat, len2) == 0); delete[] dat;