Don't use GetThreadId() in wxMSW code.

[wxWidgets.git] / tests / net / socket.cpp

diff --git a/tests/net/socket.cpp b/tests/net/socket.cpp
index e571a566bfa446e3ee230ffa6a43ae28ebf7771a..3532618f8cfbc03ec3602b4b06f0756907874e2a 100644 (file)
--- a/tests/net/socket.cpp
+++ b/tests/net/socket.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

 ///////////////////////////////////////////////////////////////////////////////
 
 /*
 ///////////////////////////////////////////////////////////////////////////////
 
 /*


@@ -26,6 +26,8 @@
 #if wxUSE_SOCKETS
 
 #include "wx/socket.h"
 #if wxUSE_SOCKETS
 
 #include "wx/socket.h"

+#include "wx/url.h"
+#include "wx/sstream.h"

 #include "wx/evtloop.h"
 #include <memory>
 
 #include "wx/evtloop.h"
 #include <memory>
 


@@ -48,7 +50,8 @@ private:
         CPPUNIT_TEST( ReadNormal ); \
         CPPUNIT_TEST( ReadBlock ); \
         CPPUNIT_TEST( ReadNowait ); \
         CPPUNIT_TEST( ReadNormal ); \
         CPPUNIT_TEST( ReadBlock ); \
         CPPUNIT_TEST( ReadNowait ); \

-        CPPUNIT_TEST( ReadWaitall )
+        CPPUNIT_TEST( ReadWaitall ); \
+        CPPUNIT_TEST( UrlTest )

 
     CPPUNIT_TEST_SUITE( SocketTestCase );
         ALL_SOCKET_TESTS();
 
     CPPUNIT_TEST_SUITE( SocketTestCase );
         ALL_SOCKET_TESTS();


@@ -65,17 +68,23 @@ private:
         {
             m_useLoop = useLoop;
             if ( useLoop )
         {
             m_useLoop = useLoop;
             if ( useLoop )

+            {
+                m_evtLoopOld = wxEventLoopBase::GetActive();

                 SetActive(this);
                 SetActive(this);

+            }

         }
 
         virtual ~SocketTestEventLoop()
         {
             if ( m_useLoop )
         }
 
         virtual ~SocketTestEventLoop()
         {
             if ( m_useLoop )

-                SetActive(NULL);
+            {
+                wxEventLoopBase::SetActive(m_evtLoopOld);
+            }

         }
 
     private:
         bool m_useLoop;
         }
 
     private:
         bool m_useLoop;

+        wxEventLoopBase *m_evtLoopOld;

     };
 
     // get the address to connect to, if NULL is returned it means that the
     };
 
     // get the address to connect to, if NULL is returned it means that the


@@ -95,6 +104,8 @@ private:
     void ReadNowait();
     void ReadWaitall();
 
     void ReadNowait();
     void ReadWaitall();
 

+    void UrlTest();
+

     static bool ms_useLoop;
 
     DECLARE_NO_COPY_CLASS(SocketTestCase)
     static bool ms_useLoop;
 
     DECLARE_NO_COPY_CLASS(SocketTestCase)


@@ -174,7 +185,8 @@ void SocketTestCase::ReadNormal()
     sock->Read(bufSmall, WXSIZEOF(bufSmall));
 
     CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() );
     sock->Read(bufSmall, WXSIZEOF(bufSmall));
 
     CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() );

-    CPPUNIT_ASSERT_EQUAL( WXSIZEOF(bufSmall), sock->LastCount() );
+    CPPUNIT_ASSERT_EQUAL( WXSIZEOF(bufSmall), (size_t)sock->LastCount() );
+    CPPUNIT_ASSERT_EQUAL( WXSIZEOF(bufSmall), (size_t)sock->LastReadCount() );

 
 
     char bufBig[102400];
 
 
     char bufBig[102400];


@@ -182,6 +194,7 @@ void SocketTestCase::ReadNormal()
 
     CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() );
     CPPUNIT_ASSERT( WXSIZEOF(bufBig) >= sock->LastCount() );
 
     CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() );
     CPPUNIT_ASSERT( WXSIZEOF(bufBig) >= sock->LastCount() );

+    CPPUNIT_ASSERT( WXSIZEOF(bufBig) >= sock->LastReadCount() );

 }
 
 void SocketTestCase::ReadBlock()
 }
 
 void SocketTestCase::ReadBlock()


@@ -194,7 +207,8 @@ void SocketTestCase::ReadBlock()
     sock->Read(bufSmall, WXSIZEOF(bufSmall));
 
     CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() );
     sock->Read(bufSmall, WXSIZEOF(bufSmall));
 
     CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() );

-    CPPUNIT_ASSERT_EQUAL( WXSIZEOF(bufSmall), sock->LastCount() );
+    CPPUNIT_ASSERT_EQUAL( WXSIZEOF(bufSmall), (size_t)sock->LastCount() );
+    CPPUNIT_ASSERT_EQUAL( WXSIZEOF(bufSmall), (size_t)sock->LastReadCount() );

 
 
     char bufBig[102400];
 
 
     char bufBig[102400];


@@ -202,6 +216,7 @@ void SocketTestCase::ReadBlock()
 
     CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() );
     CPPUNIT_ASSERT( WXSIZEOF(bufBig) >= sock->LastCount() );
 
     CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() );
     CPPUNIT_ASSERT( WXSIZEOF(bufBig) >= sock->LastCount() );

+    CPPUNIT_ASSERT( WXSIZEOF(bufBig) >= sock->LastReadCount() );

 }
 
 void SocketTestCase::ReadNowait()
 }
 
 void SocketTestCase::ReadNowait()


@@ -230,7 +245,24 @@ void SocketTestCase::ReadWaitall()
     sock->Read(buf, WXSIZEOF(buf));
 
     CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() );
     sock->Read(buf, WXSIZEOF(buf));
 
     CPPUNIT_ASSERT_EQUAL( wxSOCKET_NOERROR, sock->LastError() );

-    CPPUNIT_ASSERT_EQUAL( WXSIZEOF(buf), sock->LastCount() );
+    CPPUNIT_ASSERT_EQUAL( WXSIZEOF(buf), (size_t)sock->LastCount() );
+    CPPUNIT_ASSERT_EQUAL( WXSIZEOF(buf), (size_t)sock->LastReadCount() );
+}
+
+void SocketTestCase::UrlTest()
+{
+    if ( gs_serverHost.empty() )
+        return;
+
+    SocketTestEventLoop loop(ms_useLoop);
+
+    wxURL url("http://" + gs_serverHost);
+
+    const std::auto_ptr<wxInputStream> in(url.GetInputStream());
+    CPPUNIT_ASSERT( in.get() );
+
+    wxStringOutputStream out;
+    CPPUNIT_ASSERT_EQUAL( wxSTREAM_EOF, in->Read(out).GetLastError() );

 }
 
 #endif // wxUSE_SOCKETS
 }
 
 #endif // wxUSE_SOCKETS