git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58778 c3d73ce0-8a6f...

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

diff --git a/tests/net/ipc.cpp b/tests/net/ipc.cpp
index 1ac9167f75303b42236e53a2a412fd01d42d1723..267a0ee5f7b814e4b4e048a6f9837089021a1080 100644 (file)
--- a/tests/net/ipc.cpp
+++ b/tests/net/ipc.cpp
@@ -15,6 +15,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+// FIXME: this tests currently hangs under Windows and this prevents buildbot
+//        builds from working so disabling it, but the real problem needs to
+//        be fixed, of course
+#ifndef __WXMSW__
+

 // this test needs threads as it runs the test server in a secondary thread
 #if wxUSE_THREADS
 
 // this test needs threads as it runs the test server in a secondary thread
 #if wxUSE_THREADS
 


@@ -26,6 +31,8 @@
 #include "wx/ipc.h"
 #include "wx/thread.h"
 
 #include "wx/ipc.h"
 #include "wx/thread.h"
 

+#define wxUSE_SOCKETS_FOR_IPC (!wxUSE_DDE_FOR_IPC)
+

 namespace
 {
 
 namespace
 {
 


@@ -91,8 +98,10 @@ public:
     {
         m_conn = NULL;
 
     {
         m_conn = NULL;
 

+#if wxUSE_SOCKETS_FOR_IPC

         // we must call this from the main thread
         wxSocketBase::Initialize();
         // we must call this from the main thread
         wxSocketBase::Initialize();

+#endif // wxUSE_SOCKETS_FOR_IPC

 
         // we need event dispatching to work for IPC server to work
         m_thread = new EventThread;
 
         // we need event dispatching to work for IPC server to work
         m_thread = new EventThread;


@@ -109,7 +118,9 @@ public:
 
         delete m_conn;
 
 
         delete m_conn;
 

+#if wxUSE_SOCKETS_FOR_IPC

         wxSocketBase::Shutdown();
         wxSocketBase::Shutdown();

+#endif // wxUSE_SOCKETS_FOR_IPC

     }
 
     virtual wxConnectionBase *OnAcceptConnection(const wxString& topic)
     }
 
     virtual wxConnectionBase *OnAcceptConnection(const wxString& topic)


@@ -177,7 +188,7 @@ private:
     DECLARE_NO_COPY_CLASS(IPCTestClient)
 };
 
     DECLARE_NO_COPY_CLASS(IPCTestClient)
 };
 

-static IPCTestClient gs_client;
+static IPCTestClient *gs_client = NULL;

 
 // ----------------------------------------------------------------------------
 // the test code itself
 
 // ----------------------------------------------------------------------------
 // the test code itself


@@ -202,28 +213,28 @@ private:
     DECLARE_NO_COPY_CLASS(IPCTestCase)
 };
 
     DECLARE_NO_COPY_CLASS(IPCTestCase)
 };
 

-// this test is not enabled by default because it requires an IPC server to run
-//CPPUNIT_TEST_SUITE_REGISTRATION( IPCTestCase );
+CPPUNIT_TEST_SUITE_REGISTRATION( IPCTestCase );

 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( IPCTestCase, "IPCTestCase" );
 
 void IPCTestCase::Connect()
 {
     gs_server = new IPCTestServer;
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( IPCTestCase, "IPCTestCase" );
 
 void IPCTestCase::Connect()
 {
     gs_server = new IPCTestServer;

+    gs_client = new IPCTestClient;

 
     // connecting to the wrong port should fail
 
     // connecting to the wrong port should fail

-    CPPUNIT_ASSERT( !gs_client.Connect("localhost", "2424", IPC_TEST_TOPIC) );
+    CPPUNIT_ASSERT( !gs_client->Connect("localhost", "2424", IPC_TEST_TOPIC) );

 
     // connecting using an unsupported topic should fail (unless the server
     // expects a ROT-13'd topic name...)
 
     // connecting using an unsupported topic should fail (unless the server
     // expects a ROT-13'd topic name...)

-    CPPUNIT_ASSERT( !gs_client.Connect("localhost", IPC_TEST_PORT, "VCP GRFG") );
+    CPPUNIT_ASSERT( !gs_client->Connect("localhost", IPC_TEST_PORT, "VCP GRFG") );

 
     // connecting to the right port on the right topic should succeed
 
     // connecting to the right port on the right topic should succeed

-    CPPUNIT_ASSERT( gs_client.Connect("localhost", IPC_TEST_PORT, IPC_TEST_TOPIC) );
+    CPPUNIT_ASSERT( gs_client->Connect("localhost", IPC_TEST_PORT, IPC_TEST_TOPIC) );

 }
 
 void IPCTestCase::Execute()
 {
 }
 
 void IPCTestCase::Execute()
 {

-    wxConnectionBase& conn = gs_client.GetConn();
+    wxConnectionBase& conn = gs_client->GetConn();

 
     const wxString s("Date");
     CPPUNIT_ASSERT( conn.Execute(s) );
 
     const wxString s("Date");
     CPPUNIT_ASSERT( conn.Execute(s) );


@@ -235,7 +246,12 @@ void IPCTestCase::Execute()
 
 void IPCTestCase::Disconnect()
 {
 
 void IPCTestCase::Disconnect()
 {

-    gs_client.Disconnect();
+    if ( gs_client )
+    {
+        gs_client->Disconnect();
+        delete gs_client;
+        gs_client = NULL;
+    }

 
     if ( gs_server )
     {
 
     if ( gs_server )
     {


@@ -245,3 +261,5 @@ void IPCTestCase::Disconnect()
 }
 
 #endif // wxUSE_THREADS
 }
 
 #endif // wxUSE_THREADS

+
+#endif // !__WXMSW__