solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Use wxSocketInitializer in the unit tests

Browse source 
Prefer using this RAII wrapper to explicit function calls, this is
shorter and more robust.
This commit is contained in:
Vadim Zeitlin 2023-05-18 00:06:21 +02:00
parent cc07a0fd9b
commit 1afcac9ca5
5 changed files with 9 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/uris/ftp.cpp
View file

@ -46,12 +46,7 @@ TEST_CASE("FTP", "[net][.]")
const wxString user = wxGetenv("WX_FTP_TEST_USER");
const wxString password = wxGetenv("WX_FTP_TEST_PASS");
class SocketInit
{
public:
SocketInit() { wxSocketBase::Initialize(); }
~SocketInit() { wxSocketBase::Shutdown(); }
} socketInit;
wxSocketInitializer socketInit;
// wxFTP cannot be a static variable as its ctor needs to access
// wxWidgets internals after it has been initialized

16
tests/uris/url.cpp
View file

@ -27,11 +27,11 @@
// test class
// ----------------------------------------------------------------------------
class URLTestCase : public CppUnit::TestCase
class URLTestCase : public CppUnit::TestCase, private wxSocketInitializer
{
public:
URLTestCase();
~URLTestCase();
URLTestCase() = default;
~URLTestCase() = default;
private:
CPPUNIT_TEST_SUITE( URLTestCase );
@ -52,16 +52,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION( URLTestCase );
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( URLTestCase, "URLTestCase" );
URLTestCase::URLTestCase()
{
wxSocketBase::Initialize();
}
URLTestCase::~URLTestCase()
{
wxSocketBase::Shutdown();
}
void URLTestCase::GetInputStream()
{
if (!IsNetworkAvailable()) // implemented in test.cpp