move TestTextInputStream() function in CppUnit's TextStreamTestCase class

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

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.
      */
 
      * Register all sub stream test suites.
      */
 

-#if 0

     STREAM_REGISTER_SUB_SUITE(memStream);
     STREAM_REGISTER_SUB_SUITE(strStream);
     STREAM_REGISTER_SUB_SUITE(fileStream);
     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(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);
 
     extern CppUnit::Test* GetlargeFileSuite();
     Test *lfs = GetlargeFileSuite();
     if (lfs)
         suite->addTest(lfs);

-#endif
-
-    STREAM_REGISTER_SUB_SUITE(socketStream);

 
     /*
     ** Add more stream subtests here
 
     /*
     ** Add more stream subtests here