Further improve caching of locale-specific data in wxNumberFormatter.

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

diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h
index 73041339778921b1b65126d999211033d30f2fc9..16548b626aba564aafc9cd74abab89bafa304621 100644 (file)
--- 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
 // Author:      Hans Van Leemputten
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Hans Van Leemputten

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

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TESTBSTREAM_H__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TESTBSTREAM_H__


@@ -28,12 +28,6 @@
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(Name) ); \
     STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name )
 
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(Name) ); \
     STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name )
 

-// under 64 bit platforms wxFileOffset is the same as long and we already have
-// WX_CPPUNIT_ALLOW_EQUALS_TO_INT(long) in wx/cppunit.h
-#if SIZEOF_LONG != 8
-WX_CPPUNIT_ALLOW_EQUALS_TO_INT(wxFileOffset)
-#endif
-

 ///////////////////////////////////////////////////////////////////////////////
 // Template class that implements a test for all base stream functions.
 //
 ///////////////////////////////////////////////////////////////////////////////
 // Template class that implements a test for all base stream functions.
 //


@@ -223,9 +217,6 @@ protected:
         CleanupHelper cleanup(this);
         TStreamIn &stream_in = CreateInStream();
 
         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.Eof());
 
         // Try to Get the location in the stream...


@@ -367,9 +358,6 @@ protected:
         CleanupHelper cleanup(this);
         TStreamOut &stream_out = CreateOutStream();
 
         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');
         // Try to Get the location in the stream...
         CPPUNIT_ASSERT_EQUAL(0, stream_out.TellO());
         (void)stream_out.PutC('1');


@@ -406,7 +394,7 @@ protected:
     {
         if (m_pCurrentIn)
         {
     {
         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();
         }
 
         m_pCurrentIn = DoCreateInStream();


@@ -417,7 +405,7 @@ protected:
     {
         if (m_pCurrentOut)
         {
     {
         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();
         }
 
         m_pCurrentOut = DoCreateOutStream();