Repair the stream tests.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/streams/bstream.cpp b/tests/streams/bstream.cpp
index 82cbc34d6c6376e8600094e211f27a33671bb6b7..c3c54a33bf0329215843247c1f5975bcadbf3f7f 100644 (file)
--- a/tests/streams/bstream.cpp
+++ b/tests/streams/bstream.cpp
@@ -46,7 +46,6 @@ Test *StreamCase::suite()
      * Register all sub stream test suites.
      */
 
-#if 0
     STREAM_REGISTER_SUB_SUITE(memStream);
     STREAM_REGISTER_SUB_SUITE(strStream);
     STREAM_REGISTER_SUB_SUITE(fileStream);
@@ -54,14 +53,12 @@ Test *StreamCase::suite()
     STREAM_REGISTER_SUB_SUITE(tempStream);
     STREAM_REGISTER_SUB_SUITE(zlibStream);
     STREAM_REGISTER_SUB_SUITE(backStream);
+    STREAM_REGISTER_SUB_SUITE(socketStream);
 
     extern CppUnit::Test* GetlargeFileSuite();
     Test *lfs = GetlargeFileSuite();
     if (lfs)
         suite->addTest(lfs);
-#endif
-
-    STREAM_REGISTER_SUB_SUITE(socketStream);
 
     /*
     ** Add more stream subtests here

diff --git a/tests/streams/bstream.h b/tests/streams/bstream.h
index f3ae238c3318cfe46e8fe73634ddcb1f1b85b77c..0a1a608634e31ac25ec152bbf7ba5e231a4482b0 100644 (file)
--- a/tests/streams/bstream.h
+++ b/tests/streams/bstream.h
@@ -217,9 +217,6 @@ 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...
@@ -361,9 +358,6 @@ 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_EQUAL(0, stream_out.TellO());
         (void)stream_out.PutC('1');