applied patch 1378261

[wxWidgets.git] / tests / streams / bstream.h

diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h
index 3505fc33aadbb86786f2026a313d01134ce7b750..fc2d6fb237ca4cdb35761cad8f0716dc2ca84a5d 100644 (file)
--- a/tests/streams/bstream.h
+++ b/tests/streams/bstream.h
@@ -11,7 +11,6 @@
 #define _WX_TESTBSTREAM_H__
 
 #include "wx/cppunit.h"
 #define _WX_TESTBSTREAM_H__
 
 #include "wx/cppunit.h"

-using namespace CppUnit;

 
 ///////////////////////////////////////////////////////////////////////////////
 // Some macros preventing us from typing too much ;-)
 
 ///////////////////////////////////////////////////////////////////////////////
 // Some macros preventing us from typing too much ;-)


@@ -21,10 +20,10 @@ using namespace CppUnit;
 #define COMPOSE_TEST_NAME(Name) \
     STREAM_TEST_NAME "." #Name
 #define STREAM_REGISTER_SUB_SUITE(Name) \
 #define COMPOSE_TEST_NAME(Name) \
     STREAM_TEST_NAME "." #Name
 #define STREAM_REGISTER_SUB_SUITE(Name) \

-    extern Test* Get##Name##Suite(); \
+    extern CppUnit::Test* Get##Name##Suite(); \

     suite->addTest(Get##Name##Suite())
 #define STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE(Name) \
     suite->addTest(Get##Name##Suite())
 #define STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE(Name) \

-    Test* Get##Name##Suite() { return Name::suite(); }
+    CppUnit::Test* Get##Name##Suite() { return Name::suite(); }

 #define STREAM_TEST_SUBSUITE_NAMED_REGISTRATION(Name) \
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(Name) ); \
     STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name )
 #define STREAM_TEST_SUBSUITE_NAMED_REGISTRATION(Name) \
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(Name) ); \
     STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name )


@@ -34,7 +33,7 @@ using namespace CppUnit;
 // Template class that implements a test for all base stream functions.
 //
 
 // Template class that implements a test for all base stream functions.
 //
 

-template <class TStreamIn, class TStreamOut> class BaseStreamTestCase : public TestCase
+template <class TStreamIn, class TStreamOut> class BaseStreamTestCase : public CppUnit::TestCase

 {
 protected:
     typedef BaseStreamTestCase<TStreamIn, TStreamOut> StreamTestCase;
 {
 protected:
     typedef BaseStreamTestCase<TStreamIn, TStreamOut> StreamTestCase;


@@ -208,7 +207,7 @@ protected:
         CPPUNIT_ASSERT(stream_in.TellI() == 1);
         if (!m_bSimpleTellITest)
         {
         CPPUNIT_ASSERT(stream_in.TellI() == 1);
         if (!m_bSimpleTellITest)
         {

-            off_t pos = stream_in.SeekI(5, wxFromStart);
+            wxFileOffset pos = stream_in.SeekI(5, wxFromStart);

             CPPUNIT_ASSERT(stream_in.TellI() == pos);
             (void)stream_in.GetC();
             CPPUNIT_ASSERT(stream_in.TellI() == 6);
             CPPUNIT_ASSERT(stream_in.TellI() == pos);
             (void)stream_in.GetC();
             CPPUNIT_ASSERT(stream_in.TellI() == 6);


@@ -269,8 +268,8 @@ protected:
         TStreamOut &stream_out = CreateOutStream();
 
         char *buf = "Some text";
         TStreamOut &stream_out = CreateOutStream();
 
         char *buf = "Some text";

-        off_t i;
-        off_t len = (off_t) strlen(buf);
+        int i;
+        int len = strlen(buf);

         for (i = 0; i < len; i++)
             stream_out.PutC(buf[i]);
 
         for (i = 0; i < len; i++)
             stream_out.PutC(buf[i]);
 


@@ -285,7 +284,7 @@ protected:
 
         // Do the buffer version.
         char *buf = "Some text";
 
         // Do the buffer version.
         char *buf = "Some text";

-        off_t len = (off_t) strlen(buf);
+        int len = strlen(buf);

         (void)stream_out.Write(buf, len);
         CPPUNIT_ASSERT(stream_out.TellO() == len);
 
         (void)stream_out.Write(buf, len);
         CPPUNIT_ASSERT(stream_out.TellO() == len);
 


@@ -401,9 +400,12 @@ protected:
         DoDeleteInStream();
     }
     void DeleteOutStream()
         DoDeleteInStream();
     }
     void DeleteOutStream()

-    {
+    {        

         if (m_pCurrentOut == NULL)
             return;
         if (m_pCurrentOut == NULL)
             return;

+        
+        CPPUNIT_ASSERT(m_pCurrentOut->Close());
+        

         delete m_pCurrentOut;
         m_pCurrentOut = NULL;
         // Incase something extra needs to be done.
         delete m_pCurrentOut;
         m_pCurrentOut = NULL;
         // Incase something extra needs to be done.