X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2eabfe86603fe932b61c513577a8e1b7d0fb815..37d8aa5b686ec3b48aa9a6c480dd06738c5a9e64:/tests/streams/bstream.h diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h index 36394c56f3..83f7d9d49e 100644 --- a/tests/streams/bstream.h +++ b/tests/streams/bstream.h @@ -4,7 +4,7 @@ // Author: Hans Van Leemputten // RCS-ID: $Id$ // Copyright: (c) 2004 Hans Van Leemputten -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_TESTBSTREAM_H__ @@ -28,9 +28,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(Name) ); \ STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name ) - -WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxFileOffset) - /////////////////////////////////////////////////////////////////////////////// // Template class that implements a test for all base stream functions. // @@ -84,7 +81,7 @@ protected: const TStreamIn &stream_in = CreateInStream(); CPPUNIT_ASSERT(!stream_in.Eof()); - // Size should be greater then zero. + // Size should be greater than zero. // Note: streams not supporting this should register this test // with CPPUNIT_TEST_FAIL instead of CPPUNIT_TEST. CPPUNIT_ASSERT(stream_in.GetSize() != 0); @@ -157,7 +154,7 @@ protected: // Check EOF stream state. CPPUNIT_ASSERT_MESSAGE("EOF is not EOF?", stream_in.Eof()); - // Ok we found the end, lets see if we can go past it. + // Ok we found the end, let's see if we can go past it. for (size_t i = 0; i < 100; i++) (void)stream_in.GetC(); @@ -220,9 +217,6 @@ protected: CleanupHelper cleanup(this); TStreamIn &stream_in = CreateInStream(); - // this test shouldn't be used at all if the stream isn't seekable - CPPUNIT_ASSERT( stream_in.IsSeekable() ); - CPPUNIT_ASSERT(!stream_in.Eof()); // Try to Get the location in the stream... @@ -364,9 +358,6 @@ protected: CleanupHelper cleanup(this); TStreamOut &stream_out = CreateOutStream(); - // If this test is used, the stream must be seekable - CPPUNIT_ASSERT( stream_out.IsSeekable() ); - // Try to Get the location in the stream... CPPUNIT_ASSERT_EQUAL(0, stream_out.TellO()); (void)stream_out.PutC('1'); @@ -403,7 +394,7 @@ protected: { if (m_pCurrentIn) { - wxFAIL_MSG(_T("Error in test case, the previouse input stream needs to be delete first!")); + wxFAIL_MSG(wxT("Error in test case, the previouse input stream needs to be delete first!")); } m_pCurrentIn = DoCreateInStream(); @@ -414,7 +405,7 @@ protected: { if (m_pCurrentOut) { - wxFAIL_MSG(_T("Error in test case, the previouse output stream needs to be delete first!")); + wxFAIL_MSG(wxT("Error in test case, the previouse output stream needs to be delete first!")); } m_pCurrentOut = DoCreateOutStream(); @@ -428,7 +419,7 @@ protected: return; delete m_pCurrentIn; m_pCurrentIn = NULL; - // Incase something extra needs to be done. + // In case something extra needs to be done. DoDeleteInStream(); } void DeleteOutStream() @@ -440,7 +431,7 @@ protected: delete m_pCurrentOut; m_pCurrentOut = NULL; - // Incase something extra needs to be done. + // In case something extra needs to be done. DoDeleteOutStream(); }