better variant support, fixes #11114

[wxWidgets.git] / tests / font / fonttest.cpp

diff --git a/tests/font/fonttest.cpp b/tests/font/fonttest.cpp
index 2e9c3ebf9e4cb02502f4646727d3b9b003dba44b..69df21a2f549a07ca914a4c4f2de13804669180d 100644 (file)
--- a/tests/font/fonttest.cpp
+++ b/tests/font/fonttest.cpp
@@ -109,7 +109,27 @@ void FontTestCase::GetSet()
         CPPUNIT_ASSERT( !test.SetFaceName("a dummy face name") );
         CPPUNIT_ASSERT( !test.IsOk() );
 
         CPPUNIT_ASSERT( !test.SetFaceName("a dummy face name") );
         CPPUNIT_ASSERT( !test.IsOk() );
 

-        CPPUNIT_ASSERT( test.SetFaceName("Arial") );
+        // if the call to SetFaceName() below fails on your system/port,
+        // consider adding another branch to this #if
+#if defined(__WXMSW__) || defined(__WXOSX__)
+        static const char *knownGoodFaceName = "Arial";
+#elif defined(__LINUX__)
+        static const char *knownGoodFaceName;
+        wxString distroname = wxGetLinuxDistributionInfo().Id;
+        
+        if (distroname.Contains("Ubuntu"))
+            knownGoodFaceName = "FreeSerif";
+                // ttf-freefont and ttf-dejavu packages are installed by default on [X,K]Ubuntu systems
+        else if (distroname == "Debian")
+            knownGoodFaceName = "Fixed";
+        else
+            knownGoodFaceName = "DejaVu Sans";
+                // this is very popular in many linux distro...
+#else
+        static const char *knownGoodFaceName = "Fixed";
+#endif
+
+        CPPUNIT_ASSERT( test.SetFaceName(knownGoodFaceName) );

         CPPUNIT_ASSERT( test.IsOk() );
 
 
         CPPUNIT_ASSERT( test.IsOk() );
 
 


@@ -198,7 +218,14 @@ void FontTestCase::NativeFontInfo()
     // test that clearly invalid font info strings do not work
     wxFont font;
     CPPUNIT_ASSERT( !font.SetNativeFontInfo("") );
     // test that clearly invalid font info strings do not work
     wxFont font;
     CPPUNIT_ASSERT( !font.SetNativeFontInfo("") );

+
+    // pango_font_description_from_string() used by wxFont in wxGTK and wxX11
+    // never returns an error at all so this assertion fails there -- and as it
+    // doesn't seem to be possible to do anything about it maybe we should
+    // change wxMSW and other ports to also accept any strings?
+#if !defined(__WXGTK__) && !defined(__WXX11__)

     CPPUNIT_ASSERT( !font.SetNativeFontInfo("bloordyblop") );
     CPPUNIT_ASSERT( !font.SetNativeFontInfo("bloordyblop") );

+#endif

 }
 
 void FontTestCase::NativeFontInfoUserDesc()
 }
 
 void FontTestCase::NativeFontInfoUserDesc()