The mmedia contrib requires sys/soundcard.h on unix, so disable it on unix

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

diff --git a/tests/streams/bstream.cpp b/tests/streams/bstream.cpp
index 6d17c74f36f09abb4044bc575ffff72c8e02b67c..5b1e307e452c12ebf04e0579ee21e8ff8dfacc4f 100644 (file)
--- a/tests/streams/bstream.cpp
+++ b/tests/streams/bstream.cpp
@@ -7,13 +7,9 @@
 // Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation
-    #pragma interface
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 // For compilers that support precompilation, includes "wx/wx.h".

-#include "wx/wxprec.h"
+// and "wx/cppunit.h"
+#include "testprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -24,10 +20,10 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-#include "wx/cppunit.h"

 #include "bstream.h"
 
 #include "bstream.h"
 

-using namespace CppUnit;
+using CppUnit::TestSuite;
+using CppUnit::Test;

 
 ///////////////////////////////////////////////////////////////////////////////
 // Streams main test suite, it houses all stream test suites.
 
 ///////////////////////////////////////////////////////////////////////////////
 // Streams main test suite, it houses all stream test suites.


@@ -36,8 +32,8 @@ using namespace CppUnit;
 class StreamCase : public TestSuite
 {
 public:
 class StreamCase : public TestSuite
 {
 public:

-    StreamCase() 
-        :TestSuite("Streams") 
+    StreamCase()
+        :TestSuite(STREAM_TEST_NAME)

     { /* Nothing extra */ }
     static Test *suite();
 };
     { /* Nothing extra */ }
     static Test *suite();
 };


@@ -49,13 +45,20 @@ Test *StreamCase::suite()
     /*
      * Register all sub stream test suites.
      */
     /*
      * Register all sub stream test suites.
      */

-    
+

     STREAM_REGISTER_SUB_SUITE(memStream);
     STREAM_REGISTER_SUB_SUITE(memStream);

+    STREAM_REGISTER_SUB_SUITE(strStream);

     STREAM_REGISTER_SUB_SUITE(fileStream);
     STREAM_REGISTER_SUB_SUITE(ffileStream);
     STREAM_REGISTER_SUB_SUITE(fileStream);
     STREAM_REGISTER_SUB_SUITE(ffileStream);

+    STREAM_REGISTER_SUB_SUITE(tempStream);

     STREAM_REGISTER_SUB_SUITE(zlibStream);
 
     STREAM_REGISTER_SUB_SUITE(zlibStream);
 

-    /* 
+    extern CppUnit::Test* GetlargeFileSuite();
+    Test *lfs = GetlargeFileSuite();
+    if (lfs)
+        suite->addTest(lfs);
+
+    /*

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