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

Use smart pointer instead of manual delete in wxConfig tests

Browse Source 
No real changes.
This commit is contained in:
Vadim Zeitlin
2021-03-09 17:00:23 +01:00
parent f5f2db8b44
commit 2e6bb341b7
2 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/config/config.cpp
View File

@@ -26,6 +26,7 @@
#include "wx/config.h" #include "wx/config.h"
#include "wx/colour.h" #include "wx/colour.h"
#include "wx/scopedptr.h"
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// the tests // the tests
@@ -35,8 +36,8 @@ TEST_CASE("wxConfig::ReadWriteLocal", "[config]")
{ {
wxString app = wxT("wxConfigTestCase"); wxString app = wxT("wxConfigTestCase");
wxString vendor = wxT("wxWidgets"); wxString vendor = wxT("wxWidgets");
wxConfig *config = new wxConfig(app, vendor, wxT(""), wxT(""), wxScopedPtr<wxConfig> config(new wxConfig(app, vendor, wxT(""), wxT(""),
wxCONFIG_USE_LOCAL_FILE); wxCONFIG_USE_LOCAL_FILE));
config->DeleteAll(); config->DeleteAll();
config->Write(wxT("string1"), wxT("abc")); config->Write(wxT("string1"), wxT("abc"));
config->Write(wxT("string2"), wxString(wxT("def"))); config->Write(wxT("string2"), wxString(wxT("def")));
@@ -48,10 +49,9 @@ TEST_CASE("wxConfig::ReadWriteLocal", "[config]")
config->Write(wxT("color1"), wxColour(11,22,33,44)); config->Write(wxT("color1"), wxColour(11,22,33,44));
#endif // wxHAS_CONFIG_TEMPLATE_RW #endif // wxHAS_CONFIG_TEMPLATE_RW
config->Flush(); config->Flush();
delete config;
config = new wxConfig(app, vendor, wxT(""), wxT(""), config.reset(new wxConfig(app, vendor, wxT(""), wxT(""),
wxCONFIG_USE_LOCAL_FILE); wxCONFIG_USE_LOCAL_FILE));
wxString string1 = config->Read(wxT("string1")); wxString string1 = config->Read(wxT("string1"));
CHECK( string1 == "abc" ); CHECK( string1 == "abc" );
string1 = config->Read(wxT("string1"), wxT("defaultvalue")); string1 = config->Read(wxT("string1"), wxT("defaultvalue"));
@@ -103,59 +103,58 @@ TEST_CASE("wxConfig::ReadWriteLocal", "[config]")
#endif // wxHAS_CONFIG_TEMPLATE_RW #endif // wxHAS_CONFIG_TEMPLATE_RW
config->DeleteAll(); config->DeleteAll();
delete config;
} }
// Helper of RecordingDefaultsTest() test. // Helper of RecordingDefaultsTest() test.
static static
size_t ReadValues(wxConfig *config, bool has_values) size_t ReadValues(const wxConfig& config, bool has_values)
{ {
size_t read = 0; size_t read = 0;
bool r; bool r;
wxString string1 = config->Read(wxT("string1"), wxT("abc")); wxString string1 = config.Read(wxT("string1"), wxT("abc"));
read++; read++;
wxString string2 = config->Read(wxT("string2"), wxString(wxT("def"))); wxString string2 = config.Read(wxT("string2"), wxString(wxT("def")));
read++; read++;
wxString string3; wxString string3;
r = config->Read(wxT("string3"), &string3, wxT("abc")); r = config.Read(wxT("string3"), &string3, wxT("abc"));
CHECK( r == has_values ); CHECK( r == has_values );
read++; read++;
wxString string4; wxString string4;
r = config->Read(wxT("string4"), &string4, wxString(wxT("def"))); r = config.Read(wxT("string4"), &string4, wxString(wxT("def")));
CHECK( r == has_values ); CHECK( r == has_values );
read++; read++;
int int1; int int1;
r = config->Read(wxT("int1"), &int1, 123); r = config.Read(wxT("int1"), &int1, 123);
CHECK( r == has_values ); CHECK( r == has_values );
read++; read++;
int int2 = config->Read(wxT("int2"), 1234); int int2 = config.Read(wxT("int2"), 1234);
CHECK( 1234 == int2 ); CHECK( 1234 == int2 );
read++; read++;
long long1; long long1;
r = config->Read(wxString(wxT("long1")), &long1, 234L); r = config.Read(wxString(wxT("long1")), &long1, 234L);
CHECK( r == has_values ); CHECK( r == has_values );
read++; read++;
double double1; double double1;
r = config->Read(wxT("double1"), &double1, 345.67); r = config.Read(wxT("double1"), &double1, 345.67);
CHECK( r == has_values ); CHECK( r == has_values );
read++; read++;
bool bool1; bool bool1;
r = config->Read(wxT("bool1"), &bool1, true); r = config.Read(wxT("bool1"), &bool1, true);
CHECK( r == has_values ); CHECK( r == has_values );
read++; read++;
#ifdef wxHAS_CONFIG_TEMPLATE_RW #ifdef wxHAS_CONFIG_TEMPLATE_RW
wxColour color1; wxColour color1;
r = config->Read(wxT("color1"), &color1, wxColour(11,22,33,44)); r = config.Read(wxT("color1"), &color1, wxColour(11,22,33,44));
CHECK( r == has_values ); CHECK( r == has_values );
read++; read++;
#endif // wxHAS_CONFIG_TEMPLATE_RW #endif // wxHAS_CONFIG_TEMPLATE_RW
@@ -168,18 +167,17 @@ TEST_CASE("wxConfig::RecordingDefaults", "[config]")
{ {
wxString app = wxT("wxConfigTestCaseRD"); wxString app = wxT("wxConfigTestCaseRD");
wxString vendor = wxT("wxWidgets"); wxString vendor = wxT("wxWidgets");
wxConfig *config = new wxConfig(app, vendor, wxT(""), wxT(""), wxScopedPtr<wxConfig> config(new wxConfig(app, vendor, wxT(""), wxT(""),
wxCONFIG_USE_LOCAL_FILE); wxCONFIG_USE_LOCAL_FILE));
config->DeleteAll(); config->DeleteAll();
config->SetRecordDefaults(false); // by default it is false config->SetRecordDefaults(false); // by default it is false
ReadValues(config, false); ReadValues(*config, false);
CHECK( config->GetNumberOfEntries() == 0 ); CHECK( config->GetNumberOfEntries() == 0 );
config->SetRecordDefaults(true); config->SetRecordDefaults(true);
size_t read = ReadValues(config, false); size_t read = ReadValues(*config, false);
CHECK( config->GetNumberOfEntries() == read ); CHECK( config->GetNumberOfEntries() == read );
ReadValues(config, true); ReadValues(*config, true);
config->DeleteAll(); config->DeleteAll();
delete config;
} }
#endif //wxUSE_CONFIG #endif //wxUSE_CONFIG

7
tests/config/regconf.cpp
View File

@@ -20,6 +20,8 @@
#include "wx/msw/regconf.h" #include "wx/msw/regconf.h"
#include "wx/scopedptr.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// test class // test class
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -31,8 +33,8 @@ TEST_CASE("wxRegConfig::ReadWrite", "[regconfig][config][registry]")
// NOTE: we use wxCONFIG_USE_LOCAL_FILE explicitly to test wxRegConfig // NOTE: we use wxCONFIG_USE_LOCAL_FILE explicitly to test wxRegConfig
// with something different from the default value wxCONFIG_USE_GLOBAL_FILE // with something different from the default value wxCONFIG_USE_GLOBAL_FILE
wxConfigBase *config = new wxRegConfig(app, vendor, wxT(""), wxT(""), wxScopedPtr<wxConfigBase> config(new wxRegConfig(app, vendor, wxT(""), wxT(""),
wxCONFIG_USE_LOCAL_FILE); wxCONFIG_USE_LOCAL_FILE));
// test writing // test writing
config->SetPath(wxT("/group1")); config->SetPath(wxT("/group1"));
@@ -53,7 +55,6 @@ TEST_CASE("wxRegConfig::ReadWrite", "[regconfig][config][registry]")
CHECK( config->Read(wxT("group2/entry1"), wxT("INVALID DEFAULT")) == "bar" ); CHECK( config->Read(wxT("group2/entry1"), wxT("INVALID DEFAULT")) == "bar" );
config->DeleteAll(); config->DeleteAll();
delete config;
} }
TEST_CASE("wxRegKey::DeleteFromRedirectedView", "[registry][64bits]") TEST_CASE("wxRegKey::DeleteFromRedirectedView", "[registry][64bits]")