From: Vadim Zeitlin Date: Sun, 17 May 2009 11:51:09 +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/c56fc0dc307f5142b96547b2b07ae811f8a2f0f5 correct test failures under MSW, it shouldn't assume that all predefined fonts have non-empty facenames; also simplified it by separating different tests in different functions git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/tests/font/fonttest.cpp b/tests/font/fonttest.cpp index c8a60f0f4e..2e9c3ebf9e 100644 --- a/tests/font/fonttest.cpp +++ b/tests/font/fonttest.cpp @@ -38,9 +38,29 @@ public: private: CPPUNIT_TEST_SUITE( FontTestCase ); CPPUNIT_TEST( GetSet ); + CPPUNIT_TEST( NativeFontInfo ); + CPPUNIT_TEST( NativeFontInfoUserDesc ); CPPUNIT_TEST_SUITE_END(); void GetSet(); + void NativeFontInfo(); + void NativeFontInfoUserDesc(); + + static const wxFont *GetTestFonts(unsigned& numFonts) + { + static const wxFont testfonts[] = + { + *wxNORMAL_FONT, + *wxSMALL_FONT, + *wxITALIC_FONT, + *wxSWISS_FONT, + wxFont(5, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL) + }; + + numFonts = WXSIZEOF(testfonts); + + return testfonts; + } DECLARE_NO_COPY_CLASS(FontTestCase) }; @@ -55,9 +75,9 @@ 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(), @@ -75,32 +95,21 @@ wxString DumpFont(const wxFont *font) void FontTestCase::GetSet() { - static const wxFont testfonts[] = - { - *wxNORMAL_FONT, - *wxSMALL_FONT, - *wxITALIC_FONT, - *wxSWISS_FONT, - wxFont(5, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL) - }; - - for ( size_t n = 0; n < WXSIZEOF(testfonts); n++ ) + unsigned numFonts; + const wxFont *pf = GetTestFonts(numFonts); + for ( size_t n = 0; n < numFonts; n++ ) { - wxFont test(testfonts[n]); + wxFont test(*pf++); // remember: getters can only be called when wxFont::IsOk() == true CPPUNIT_ASSERT( test.IsOk() ); // test Get/SetFaceName() - - const wxString& fn = test.GetFaceName(); - CPPUNIT_ASSERT( !fn.empty() ); - CPPUNIT_ASSERT( !test.SetFaceName("a dummy face name") ); CPPUNIT_ASSERT( !test.IsOk() ); - CPPUNIT_ASSERT( test.SetFaceName(fn) ); + CPPUNIT_ASSERT( test.SetFaceName("Arial") ); CPPUNIT_ASSERT( test.IsOk() ); @@ -108,7 +117,7 @@ void FontTestCase::GetSet() test.SetFamily( wxFONTFAMILY_ROMAN ); CPPUNIT_ASSERT( test.IsOk() ); - CPPUNIT_ASSERT( wxFONTFAMILY_ROMAN == test.GetFamily() || + 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 @@ -120,35 +129,97 @@ void FontTestCase::GetSet() //CPPUNIT_ASSERT( test.IsOk() ); //CPPUNIT_ASSERT_EQUAL( wxFONTENCODING_KOI8 , test.GetEncoding() ); - - // test Get/SetNativeFontInfo - + + // 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 + // be selected + + + // 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() ); + } +} + +void FontTestCase::NativeFontInfo() +{ + unsigned numFonts; + const wxFont *pf = GetTestFonts(numFonts); + for ( size_t n = 0; n < numFonts; n++ ) + { + wxFont test(*pf++); + const wxString& nid = test.GetNativeFontInfoDesc(); CPPUNIT_ASSERT( !nid.empty() ); // documented to be never empty - + wxFont temp; CPPUNIT_ASSERT( temp.SetNativeFontInfo(nid) ); CPPUNIT_ASSERT( temp.IsOk() ); - WX_ASSERT_MESSAGE( + WX_ASSERT_MESSAGE( ("Test #%lu failed\ndump of test font: \"%s\"\ndump of temp font: \"%s\"", \ n, DumpFont(&test), DumpFont(&temp)), temp == test ); + } + + // test that clearly invalid font info strings do not work + wxFont font; + CPPUNIT_ASSERT( !font.SetNativeFontInfo("") ); + CPPUNIT_ASSERT( !font.SetNativeFontInfo("bloordyblop") ); +} + +void FontTestCase::NativeFontInfoUserDesc() +{ + unsigned numFonts; + const wxFont *pf = GetTestFonts(numFonts); + for ( size_t n = 0; n < numFonts; n++ ) + { + wxFont test(*pf++); - - // test Get/SetNativeFontInfoUserDesc - const wxString& niud = test.GetNativeFontInfoUserDesc(); CPPUNIT_ASSERT( !niud.empty() ); // documented to be never empty - + wxFont temp2; 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( + WX_ASSERT_MESSAGE( ("Test #%lu failed; native info user desc was \"%s\" for test and \"%s\" for temp2", \ n, niud, temp2.GetNativeFontInfoUserDesc()), temp2 == test ); @@ -159,53 +230,19 @@ void FontTestCase::GetSet() // 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 + // if the original face name was empty, it means that any face name (in + // this family) can be used for the new font so we shouldn't be + // surprised to find that they differ in this case + const wxString facename = test.GetFaceName(); + if ( !facename.empty() ) + { + CPPUNIT_ASSERT_EQUAL( facename.Upper(), temp2.GetFaceName().Upper() ); + } - // 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 - // be selected - - - // 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() ); + CPPUNIT_ASSERT_EQUAL( test.GetPointSize(), temp2.GetPointSize() ); + CPPUNIT_ASSERT_EQUAL( test.GetEncoding(), temp2.GetEncoding() ); #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() ); } }