Re-enable wxAny<double>::GetAs<wxString>() test.

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

diff --git a/tests/font/fonttest.cpp b/tests/font/fonttest.cpp
index 24a28a790400db9f8b98b27b9f63b29bdb71f6f9..bf1940320700a4179c80e6a052edcc6f13c52a44 100644 (file)
--- a/tests/font/fonttest.cpp
+++ b/tests/font/fonttest.cpp
@@ -26,6 +26,8 @@
 
 #include "wx/font.h"
 
 
 #include "wx/font.h"
 

+#include "asserthelper.h"
+

 // ----------------------------------------------------------------------------
 // test class
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // test class
 // ----------------------------------------------------------------------------


@@ -37,11 +39,13 @@ public:
 
 private:
     CPPUNIT_TEST_SUITE( FontTestCase );
 
 private:
     CPPUNIT_TEST_SUITE( FontTestCase );

+        CPPUNIT_TEST( Construct );

         CPPUNIT_TEST( GetSet );
         CPPUNIT_TEST( NativeFontInfo );
         CPPUNIT_TEST( NativeFontInfoUserDesc );
     CPPUNIT_TEST_SUITE_END();
 
         CPPUNIT_TEST( GetSet );
         CPPUNIT_TEST( NativeFontInfo );
         CPPUNIT_TEST( NativeFontInfoUserDesc );
     CPPUNIT_TEST_SUITE_END();
 

+    void Construct();

     void GetSet();
     void NativeFontInfo();
     void NativeFontInfoUserDesc();
     void GetSet();
     void NativeFontInfo();
     void NativeFontInfoUserDesc();


@@ -93,6 +97,23 @@ wxString DumpFont(const wxFont *font)
     return s;
 }
 
     return s;
 }
 

+void FontTestCase::Construct()
+{
+    // The main purpose of this test is to verify that the font ctors below
+    // compile because it's easy to introduce ambiguities due to the number of
+    // overloaded wxFont ctors.
+
+    CPPUNIT_ASSERT( wxFont(10, wxFONTFAMILY_DEFAULT,
+                               wxFONTSTYLE_NORMAL,
+                               wxFONTWEIGHT_NORMAL).IsOk() );
+
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    // Tests relying on the soon-to-be-deprecated ctor taking ints and not
+    // wxFontXXX enum elements.
+    CPPUNIT_ASSERT( wxFont(10, wxDEFAULT, wxNORMAL, wxNORMAL).IsOk() );
+#endif // FUTURE_WXWIN_COMPATIBILITY_3_0
+}
+

 void FontTestCase::GetSet()
 {
     unsigned numFonts;
 void FontTestCase::GetSet()
 {
     unsigned numFonts;


@@ -182,6 +203,12 @@ void FontTestCase::GetSet()
         CPPUNIT_ASSERT( test.IsOk() );
         CPPUNIT_ASSERT_EQUAL( true, test.GetUnderlined() );
 
         CPPUNIT_ASSERT( test.IsOk() );
         CPPUNIT_ASSERT_EQUAL( true, test.GetUnderlined() );
 

+        // test Get/SetStrikethrough()
+
+        test.SetStrikethrough(true);
+        CPPUNIT_ASSERT( test.IsOk() );
+        CPPUNIT_ASSERT_EQUAL( true, test.GetStrikethrough() );
+

 
         // test Get/SetWeight()
 
 
         // test Get/SetWeight()
 


@@ -223,6 +250,26 @@ void FontTestCase::NativeFontInfo()
 #if !defined(__WXGTK__) && !defined(__WXX11__)
     CPPUNIT_ASSERT( !font.SetNativeFontInfo("bloordyblop") );
 #endif
 #if !defined(__WXGTK__) && !defined(__WXX11__)
     CPPUNIT_ASSERT( !font.SetNativeFontInfo("bloordyblop") );
 #endif

+
+    // Pango font description doesn't have 'underlined' and 'strikethrough'
+    // attributes, so wxNativeFontInfo implements these itself. Test if these
+    // are properly preserved by wxNativeFontInfo or its string description.
+    font.SetUnderlined(true);
+    font.SetStrikethrough(true);
+    CPPUNIT_ASSERT_EQUAL(font, wxFont(font));
+    CPPUNIT_ASSERT_EQUAL(font, wxFont(*font.GetNativeFontInfo()));
+    CPPUNIT_ASSERT_EQUAL(font, wxFont(font.GetNativeFontInfoDesc()));
+    font.SetUnderlined(false);
+    CPPUNIT_ASSERT_EQUAL(font, wxFont(font));
+    CPPUNIT_ASSERT_EQUAL(font, wxFont(*font.GetNativeFontInfo()));
+    CPPUNIT_ASSERT_EQUAL(font, wxFont(font.GetNativeFontInfoDesc()));
+    font.SetUnderlined(true);
+    font.SetStrikethrough(false);
+    CPPUNIT_ASSERT_EQUAL(font, wxFont(font));
+    CPPUNIT_ASSERT_EQUAL(font, wxFont(*font.GetNativeFontInfo()));
+    CPPUNIT_ASSERT_EQUAL(font, wxFont(font.GetNativeFontInfoDesc()));
+    // note: the GetNativeFontInfoUserDesc() doesn't preserve all attributes
+    // according to docs, so it is not tested.

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