X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58d1a316948d589b6a2961c6df3ce8d4f99de1ba..0e4d01385428cf570c6df0a8b110ee3cfb3e5156:/tests/config/config.cpp?ds=inline

diff --git a/tests/config/config.cpp b/tests/config/config.cpp
index e02693454d..8e9cc4e180 100644
--- a/tests/config/config.cpp
+++ b/tests/config/config.cpp
@@ -67,7 +67,9 @@ 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;
 
@@ -95,19 +97,34 @@ void ConfigTestCase::ReadWriteLocalTest()
     CPPUNIT_ASSERT( r );
     CPPUNIT_ASSERT_EQUAL( long1, 234L );
 
+    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( config->ReadDouble(wxT("double1"), 0) == double1 );
+
     bool bool1;
-    r = config->Read(wxT("foo"), &bool1);
+    r = config->Read(wxT("foo"), &bool1); // there is no "foo" key
     CPPUNIT_ASSERT( !r );
 
     r = config->Read(wxT("bool1"), &bool1);
     CPPUNIT_ASSERT( r );
     CPPUNIT_ASSERT_EQUAL( bool1, true );
 
+    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;
 }
@@ -136,9 +153,11 @@ void ConfigTestCase::ReadValues(wxConfig *config, bool has_values)
     bool bool1;
     r = config->Read(wxT("bool1"), &bool1, true);
     CPPUNIT_ASSERT_EQUAL( r, has_values );
+#ifdef wxHAS_CONFIG_TEMPLATE_RW
     wxColour color1;
     r = config->Read(wxT("color1"), &color1, wxColour(11,22,33,44));
     CPPUNIT_ASSERT_EQUAL( r, has_values );
+#endif // wxHAS_CONFIG_TEMPLATE_RW
 }