X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b06a80f9f806906c39e46e902f8c45b35d67d56..64be91ed99c3493fa5ce93740c597d22cd1e83a5:/tests/font/fonttest.cpp?ds=sidebyside

diff --git a/tests/font/fonttest.cpp b/tests/font/fonttest.cpp
index b9893e7630..c8a60f0f4e 100644
--- a/tests/font/fonttest.cpp
+++ b/tests/font/fonttest.cpp
@@ -51,6 +51,27 @@ CPPUNIT_TEST_SUITE_REGISTRATION( FontTestCase );
 // also include in it's own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( FontTestCase, "FontTestCase" );
 
+wxString DumpFont(const wxFont *font)
+{
+    // dumps the internal properties of a wxFont in the same order they
+    // are checked by wxFontBase::operator==()
+    
+    wxASSERT(font->IsOk());
+    
+    wxString s;
+    s.Printf(wxS("%d-%d;%d-%d-%d-%d-%d-%s-%d"),
+             font->GetPointSize(),
+             font->GetPixelSize().x,
+             font->GetPixelSize().y,
+             font->GetFamily(),
+             font->GetStyle(),
+             font->GetWeight(),
+             font->GetUnderlined() ? 1 : 0,
+             font->GetFaceName(),
+             font->GetEncoding());
+
+    return s;
+}
 
 void FontTestCase::GetSet()
 {
@@ -85,13 +106,18 @@ void FontTestCase::GetSet()
 
         // test Get/SetFamily()
 
-        test.SetFamily( wxFONTFAMILY_MODERN );
-        //CPPUNIT_ASSERT_EQUAL( wxFONTFAMILY_MODERN, test.GetFamily() );
+        test.SetFamily( wxFONTFAMILY_ROMAN );
+        CPPUNIT_ASSERT( test.IsOk() );
+        CPPUNIT_ASSERT( wxFONTFAMILY_ROMAN == test.GetFamily() || 
+                        wxFONTFAMILY_UNKNOWN == test.GetFamily() );
+            // note that there is always the possibility that GetFamily() returns
+            // wxFONTFAMILY_UNKNOWN so that we consider it as a valid return value
+
 
-        
         // test Get/SetEncoding()
 
         //test.SetEncoding( wxFONTENCODING_KOI8 );
+        //CPPUNIT_ASSERT( test.IsOk() );
         //CPPUNIT_ASSERT_EQUAL( wxFONTENCODING_KOI8 , test.GetEncoding() );
 
         
@@ -99,31 +125,57 @@ void FontTestCase::GetSet()
         
         const wxString& nid = test.GetNativeFontInfoDesc();
         CPPUNIT_ASSERT( !nid.empty() );
+            // documented to be never empty
         
         wxFont temp;
-        temp.SetNativeFontInfo(nid);
-        CPPUNIT_ASSERT( temp == test );
-        
+        CPPUNIT_ASSERT( temp.SetNativeFontInfo(nid) );
+        CPPUNIT_ASSERT( temp.IsOk() );
+        WX_ASSERT_MESSAGE( 
+            ("Test #%lu failed\ndump of test font: \"%s\"\ndump of temp font: \"%s\"", \
+             n, DumpFont(&test), DumpFont(&temp)),
+            temp == test );
+
         
         // test Get/SetNativeFontInfoUserDesc 
         
         const wxString& niud = test.GetNativeFontInfoUserDesc();
         CPPUNIT_ASSERT( !niud.empty() );
+            // documented to be never empty
         
         wxFont temp2;
-        temp2.SetNativeFontInfoUserDesc(niud);
-        CPPUNIT_ASSERT( temp2 == test );
-        
-        
+        CPPUNIT_ASSERT( temp2.SetNativeFontInfoUserDesc(niud) );
+        CPPUNIT_ASSERT( temp2.IsOk() );
+
+#ifdef __WXGTK__
+        // Pango saves/restores all font info in the user-friendly string:
+        WX_ASSERT_MESSAGE( 
+            ("Test #%lu failed; native info user desc was \"%s\" for test and \"%s\" for temp2", \
+             n, niud, temp2.GetNativeFontInfoUserDesc()),
+            temp2 == test );
+#else
+        // NOTE: as documented GetNativeFontInfoUserDesc/SetNativeFontInfoUserDesc
+        //       are not granted to save/restore all font info.
+        //       In fact e.g. the font family is not saved at all; test only those
+        //       info which GetNativeFontInfoUserDesc() does indeed save:
+        CPPUNIT_ASSERT_EQUAL( test.GetWeight(), temp2.GetWeight() );
+        CPPUNIT_ASSERT_EQUAL( test.GetStyle(), temp2.GetStyle() );
+        CPPUNIT_ASSERT( test.GetFaceName().CmpNoCase(temp2.GetFaceName()) == 0 );
+        CPPUNIT_ASSERT_EQUAL( test.GetPointSize(), temp2.GetPointSize() );
+        CPPUNIT_ASSERT_EQUAL( test.GetEncoding(), temp2.GetEncoding() );
+#endif
+
+
         // test Get/SetPointSize()
         
         test.SetPointSize(30);
+        CPPUNIT_ASSERT( test.IsOk() );
         CPPUNIT_ASSERT_EQUAL( 30, test.GetPointSize() );
         
         
         // test Get/SetPixelSize()
         
         test.SetPixelSize(wxSize(0,30));
+        CPPUNIT_ASSERT( test.IsOk() );
         CPPUNIT_ASSERT( test.GetPixelSize().GetHeight() <= 30 );
             // NOTE: the match found by SetPixelSize() may be not 100% precise; it
             //       only grants that a font smaller than the required height will
@@ -133,18 +185,26 @@ void FontTestCase::GetSet()
         // test Get/SetStyle()
         
         test.SetStyle(wxFONTSTYLE_SLANT);
+        CPPUNIT_ASSERT( test.IsOk() );
+#ifdef __WXMSW__
+        // on wxMSW wxFONTSTYLE_SLANT==wxFONTSTYLE_ITALIC
+        CPPUNIT_ASSERT( wxFONTSTYLE_SLANT == test.GetStyle() ||
+                        wxFONTSTYLE_ITALIC == test.GetStyle() );
+#else
         CPPUNIT_ASSERT_EQUAL( wxFONTSTYLE_SLANT, test.GetStyle() );
-        
+#endif
         
         // test Get/SetUnderlined()
         
         test.SetUnderlined(true);
+        CPPUNIT_ASSERT( test.IsOk() );
         CPPUNIT_ASSERT_EQUAL( true, test.GetUnderlined() );
         
         
         // test Get/SetWeight()
         
         test.SetWeight(wxFONTWEIGHT_BOLD);
+        CPPUNIT_ASSERT( test.IsOk() );
         CPPUNIT_ASSERT_EQUAL( wxFONTWEIGHT_BOLD, test.GetWeight() );
     }
 }