X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32d49041eb56f67c825a36fdf7388a0845913cb6..e118367990e341b7ba8e5f02295d7aa8def23d5b:/tests/streams/bstream.cpp

diff --git a/tests/streams/bstream.cpp b/tests/streams/bstream.cpp
index cdbc90eafa..2095a6323b 100644
--- a/tests/streams/bstream.cpp
+++ b/tests/streams/bstream.cpp
@@ -2,18 +2,13 @@
 // Name:        tests/streams/bstream.cpp
 // Purpose:     House the base stream test suite.
 // 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".
-#include "wx/wxprec.h"
+// and "wx/cppunit.h"
+#include "testprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -24,10 +19,10 @@
     #include "wx/wx.h"
 #endif
 
-#include "wx/cppunit.h"
 #include "bstream.h"
 
-using namespace CppUnit;
+using CppUnit::TestSuite;
+using CppUnit::Test;
 
 ///////////////////////////////////////////////////////////////////////////////
 // Streams main test suite, it houses all stream test suites.
@@ -36,8 +31,8 @@ using namespace CppUnit;
 class StreamCase : public TestSuite
 {
 public:
-    StreamCase() 
-        :TestSuite(STREAM_TEST_NAME) 
+    StreamCase()
+        :TestSuite(STREAM_TEST_NAME)
     { /* Nothing extra */ }
     static Test *suite();
 };
@@ -49,14 +44,22 @@ Test *StreamCase::suite()
     /*
      * Register all sub stream test suites.
      */
-    
+
     STREAM_REGISTER_SUB_SUITE(memStream);
     STREAM_REGISTER_SUB_SUITE(strStream);
     STREAM_REGISTER_SUB_SUITE(fileStream);
     STREAM_REGISTER_SUB_SUITE(ffileStream);
+    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);
+
+    /*
     ** Add more stream subtests here
     */
 
@@ -65,6 +68,6 @@ Test *StreamCase::suite()
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION(StreamCase);
-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(StreamCase, STREAM_TEST_NAME);