X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bd966d3cd9dd43f6b282ab004fe691f6f498c04..37d8aa5b686ec3b48aa9a6c480dd06738c5a9e64:/tests/streams/bstream.h diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h index 3ca1bf8030..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,7 +28,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(Name) ); \ STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name ) - /////////////////////////////////////////////////////////////////////////////// // Template class that implements a test for all base stream functions. // @@ -82,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); @@ -135,6 +134,9 @@ protected: // Travel to the end of the stream. while(!stream_in.Eof()) { + CPPUNIT_ASSERT_MESSAGE( "unexpected non-EOF stream error", + stream_in.IsOk() ); + // Read, we move one byte along. (void)stream_in.GetC(); #if 0 @@ -152,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(); @@ -170,9 +172,9 @@ protected: char buf[5]; (void)stream_in.Read(buf, 5); - CPPUNIT_ASSERT(stream_in.LastRead() == 5); + CPPUNIT_ASSERT_EQUAL(5, stream_in.LastRead()); (void)stream_in.GetC(); - CPPUNIT_ASSERT(stream_in.LastRead() == 1); + CPPUNIT_ASSERT_EQUAL(1, stream_in.LastRead()); } void Input_CanRead() @@ -200,10 +202,10 @@ protected: // Try to Seek in the stream... // Note: streams not supporting this should register this test // with CPPUNIT_TEST_FAIL instead of CPPUNIT_TEST. - CPPUNIT_ASSERT(stream_in.SeekI(2, wxFromStart) == 2); - CPPUNIT_ASSERT(stream_in.SeekI(2, wxFromCurrent) == 4); + CPPUNIT_ASSERT_EQUAL(2, stream_in.SeekI(2, wxFromStart)); + CPPUNIT_ASSERT_EQUAL(4, stream_in.SeekI(2, wxFromCurrent)); // Not sure the following line is correct, so test it differently. - //CPPUNIT_ASSERT(stream_in.SeekI(-2, wxFromEnd) == (off_t)stream_in.GetSize()-2); + //CPPUNIT_ASSERT_EQUAL(stream_in.GetSize()-2, stream_in.SeekI(-2, wxFromEnd)); CPPUNIT_ASSERT(stream_in.SeekI(-2, wxFromEnd) != wxInvalidOffset); // Go beyond the stream size. CPPUNIT_ASSERT((stream_in.SeekI(10, wxFromCurrent) == wxInvalidOffset) == m_bSeekInvalidBeyondEnd); @@ -215,25 +217,22 @@ 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... - CPPUNIT_ASSERT(stream_in.TellI() == 0); + CPPUNIT_ASSERT_EQUAL(0, stream_in.TellI()); (void)stream_in.GetC(); - CPPUNIT_ASSERT(stream_in.TellI() == 1); + CPPUNIT_ASSERT_EQUAL(1, stream_in.TellI()); if (!m_bSimpleTellITest) { wxFileOffset pos = stream_in.SeekI(5, wxFromStart); - CPPUNIT_ASSERT(stream_in.TellI() == pos); + CPPUNIT_ASSERT_EQUAL(pos, stream_in.TellI()); (void)stream_in.GetC(); - CPPUNIT_ASSERT(stream_in.TellI() == 6); + CPPUNIT_ASSERT_EQUAL(6, stream_in.TellI()); pos = stream_in.SeekI(2, wxFromCurrent); - CPPUNIT_ASSERT(stream_in.TellI() == pos); + CPPUNIT_ASSERT_EQUAL(pos, stream_in.TellI()); pos = stream_in.SeekI(5, wxFromStart); - CPPUNIT_ASSERT(stream_in.TellI() == pos); + CPPUNIT_ASSERT_EQUAL(pos, stream_in.TellI()); } } @@ -249,7 +248,7 @@ protected: char peekChar = stream_in.Peek(); char getChar = stream_in.GetC(); if (stream_in.LastRead() == 1) - CPPUNIT_ASSERT(peekChar == getChar); + CPPUNIT_ASSERT_EQUAL(getChar, peekChar); } } @@ -264,7 +263,7 @@ protected: size_t ungetsize = stream_in.Ungetch(ungetstr, strlen(ungetstr) + 1); if (ungetsize != 0) { - CPPUNIT_ASSERT(ungetsize == strlen(ungetstr) + 1); + CPPUNIT_ASSERT_EQUAL(strlen(ungetstr) + 1, ungetsize); char buf[10]; (void)stream_in.Read(buf, ungetsize); CPPUNIT_ASSERT(strcmp(buf, ungetstr) == 0); @@ -272,7 +271,7 @@ protected: if (stream_in.Ungetch('a')) { - CPPUNIT_ASSERT(stream_in.GetC() == 'a'); + CPPUNIT_ASSERT_EQUAL(int('a'), stream_in.GetC()); } } @@ -324,9 +323,9 @@ protected: const char *buf = "12345"; (void)stream_out.Write(buf, 5); - CPPUNIT_ASSERT(stream_out.LastWrite() == 5); + CPPUNIT_ASSERT_EQUAL(5, stream_out.LastWrite()); (void)stream_out.PutC('1'); - CPPUNIT_ASSERT(stream_out.LastWrite() == 1); + CPPUNIT_ASSERT_EQUAL(1, stream_out.LastWrite()); } // Just try to perform a SeekO() on the output stream. @@ -344,10 +343,10 @@ protected: // Try to Seek in the stream... // Note: streams not supporting this should register this test // with CPPUNIT_TEST_FAIL instead of CPPUNIT_TEST. - CPPUNIT_ASSERT(stream_out.SeekO(2, wxFromStart) == 2); - CPPUNIT_ASSERT(stream_out.SeekO(2, wxFromCurrent) == 4); + CPPUNIT_ASSERT_EQUAL(2, stream_out.SeekO(2, wxFromStart)); + CPPUNIT_ASSERT_EQUAL(4, stream_out.SeekO(2, wxFromCurrent)); // Not sure the following line is correct, so test it differently. - //CPPUNIT_ASSERT(stream_out.SeekO(-2, wxFromEnd) == (off_t)stream_in.GetSize()-2); + //CPPUNIT_ASSERT_EQUAL(stream_in.GetSize()-2, stream_out.SeekO(-2, wxFromEnd)); CPPUNIT_ASSERT(stream_out.SeekO(-2, wxFromEnd) != wxInvalidOffset); // Go beyond the stream size. CPPUNIT_ASSERT((stream_out.SeekO(10, wxFromCurrent) == wxInvalidOffset) == m_bSeekInvalidBeyondEnd); @@ -359,27 +358,24 @@ 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(stream_out.TellO() == 0); + CPPUNIT_ASSERT_EQUAL(0, stream_out.TellO()); (void)stream_out.PutC('1'); - CPPUNIT_ASSERT(stream_out.TellO() == 1); + CPPUNIT_ASSERT_EQUAL(1, stream_out.TellO()); if (!m_bSimpleTellOTest) { // First put some extra data in the stream, so it's not empty. const char *buf = "1234567890"; (void)stream_out.Write(buf, 10); - off_t pos = stream_out.SeekO(5, wxFromStart); - CPPUNIT_ASSERT(stream_out.TellO() == pos); + wxFileOffset pos = stream_out.SeekO(5, wxFromStart); + CPPUNIT_ASSERT_EQUAL(pos, stream_out.TellO()); (void)stream_out.PutC('1'); - CPPUNIT_ASSERT(stream_out.TellO() == 6); + CPPUNIT_ASSERT_EQUAL(6, stream_out.TellO()); pos = stream_out.SeekO(2, wxFromCurrent); - CPPUNIT_ASSERT(stream_out.TellO() == pos); + CPPUNIT_ASSERT_EQUAL(pos, stream_out.TellO()); pos = stream_out.SeekO(5, wxFromStart); - CPPUNIT_ASSERT(stream_out.TellO() == pos); + CPPUNIT_ASSERT_EQUAL(pos, stream_out.TellO()); } } @@ -398,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(); @@ -409,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(); @@ -423,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() @@ -435,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(); }