bracing 10.7+ constant

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

diff --git a/tests/streams/socketstream.cpp b/tests/streams/socketstream.cpp
index 7a4002163a09416fb70a4bcb8036ac11c71b7d75..74b814f19e36120daa94948abab4f37d8a1aeb8c 100644 (file)
--- a/tests/streams/socketstream.cpp
+++ b/tests/streams/socketstream.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // RCS-ID:      $Id$
 // Copyright:   (c) 2008 Vadim Zeitlin
 // Author:      Vadim Zeitlin
 // RCS-ID:      $Id$
 // Copyright:   (c) 2008 Vadim Zeitlin

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

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


@@ -20,7 +20,6 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

-#include "wx/gsocket.h"

 #include "wx/socket.h"
 #include "wx/sckstrm.h"
 #include "wx/thread.h"
 #include "wx/socket.h"
 #include "wx/sckstrm.h"
 #include "wx/thread.h"


@@ -82,7 +81,10 @@ protected:
 
         wxSocketBase *socket = srv.Accept();
         if ( socket )
 
         wxSocketBase *socket = srv.Accept();
         if ( socket )

+        {

             (*m_accept)(*socket);
             (*m_accept)(*socket);

+            delete socket;
+        }

 
         return NULL;
     }
 
         return NULL;
     }


@@ -104,26 +106,33 @@ public:
     virtual void setUp();
     virtual void tearDown();
 
     virtual void setUp();
     virtual void tearDown();
 

-    CPPUNIT_TEST_SUITE(socketStream);
-        // Base class stream tests the socketStream supports.
-        CPPUNIT_TEST(Input_GetC);
-
-        // This one fails because wxSocketInputStream::Eof() is not implemented
-        // correctly
-        //CPPUNIT_TEST(Input_Read);
+    // repeat all socket tests several times with different socket flags, so we
+    // define this macro which is used several times in the test suite
+    //
+    // there must be some more elegant way to do this but I didn't find it...
+#define ALL_SOCKET_TESTS()                                                    \
+        CPPUNIT_TEST(Input_GetC);                                             \
+        CPPUNIT_TEST(Input_Eof);                                              \
+        CPPUNIT_TEST(Input_Read);                                             \
+        CPPUNIT_TEST(Input_LastRead);                                         \
+        CPPUNIT_TEST(Input_CanRead);                                          \
+        CPPUNIT_TEST(Input_Peek);                                             \
+        CPPUNIT_TEST(Input_Ungetch);                                          \
+                                                                              \
+        CPPUNIT_TEST(Output_PutC);                                            \
+        CPPUNIT_TEST(Output_Write);                                           \
+        CPPUNIT_TEST(Output_LastWrite)

 
 

-        // The other ones untested yet
+    CPPUNIT_TEST_SUITE(socketStream);
+        ALL_SOCKET_TESTS();
+        // some tests don't pass with NOWAIT flag but this is probably not a
+        // bug (TODO: check this)

 #if 0
 #if 0

-        CPPUNIT_TEST(Input_Eof);
-        CPPUNIT_TEST(Input_LastRead);
-        CPPUNIT_TEST(Input_CanRead);
-        CPPUNIT_TEST(Input_Peek);
-        CPPUNIT_TEST(Input_Ungetch);
-
-        CPPUNIT_TEST(Output_PutC);
-        CPPUNIT_TEST(Output_Write);
-        CPPUNIT_TEST(Output_LastWrite);
+        CPPUNIT_TEST( PseudoTest_SetNoWait );
+        ALL_SOCKET_TESTS();

 #endif
 #endif

+        CPPUNIT_TEST( PseudoTest_SetWaitAll );
+        ALL_SOCKET_TESTS();

     CPPUNIT_TEST_SUITE_END();
 
 private:
     CPPUNIT_TEST_SUITE_END();
 
 private:


@@ -144,12 +153,19 @@ private:
             ;
     }
 
             ;
     }
 

+    void PseudoTest_SetNoWait() { ms_flags = wxSOCKET_NOWAIT; }
+    void PseudoTest_SetWaitAll() { ms_flags = wxSOCKET_WAITALL; }
+

     wxSocketClient *m_readSocket,
                    *m_writeSocket;
     wxThread *m_writeThread,
              *m_readThread;
     wxSocketClient *m_readSocket,
                    *m_writeSocket;
     wxThread *m_writeThread,
              *m_readThread;

+
+    static wxSocketFlags ms_flags;

 };
 
 };
 

+wxSocketFlags socketStream::ms_flags = wxSOCKET_NONE;
+

 socketStream::socketStream()
 {
     m_readSocket =
 socketStream::socketStream()
 {
     m_readSocket =


@@ -158,12 +174,12 @@ socketStream::socketStream()
     m_writeThread =
     m_readThread = NULL;
 
     m_writeThread =
     m_readThread = NULL;
 

-    GSocket_Init();
+    wxSocketBase::Initialize();

 }
 
 socketStream::~socketStream()
 {
 }
 
 socketStream::~socketStream()
 {

-    GSocket_Cleanup();
+    wxSocketBase::Shutdown();

 }
 
 void socketStream::setUp()
 }
 
 void socketStream::setUp()


@@ -182,12 +198,10 @@ void socketStream::setUp()
         CPPUNIT_ASSERT_EQUAL( wxCOND_NO_ERROR, gs_cond.Wait() );
     }
 
         CPPUNIT_ASSERT_EQUAL( wxCOND_NO_ERROR, gs_cond.Wait() );
     }
 

-    m_readSocket = new wxSocketClient;
-    m_readSocket->SetTimeout(3);
+    m_readSocket = new wxSocketClient(ms_flags);

     CPPUNIT_ASSERT( m_readSocket->Connect(LocalAddress(TEST_PORT_READ)) );
 
     CPPUNIT_ASSERT( m_readSocket->Connect(LocalAddress(TEST_PORT_READ)) );
 

-    m_writeSocket = new wxSocketClient;
-    m_writeSocket->SetTimeout(3);
+    m_writeSocket = new wxSocketClient(ms_flags);

     CPPUNIT_ASSERT( m_writeSocket->Connect(LocalAddress(TEST_PORT_WRITE)) );
 }
 
     CPPUNIT_ASSERT( m_writeSocket->Connect(LocalAddress(TEST_PORT_WRITE)) );
 }