bracing 10.7+ constant

[wxWidgets.git] / tests / streams / filestream.cpp

diff --git a/tests/streams/filestream.cpp b/tests/streams/filestream.cpp
index a5cd6ac5c0d84187ca35442acc0716c4206701d5..d23ea8bd867d01354e85030a0cb3d7c78888231b 100644 (file)
--- a/tests/streams/filestream.cpp
+++ b/tests/streams/filestream.cpp
@@ -4,16 +4,12 @@
 // Author:      Hans Van Leemputten
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Hans Van Leemputten
 // Author:      Hans Van Leemputten
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Hans Van Leemputten

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation
-    #pragma interface
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 // For compilers that support precompilation, includes "wx/wx.h".

-#include "wx/wxprec.h"
+// and "wx/cppunit.h"
+#include "testprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -24,18 +20,14 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-#include "wx/cppunit.h"

 #include "wx/wfstream.h"
 
 #include "bstream.h"
 
 #include "wx/wfstream.h"
 
 #include "bstream.h"
 

-using namespace std;
-using namespace CppUnit;
-

 #define DATABUFFER_SIZE     1024
 
 #define DATABUFFER_SIZE     1024
 

-static const wxString FILENAME_FILEINSTREAM = _T("fileinstream.test");
-static const wxString FILENAME_FILEOUTSTREAM = _T("fileoutstream.test");
+static const wxString FILENAME_FILEINSTREAM = wxT("fileinstream.test");
+static const wxString FILENAME_FILEOUTSTREAM = wxT("fileoutstream.test");

 
 ///////////////////////////////////////////////////////////////////////////////
 // The test case
 
 ///////////////////////////////////////////////////////////////////////////////
 // The test case


@@ -55,6 +47,7 @@ public:
         CPPUNIT_TEST(Input_Read);
         CPPUNIT_TEST(Input_Eof);
         CPPUNIT_TEST(Input_LastRead);
         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);
         CPPUNIT_TEST(Input_SeekI);
         CPPUNIT_TEST(Input_TellI);
         CPPUNIT_TEST(Input_Peek);


@@ -74,7 +67,7 @@ protected:
 
 private:
     // Implement base class functions.
 
 private:
     // Implement base class functions.

-    virtual wxFileInputStream  *DoCreateInStream();  
+    virtual wxFileInputStream  *DoCreateInStream();

     virtual wxFileOutputStream *DoCreateOutStream();
     virtual void DoDeleteOutStream();
 
     virtual wxFileOutputStream *DoCreateOutStream();
     virtual void DoDeleteOutStream();
 


@@ -84,7 +77,7 @@ private:
 
 fileStream::fileStream()
 {
 
 fileStream::fileStream()
 {

-    /* Nothing extra */
+    m_bSeekInvalidBeyondEnd = false;

 }
 
 fileStream::~fileStream()
 }
 
 fileStream::~fileStream()


@@ -94,14 +87,14 @@ fileStream::~fileStream()
     ::wxRemoveFile(FILENAME_FILEOUTSTREAM);
 }
 
     ::wxRemoveFile(FILENAME_FILEOUTSTREAM);
 }
 

-wxFileInputStream *fileStream::DoCreateInStream()    
-{ 
+wxFileInputStream *fileStream::DoCreateInStream()
+{

     wxFileInputStream *pFileInStream = new wxFileInputStream(GetInFileName());
     CPPUNIT_ASSERT(pFileInStream->IsOk());
     return pFileInStream;
 }
 wxFileOutputStream *fileStream::DoCreateOutStream()
     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;
     wxFileOutputStream *pFileOutStream = new wxFileOutputStream(FILENAME_FILEOUTSTREAM);
     CPPUNIT_ASSERT(pFileOutStream->IsOk());
     return pFileOutStream;


@@ -123,7 +116,7 @@ wxString fileStream::GetInFileName() const
         // Make sure we have a input file...
         char buf[DATABUFFER_SIZE];
         wxFileOutputStream out(FILENAME_FILEINSTREAM);
         // 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);
         // Init the data buffer.
         for (size_t i = 0; i < DATABUFFER_SIZE; i++)
             buf[i] = (i % 0xFF);