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

no real changes, just cleanup and use CPPUNIT_ASSERT_EQUAL instead of CPPUNIT_ASSERT (patch 1762528)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-28 11:54:30 +00:00
parent 404e3102be
commit 58d1a31694
1 changed files with 57 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
tests/config/config.cpp
View File

@@ -43,6 +43,7 @@ private:
void ReadWriteLocalTest(); void ReadWriteLocalTest();
void RecordingDefaultsTest(); void RecordingDefaultsTest();
void ReadValues(wxConfig *config, bool has_values);
DECLARE_NO_COPY_CLASS(ConfigTestCase) DECLARE_NO_COPY_CLASS(ConfigTestCase)
}; };
@@ -73,36 +74,74 @@ void ConfigTestCase::ReadWriteLocalTest()
config = new wxConfig(app, vendor, wxT(""), wxT(""), config = 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"));
CPPUNIT_ASSERT( string1 == wxT("abc") ); CPPUNIT_ASSERT_EQUAL( string1, wxString(wxT("abc")) );
string1 = config->Read(wxT("string1"), wxT("defaultvalue")); string1 = config->Read(wxT("string1"), wxT("defaultvalue"));
CPPUNIT_ASSERT( string1 == wxT("abc") ); CPPUNIT_ASSERT_EQUAL( string1, wxString(wxT("abc")) );
wxString string2; wxString string2;
bool r = config->Read(wxT("string2"), &string2); bool r = config->Read(wxT("string2"), &string2);
CPPUNIT_ASSERT( r == true ); CPPUNIT_ASSERT( r );
CPPUNIT_ASSERT( string2 == wxT("def") ); CPPUNIT_ASSERT_EQUAL( string2, wxString(wxT("def")) );
r = config->Read(wxT("string2"), &string2, wxT("defaultvalue")); r = config->Read(wxT("string2"), &string2, wxT("defaultvalue"));
CPPUNIT_ASSERT( r == true ); CPPUNIT_ASSERT( r );
CPPUNIT_ASSERT( string2 == wxT("def") ); CPPUNIT_ASSERT_EQUAL( string2, wxString(wxT("def")) );
int int1 = config->Read(wxT("int1"), 5); int int1 = config->Read(wxT("int1"), 5);
CPPUNIT_ASSERT( int1 == 123 ); CPPUNIT_ASSERT_EQUAL( int1, 123 );
long long1; long long1;
r = config->Read(wxT("long1"), &long1); r = config->Read(wxT("long1"), &long1);
CPPUNIT_ASSERT( r == true ); CPPUNIT_ASSERT( r );
CPPUNIT_ASSERT( long1 == 234 ); CPPUNIT_ASSERT_EQUAL( long1, 234L );
bool bool1; bool bool1;
r = config->Read(wxT("foo"), &bool1); r = config->Read(wxT("foo"), &bool1);
CPPUNIT_ASSERT( r == false ); CPPUNIT_ASSERT( !r );
r = config->Read(wxT("bool1"), &bool1); r = config->Read(wxT("bool1"), &bool1);
CPPUNIT_ASSERT( r == true ); CPPUNIT_ASSERT( r );
CPPUNIT_ASSERT( bool1 == true ); CPPUNIT_ASSERT_EQUAL( bool1, true );
wxColour color1; wxColour color1;
r = config->Read(wxT("color1"), &color1); r = config->Read(wxT("color1"), &color1);
CPPUNIT_ASSERT( r == true ); CPPUNIT_ASSERT( r );
CPPUNIT_ASSERT( color1 == wxColour(11,22,33,44) ); CPPUNIT_ASSERT( color1 == wxColour(11,22,33,44) );
config->DeleteAll(); config->DeleteAll();
delete config; delete config;
} }
void ConfigTestCase::ReadValues(wxConfig *config, bool has_values)
{
bool r;
wxString string1 = config->Read(wxT("string1"), wxT("abc"));
wxString string2 = config->Read(wxT("string2"), wxString(wxT("def")));
wxString string3, string4;
r = config->Read(wxT("string3"), &string3, wxT("abc"));
CPPUNIT_ASSERT_EQUAL( r, has_values );
r = config->Read(wxT("string4"), &string4, wxString(wxT("def")));
CPPUNIT_ASSERT_EQUAL( r, has_values );
int int1;
r = config->Read(wxT("int1"), &int1, 123);
CPPUNIT_ASSERT_EQUAL( r, has_values );
int int2 = config->Read(wxT("int2"), 1234);
CPPUNIT_ASSERT_EQUAL( int2, 1234 );
long long1;
r = config->Read(wxString(wxT("long1")), &long1, 234L);
CPPUNIT_ASSERT_EQUAL( r, has_values );
double double1;
r = config->Read(wxT("double1"), &double1, 345.67);
CPPUNIT_ASSERT_EQUAL( r, has_values );
bool bool1;
r = config->Read(wxT("bool1"), &bool1, true);
CPPUNIT_ASSERT_EQUAL( r, has_values );
wxColour color1;
r = config->Read(wxT("color1"), &color1, wxColour(11,22,33,44));
CPPUNIT_ASSERT_EQUAL( r, has_values );
}
void ConfigTestCase::RecordingDefaultsTest() void ConfigTestCase::RecordingDefaultsTest()
{ {
wxString app = wxT("wxConfigTestCaseRD"); wxString app = wxT("wxConfigTestCaseRD");
@@ -111,63 +150,12 @@ void ConfigTestCase::RecordingDefaultsTest()
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
wxString string1, string2, string3, string4; ReadValues(config, false);
string1 = config->Read(wxT("string1"), wxT("abc")); CPPUNIT_ASSERT_EQUAL( (int) config->GetNumberOfEntries(), 0 );
string2 = config->Read(wxT("string2"), wxString(wxT("def")));
config->Read(wxT("string3"), &string3, wxT("abc"));
config->Read(wxT("string4"), &string4, wxString(wxT("def")));
int int1, int2;
config->Read(wxT("int1"), &int1, 123);
int2 = config->Read(wxT("int2"), 1234);
long long1;
config->Read(wxString(wxT("long1")), &long1, 234L);
double double1;
config->Read(wxT("double1"), &double1, 345.67);
bool bool1;
config->Read(wxT("bool1"), &bool1, true);
wxColour color1;
config->Read(wxT("color1"), &color1, wxColour(11,22,33,44));
CPPUNIT_ASSERT ( config->GetNumberOfEntries() == 0 );
config->SetRecordDefaults(true); config->SetRecordDefaults(true);
ReadValues(config, false);
bool r; CPPUNIT_ASSERT_EQUAL( (int) config->GetNumberOfEntries(), 10 );
string1 = config->Read(wxT("string1"), wxT("abc")); ReadValues(config, true);
string2 = config->Read(wxT("string2"), wxString(wxT("def")));
r = config->Read(wxT("string3"), &string3, wxT("abc"));
CPPUNIT_ASSERT( r == false );
r = config->Read(wxT("string4"), &string4, wxString(wxT("def")));
CPPUNIT_ASSERT( r == false );
r = config->Read(wxT("int1"), &int1, 123);
CPPUNIT_ASSERT( r == false );
int2 = config->Read(wxT("int2"), 1234);
r = config->Read(wxString(wxT("long1")), &long1, 234L);
CPPUNIT_ASSERT( r == false );
r = config->Read(wxT("double1"), &double1, 345.67);
CPPUNIT_ASSERT( r == false );
r = config->Read(wxT("bool1"), &bool1, true);
CPPUNIT_ASSERT( r == false );
r = config->Read(wxT("color1"), &color1, wxColour(11,22,33,44));
CPPUNIT_ASSERT( r == false );
CPPUNIT_ASSERT ( config->GetNumberOfEntries() == 10 );
r = config->Read(wxT("string3"), &string3, wxT("abc"));
CPPUNIT_ASSERT( r == true );
r = config->Read(wxT("string4"), &string4, wxString(wxT("def")));
CPPUNIT_ASSERT( r == true );
r = config->Read(wxT("int1"), &int1, 123);
CPPUNIT_ASSERT( r == true );
r = config->Read(wxString(wxT("long1")), &long1, 234L);
CPPUNIT_ASSERT( r == true );
r = config->Read(wxT("double1"), &double1, 345.67);
CPPUNIT_ASSERT( r == true );
r = config->Read(wxT("bool1"), &bool1, true);
CPPUNIT_ASSERT( r == true );
r = config->Read(wxT("color1"), &color1, wxColour(11,22,33,44));
CPPUNIT_ASSERT( r == true );
config->DeleteAll(); config->DeleteAll();
delete config; delete config;
} }