X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/56601ff2db94ccc874107eb60c4564ceb47f6d02..968b44d37b9fcdc5232fb68312a65e4fc6b5f4ab:/tests/config/config.cpp diff --git a/tests/config/config.cpp b/tests/config/config.cpp index 408d4d7b11..0abc18fb3c 100644 --- a/tests/config/config.cpp +++ b/tests/config/config.cpp @@ -7,7 +7,10 @@ // Copyright: (c) 2007 Marcin Wojdyr /////////////////////////////////////////////////////////////////////////////// -// see also tests/fileconf/fileconftest.cpp for wxFileConfig specific tests +// NOTE: this test is compiled in test_gui because it uses wxColour for +// its testing purpose. +// See also tests/config/fileconf.cpp for wxFileConfig specific tests and +// tests/config/regconf.cpp for wxRegConfig specific tests. // ---------------------------------------------------------------------------- // headers @@ -15,6 +18,8 @@ #include "testprec.h" +#if wxUSE_CONFIG + #ifdef __BORLANDC__ #pragma hdrstop #endif @@ -43,7 +48,9 @@ private: void ReadWriteLocalTest(); 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) }; @@ -51,7 +58,7 @@ private: // register in the unnamed registry so that these tests are run by default CPPUNIT_TEST_SUITE_REGISTRATION( ConfigTestCase ); -// also include in it's own registry so that these tests can be run alone +// also include in its own registry so that these tests can be run alone CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ConfigTestCase, "ConfigTestCase" ); void ConfigTestCase::ReadWriteLocalTest() @@ -67,40 +74,42 @@ void ConfigTestCase::ReadWriteLocalTest() config->Write(wxString(wxT("long1")), 234L); config->Write(wxT("double1"), 345.67); config->Write(wxT("bool1"), true); +#ifdef wxHAS_CONFIG_TEMPLATE_RW config->Write(wxT("color1"), wxColour(11,22,33,44)); +#endif // wxHAS_CONFIG_TEMPLATE_RW config->Flush(); delete config; config = new wxConfig(app, vendor, wxT(""), wxT(""), wxCONFIG_USE_LOCAL_FILE); wxString string1 = config->Read(wxT("string1")); - CPPUNIT_ASSERT_EQUAL( string1, wxString(wxT("abc")) ); + CPPUNIT_ASSERT_EQUAL( "abc", string1 ); string1 = config->Read(wxT("string1"), wxT("defaultvalue")); - CPPUNIT_ASSERT_EQUAL( string1, wxString(wxT("abc")) ); + CPPUNIT_ASSERT_EQUAL( "abc", string1 ); wxString string2; bool r = config->Read(wxT("string2"), &string2); CPPUNIT_ASSERT( r ); - CPPUNIT_ASSERT_EQUAL( string2, wxString(wxT("def")) ); + CPPUNIT_ASSERT_EQUAL( "def", string2 ); r = config->Read(wxT("string2"), &string2, wxT("defaultvalue")); CPPUNIT_ASSERT( r ); - CPPUNIT_ASSERT_EQUAL( string2, wxString(wxT("def")) ); + CPPUNIT_ASSERT_EQUAL( "def", string2 ); int int1 = config->Read(wxT("int1"), 5); - CPPUNIT_ASSERT_EQUAL( int1, 123 ); + CPPUNIT_ASSERT_EQUAL( 123, int1 ); long long1; r = config->Read(wxT("long1"), &long1); CPPUNIT_ASSERT( r ); - CPPUNIT_ASSERT_EQUAL( long1, 234L ); + CPPUNIT_ASSERT_EQUAL( 234L, long1 ); CPPUNIT_ASSERT( config->ReadLong(wxT("long1"), 0) == 234 ); double double1; r = config->Read(wxT("double1"), &double1); CPPUNIT_ASSERT( r ); - CPPUNIT_ASSERT_EQUAL( double1, 345.67 ); + CPPUNIT_ASSERT_EQUAL( 345.67, double1 ); CPPUNIT_ASSERT( config->ReadDouble(wxT("double1"), 0) == double1 ); @@ -110,48 +119,76 @@ void ConfigTestCase::ReadWriteLocalTest() r = config->Read(wxT("bool1"), &bool1); CPPUNIT_ASSERT( r ); - CPPUNIT_ASSERT_EQUAL( bool1, true ); + CPPUNIT_ASSERT_EQUAL( true, bool1 ); CPPUNIT_ASSERT( config->ReadBool(wxT("bool1"), false) == bool1 ); +#ifdef wxHAS_CONFIG_TEMPLATE_RW wxColour color1; r = config->Read(wxT("color1"), &color1); CPPUNIT_ASSERT( r ); CPPUNIT_ASSERT( color1 == wxColour(11,22,33,44) ); CPPUNIT_ASSERT( config->ReadObject(wxT("color1"), wxNullColour) == color1 ); +#endif // wxHAS_CONFIG_TEMPLATE_RW config->DeleteAll(); delete config; } -void ConfigTestCase::ReadValues(wxConfig *config, bool has_values) +int ConfigTestCase::ReadValues(wxConfig *config, bool has_values) { + int read = 0; bool r; + wxString string1 = config->Read(wxT("string1"), wxT("abc")); + read++; + wxString string2 = config->Read(wxT("string2"), wxString(wxT("def"))); - wxString string3, string4; + read++; + + wxString string3; r = config->Read(wxT("string3"), &string3, wxT("abc")); - CPPUNIT_ASSERT_EQUAL( r, has_values ); + CPPUNIT_ASSERT_EQUAL( has_values, r ); + read++; + + wxString string4; r = config->Read(wxT("string4"), &string4, wxString(wxT("def"))); - CPPUNIT_ASSERT_EQUAL( r, has_values ); + CPPUNIT_ASSERT_EQUAL( has_values, r ); + read++; + int int1; r = config->Read(wxT("int1"), &int1, 123); - CPPUNIT_ASSERT_EQUAL( r, has_values ); + CPPUNIT_ASSERT_EQUAL( has_values, r ); + read++; + int int2 = config->Read(wxT("int2"), 1234); CPPUNIT_ASSERT_EQUAL( int2, 1234 ); + read++; + long long1; r = config->Read(wxString(wxT("long1")), &long1, 234L); - CPPUNIT_ASSERT_EQUAL( r, has_values ); + CPPUNIT_ASSERT_EQUAL( has_values, r ); + read++; + double double1; r = config->Read(wxT("double1"), &double1, 345.67); - CPPUNIT_ASSERT_EQUAL( r, has_values ); + CPPUNIT_ASSERT_EQUAL( has_values, r ); + read++; + bool bool1; r = config->Read(wxT("bool1"), &bool1, true); - CPPUNIT_ASSERT_EQUAL( r, has_values ); + CPPUNIT_ASSERT_EQUAL( has_values, r ); + read++; + +#ifdef wxHAS_CONFIG_TEMPLATE_RW wxColour color1; r = config->Read(wxT("color1"), &color1, wxColour(11,22,33,44)); - CPPUNIT_ASSERT_EQUAL( r, has_values ); + CPPUNIT_ASSERT_EQUAL( has_values, r ); + read++; +#endif // wxHAS_CONFIG_TEMPLATE_RW + + return read; } @@ -164,13 +201,13 @@ void ConfigTestCase::RecordingDefaultsTest() config->DeleteAll(); config->SetRecordDefaults(false); // by default it is false ReadValues(config, false); - CPPUNIT_ASSERT_EQUAL( (int) config->GetNumberOfEntries(), 0 ); + CPPUNIT_ASSERT_EQUAL( 0, config->GetNumberOfEntries() ); config->SetRecordDefaults(true); - ReadValues(config, false); - CPPUNIT_ASSERT_EQUAL( (int) config->GetNumberOfEntries(), 10 ); + int read = ReadValues(config, false); + CPPUNIT_ASSERT_EQUAL( read, config->GetNumberOfEntries() ); ReadValues(config, true); config->DeleteAll(); delete config; } - +#endif //wxUSE_CONFIG