// register in the unnamed registry so that these tests are run by default
CPPUNIT_TEST_SUITE_REGISTRATION( FontTestCase );
-// 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( FontTestCase, "FontTestCase" );
wxString DumpFont(const wxFont *font)
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
+
+ // note that there is always the possibility that GetFamily() returns
+ // wxFONTFAMILY_DEFAULT (meaning "unknown" in this case) so that we
+ // consider it as a valid return value
+ const wxFontFamily family = test.GetFamily();
+ if ( family != wxFONTFAMILY_DEFAULT )
+ CPPUNIT_ASSERT_EQUAL( wxFONTFAMILY_ROMAN, family );
// test Get/SetEncoding()