From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 May 2009 11:52:26 +0000 (+0000)
Subject: correct test failures under MSW, it shouldn't assume that all predefined fonts have... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a15239a6fd5420b784e4e03d153992468ab914ea

correct test failures under MSW, it shouldn't assume that all predefined fonts have non-empty facenames

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/tests/misc/settings.cpp b/tests/misc/settings.cpp
index 49b072e1fc..0c01100932 100644
--- a/tests/misc/settings.cpp
+++ b/tests/misc/settings.cpp
@@ -106,7 +106,7 @@ void SettingsTestCase::GlobalColours()
 
 void SettingsTestCase::GlobalFonts()
 {
-    wxFont font[] =
+    const wxFont font[] =
     {
         *wxNORMAL_FONT,
         *wxSMALL_FONT,
@@ -115,8 +115,13 @@ 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() )
+            CPPUNIT_ASSERT( wxFontEnumerator::IsValidFacename(facename) );
+    }
 }
 
 void SettingsTestCase::GlobalBrushes()