Fix tests for OSX

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-08-02 05:39:41 +00:00
parent 3c81c73b9e
commit 7d87b52021
2 changed files with 7 additions and 3 deletions

View File

@@ -19,8 +19,8 @@ class lib_colourdb_Tests(wtc.WidgetTestCase):
self.assertEqual(wx.TheColourDatabase.Find('ORANGERED1'),
wx.Colour(255, 69, 0, 255))
self.assertEqual(wx.TheColourDatabase.FindName(wx.Colour(255, 69, 0)),
'ORANGE RED')
self.assertIn(wx.TheColourDatabase.FindName(wx.Colour(255, 69, 0)),
['ORANGE RED', 'ORANGERED'])
#---------------------------------------------------------------------------

View File

@@ -16,7 +16,11 @@ class lib_expando_Tests(wtc.WidgetTestCase):
bs2 = w.GetSize()
self.assertEqual(w.GetValue(), "This is a test\nThis is a New Label")
self.assertEqual(w.GetNumberOfLines(), 3)
# All we can test here is that we have more lines than we started
# with, since different platforms may wrap at different spots in the
# string.
self.assertTrue(w.GetNumberOfLines() > 2)
self.assertTrue(bs2.height > bs1.height)
#---------------------------------------------------------------------------