Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/tests/streams/bstream.cpp b/tests/streams/bstream.cpp
index cdbc90eafa0de90184b83661936a98c823bb9d4e..6f59e696e2a78b0690c86e6a81ae2769b598ed48 100644 (file)
--- a/tests/streams/bstream.cpp
+++ b/tests/streams/bstream.cpp
@@ -4,16 +4,12 @@
 // 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

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

-#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(STREAM_TEST_NAME) 
+    StreamCase()
+        :TestSuite(STREAM_TEST_NAME)

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


@@ -49,14 +45,22 @@ Test *StreamCase::suite()
     /*
      * Register all sub stream test suites.
      */
     /*
      * 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(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(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
     */
 
     ** Add more stream subtests here
     */
 


@@ -65,6 +69,6 @@ Test *StreamCase::suite()
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION(StreamCase);
 
 // 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);
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(StreamCase, STREAM_TEST_NAME);