Re-enable wxAny<double>::GetAs<wxString>() test.

[wxWidgets.git] / tests / misc / settings.cpp

diff --git a/tests/misc/settings.cpp b/tests/misc/settings.cpp
index c87e8310ccdaa040ba80aaf55ce748adf9614d5d..c89fdfcfb237a27d9c1b0abfd33844ec9e53c937 100644 (file)
--- a/tests/misc/settings.cpp
+++ b/tests/misc/settings.cpp
@@ -19,6 +19,8 @@
 
 #include "wx/settings.h"
 #include "wx/fontenum.h"
+#include "wx/brush.h"
+#include "wx/pen.h"
 
 // ----------------------------------------------------------------------------
 // test class
@@ -54,7 +56,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( SettingsTestCase );
 
-// 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( SettingsTestCase, "SettingsTestCase" );
 
 
@@ -104,7 +106,7 @@ void SettingsTestCase::GlobalColours()
 
 void SettingsTestCase::GlobalFonts()
 {
-    wxFont font[] =
+    const wxFont font[] =
     {
         *wxNORMAL_FONT,
         *wxSMALL_FONT,
@@ -113,8 +115,18 @@ void SettingsTestCase::GlobalFonts()
     };
 
     for (unsigned int i=0; i < WXSIZEOF(font); i++)
-        CPPUNIT_ASSERT( font[i].IsOk() && 
-                        wxFontEnumerator::IsValidFacename(font[i].GetFaceName()) );
+    {
+        CPPUNIT_ASSERT( font[i].IsOk() );
+
+        const wxString facename = font[i].GetFaceName();
+        if ( !facename.empty() )
+        {
+            WX_ASSERT_MESSAGE(
+                ("font #%u: facename \"%s\" is invalid", i, facename),
+                wxFontEnumerator::IsValidFacename(facename)
+            );
+        }
+    }
 }
 
 void SettingsTestCase::GlobalBrushes()