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

Remove wxT() from wxConfig unit tests

Browse Source 
Just remove the visual noise, no real changes.
This commit is contained in:
Vadim Zeitlin
2021-03-09 17:02:12 +01:00
parent 2e6bb341b7
commit 62cfa638c0
3 changed files with 244 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
tests/config/config.cpp
View File

@@ -34,72 +34,72 @@
TEST_CASE("wxConfig::ReadWriteLocal", "[config]")
{
wxString app = wxT("wxConfigTestCase");
wxString vendor = wxT("wxWidgets");
wxScopedPtr<wxConfig> config(new wxConfig(app, vendor, wxT(""), wxT(""),
wxString app = "wxConfigTestCase";
wxString vendor = "wxWidgets";
wxScopedPtr<wxConfig> config(new wxConfig(app, vendor, "", "",
wxCONFIG_USE_LOCAL_FILE));
config->DeleteAll();
config->Write(wxT("string1"), wxT("abc"));
config->Write(wxT("string2"), wxString(wxT("def")));
config->Write(wxT("int1"), 123);
config->Write(wxString(wxT("long1")), 234L);
config->Write(wxT("double1"), 345.67);
config->Write(wxT("bool1"), true);
config->Write("string1", "abc");
config->Write("string2", wxString("def"));
config->Write("int1", 123);
config->Write(wxString("long1"), 234L);
config->Write("double1", 345.67);
config->Write("bool1", true);
#ifdef wxHAS_CONFIG_TEMPLATE_RW
config->Write(wxT("color1"), wxColour(11,22,33,44));
config->Write("color1", wxColour(11,22,33,44));
#endif // wxHAS_CONFIG_TEMPLATE_RW
config->Flush();
config.reset(new wxConfig(app, vendor, wxT(""), wxT(""),
config.reset(new wxConfig(app, vendor, "", "",
wxCONFIG_USE_LOCAL_FILE));
wxString string1 = config->Read(wxT("string1"));
wxString string1 = config->Read("string1");
CHECK( string1 == "abc" );
string1 = config->Read(wxT("string1"), wxT("defaultvalue"));
string1 = config->Read("string1", "defaultvalue");
CHECK( string1 == "abc" );
wxString string2;
bool r = config->Read(wxT("string2"), &string2);
bool r = config->Read("string2", &string2);
CHECK( r );
CHECK( string2 == "def" );
r = config->Read(wxT("string2"), &string2, wxT("defaultvalue"));
r = config->Read("string2", &string2, "defaultvalue");
CHECK( r );
CHECK( string2 == "def" );
int int1 = config->Read(wxT("int1"), 5);
int int1 = config->Read("int1", 5);
CHECK( int1 == 123 );
long long1;
r = config->Read(wxT("long1"), &long1);
r = config->Read("long1", &long1);
CHECK( r );
CHECK( long1 == 234L );
CHECK( config->ReadLong(wxT("long1"), 0) == 234 );
CHECK( config->ReadLong("long1", 0) == 234 );
double double1;
r = config->Read(wxT("double1"), &double1);
r = config->Read("double1", &double1);
CHECK( r );
CHECK( double1 == 345.67 );
CHECK( config->ReadDouble(wxT("double1"), 0) == double1 );
CHECK( config->ReadDouble("double1", 0) == double1 );
bool bool1;
r = config->Read(wxT("foo"), &bool1); // there is no "foo" key
r = config->Read("foo", &bool1); // there is no "foo" key
CHECK( !r );
r = config->Read(wxT("bool1"), &bool1);
r = config->Read("bool1", &bool1);
CHECK( r );
CHECK( bool1 == true );
CHECK( config->ReadBool(wxT("bool1"), false) == bool1 );
CHECK( config->ReadBool("bool1", false) == bool1 );
#ifdef wxHAS_CONFIG_TEMPLATE_RW
wxColour color1;
r = config->Read(wxT("color1"), &color1);
r = config->Read("color1", &color1);
CHECK( r );
CHECK( color1 == wxColour(11,22,33,44) );
CHECK( config->ReadObject(wxT("color1"), wxNullColour) == color1 );
CHECK( config->ReadObject("color1", wxNullColour) == color1 );
#endif // wxHAS_CONFIG_TEMPLATE_RW
config->DeleteAll();
@@ -112,49 +112,49 @@ size_t ReadValues(const wxConfig& config, bool has_values)
size_t read = 0;
bool r;
wxString string1 = config.Read(wxT("string1"), wxT("abc"));
wxString string1 = config.Read("string1", "abc");
read++;
wxString string2 = config.Read(wxT("string2"), wxString(wxT("def")));
wxString string2 = config.Read("string2", wxString("def"));
read++;
wxString string3;
r = config.Read(wxT("string3"), &string3, wxT("abc"));
r = config.Read("string3", &string3, "abc");
CHECK( r == has_values );
read++;
wxString string4;
r = config.Read(wxT("string4"), &string4, wxString(wxT("def")));
r = config.Read("string4", &string4, wxString("def"));
CHECK( r == has_values );
read++;
int int1;
r = config.Read(wxT("int1"), &int1, 123);
r = config.Read("int1", &int1, 123);
CHECK( r == has_values );
read++;
int int2 = config.Read(wxT("int2"), 1234);
int int2 = config.Read("int2", 1234);
CHECK( 1234 == int2 );
read++;
long long1;
r = config.Read(wxString(wxT("long1")), &long1, 234L);
r = config.Read(wxString("long1"), &long1, 234L);
CHECK( r == has_values );
read++;
double double1;
r = config.Read(wxT("double1"), &double1, 345.67);
r = config.Read("double1", &double1, 345.67);
CHECK( r == has_values );
read++;
bool bool1;
r = config.Read(wxT("bool1"), &bool1, true);
r = config.Read("bool1", &bool1, true);
CHECK( r == has_values );
read++;
#ifdef wxHAS_CONFIG_TEMPLATE_RW
wxColour color1;
r = config.Read(wxT("color1"), &color1, wxColour(11,22,33,44));
r = config.Read("color1", &color1, wxColour(11,22,33,44));
CHECK( r == has_values );
read++;
#endif // wxHAS_CONFIG_TEMPLATE_RW
@@ -165,9 +165,9 @@ size_t ReadValues(const wxConfig& config, bool has_values)
TEST_CASE("wxConfig::RecordingDefaults", "[config]")
{
wxString app = wxT("wxConfigTestCaseRD");
wxString vendor = wxT("wxWidgets");
wxScopedPtr<wxConfig> config(new wxConfig(app, vendor, wxT(""), wxT(""),
wxString app = "wxConfigTestCaseRD";
wxString vendor = "wxWidgets";
wxScopedPtr<wxConfig> config(new wxConfig(app, vendor, "", "",
wxCONFIG_USE_LOCAL_FILE));
config->DeleteAll();
config->SetRecordDefaults(false); // by default it is false