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

ensure the number of values we expect to record in RecordingDefaultsTest() is always correct (fixes test failure under VC6)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-25 13:43:31 +00:00
parent e7b8af652f
commit 955e1ce861
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/config/config.cpp
View File

@@ -44,7 +44,8 @@ private:
void ReadWriteLocalTest(); void ReadWriteLocalTest();
void RecordingDefaultsTest(); void RecordingDefaultsTest();
void ReadValues(wxConfig *config, bool has_values); // return the number of values we (attempted to) read
int ReadValues(wxConfig *config, bool has_values);
DECLARE_NO_COPY_CLASS(ConfigTestCase) DECLARE_NO_COPY_CLASS(ConfigTestCase)
}; };
@@ -130,35 +131,59 @@ void ConfigTestCase::ReadWriteLocalTest()
delete config; delete config;
} }
void ConfigTestCase::ReadValues(wxConfig *config, bool has_values) int ConfigTestCase::ReadValues(wxConfig *config, bool has_values)
{ {
int read = 0;
bool r; bool r;
wxString string1 = config->Read(wxT("string1"), wxT("abc")); wxString string1 = config->Read(wxT("string1"), wxT("abc"));
read++;
wxString string2 = config->Read(wxT("string2"), wxString(wxT("def"))); wxString string2 = config->Read(wxT("string2"), wxString(wxT("def")));
wxString string3, string4; read++;
wxString string3;
r = config->Read(wxT("string3"), &string3, wxT("abc")); r = config->Read(wxT("string3"), &string3, wxT("abc"));
CPPUNIT_ASSERT_EQUAL( has_values, r ); CPPUNIT_ASSERT_EQUAL( has_values, r );
read++;
wxString string4;
r = config->Read(wxT("string4"), &string4, wxString(wxT("def"))); r = config->Read(wxT("string4"), &string4, wxString(wxT("def")));
CPPUNIT_ASSERT_EQUAL( has_values, r ); CPPUNIT_ASSERT_EQUAL( has_values, r );
read++;
int int1; int int1;
r = config->Read(wxT("int1"), &int1, 123); r = config->Read(wxT("int1"), &int1, 123);
CPPUNIT_ASSERT_EQUAL( has_values, r ); CPPUNIT_ASSERT_EQUAL( has_values, r );
read++;
int int2 = config->Read(wxT("int2"), 1234); int int2 = config->Read(wxT("int2"), 1234);
CPPUNIT_ASSERT_EQUAL( int2, 1234 ); CPPUNIT_ASSERT_EQUAL( int2, 1234 );
read++;
long long1; long long1;
r = config->Read(wxString(wxT("long1")), &long1, 234L); r = config->Read(wxString(wxT("long1")), &long1, 234L);
CPPUNIT_ASSERT_EQUAL( has_values, r ); CPPUNIT_ASSERT_EQUAL( has_values, r );
read++;
double double1; double double1;
r = config->Read(wxT("double1"), &double1, 345.67); r = config->Read(wxT("double1"), &double1, 345.67);
CPPUNIT_ASSERT_EQUAL( has_values, r ); CPPUNIT_ASSERT_EQUAL( has_values, r );
read++;
bool bool1; bool bool1;
r = config->Read(wxT("bool1"), &bool1, true); r = config->Read(wxT("bool1"), &bool1, true);
CPPUNIT_ASSERT_EQUAL( has_values, r ); CPPUNIT_ASSERT_EQUAL( has_values, r );
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));
CPPUNIT_ASSERT_EQUAL( has_values, r ); CPPUNIT_ASSERT_EQUAL( has_values, r );
read++;
#endif // wxHAS_CONFIG_TEMPLATE_RW #endif // wxHAS_CONFIG_TEMPLATE_RW
return read;
} }
@@ -173,8 +198,8 @@ void ConfigTestCase::RecordingDefaultsTest()
ReadValues(config, false); ReadValues(config, false);
CPPUNIT_ASSERT_EQUAL( 0, config->GetNumberOfEntries() ); CPPUNIT_ASSERT_EQUAL( 0, config->GetNumberOfEntries() );
config->SetRecordDefaults(true); config->SetRecordDefaults(true);
ReadValues(config, false); int read = ReadValues(config, false);
CPPUNIT_ASSERT_EQUAL( 10, config->GetNumberOfEntries() ); CPPUNIT_ASSERT_EQUAL( read, config->GetNumberOfEntries() );
ReadValues(config, true); ReadValues(config, true);
config->DeleteAll(); config->DeleteAll();
delete config; delete config;