Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crash under MSW due to constructing a static wxDDEClient instance (this arguably should work but currently doesn't because of use of (yet uninitialized) wxDDEClientObjects in wxDDEClient ctor)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-12 01:36:09 +00:00
parent 24689293df
commit 76a10a0dac
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/net/ipc.cpp
View File

@@ -183,7 +183,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
@@ -214,21 +214,22 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( IPCTestCase, "IPCTestCase" );
void IPCTestCase::Connect() void IPCTestCase::Connect()
{ {
gs_server = new IPCTestServer; 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 // connecting using an unsupported topic should fail (unless the server
// expects a ROT-13'd topic name...) // 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"); const wxString s("Date");
CPPUNIT_ASSERT( conn.Execute(s) ); CPPUNIT_ASSERT( conn.Execute(s) );
@@ -240,7 +241,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 )
{ {