X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/340da6aec02a5ec245cb6bd6018f3d46e27d8b76..8329fea8ad89a4df6c2f0441facdc5ad189473ea:/tests/streams/filestream.cpp diff --git a/tests/streams/filestream.cpp b/tests/streams/filestream.cpp index a5cd6ac5c0..ccec25fd47 100644 --- a/tests/streams/filestream.cpp +++ b/tests/streams/filestream.cpp @@ -7,13 +7,9 @@ // Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation - #pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" +// and "wx/cppunit.h" +#include "testprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -24,14 +20,10 @@ #include "wx/wx.h" #endif -#include "wx/cppunit.h" #include "wx/wfstream.h" #include "bstream.h" -using namespace std; -using namespace CppUnit; - #define DATABUFFER_SIZE 1024 static const wxString FILENAME_FILEINSTREAM = _T("fileinstream.test"); @@ -74,7 +66,7 @@ protected: private: // Implement base class functions. - virtual wxFileInputStream *DoCreateInStream(); + virtual wxFileInputStream *DoCreateInStream(); virtual wxFileOutputStream *DoCreateOutStream(); virtual void DoDeleteOutStream(); @@ -84,7 +76,7 @@ private: fileStream::fileStream() { - /* Nothing extra */ + m_bSeekInvalidBeyondEnd = false; } fileStream::~fileStream() @@ -94,14 +86,14 @@ fileStream::~fileStream() ::wxRemoveFile(FILENAME_FILEOUTSTREAM); } -wxFileInputStream *fileStream::DoCreateInStream() -{ +wxFileInputStream *fileStream::DoCreateInStream() +{ wxFileInputStream *pFileInStream = new wxFileInputStream(GetInFileName()); CPPUNIT_ASSERT(pFileInStream->IsOk()); return pFileInStream; } wxFileOutputStream *fileStream::DoCreateOutStream() -{ +{ wxFileOutputStream *pFileOutStream = new wxFileOutputStream(FILENAME_FILEOUTSTREAM); CPPUNIT_ASSERT(pFileOutStream->IsOk()); return pFileOutStream; @@ -123,7 +115,7 @@ wxString fileStream::GetInFileName() const // Make sure we have a input file... char buf[DATABUFFER_SIZE]; wxFileOutputStream out(FILENAME_FILEINSTREAM); - + // Init the data buffer. for (size_t i = 0; i < DATABUFFER_SIZE; i++) buf[i] = (i % 0xFF);