From 54a07bc27f69667e5899c6dcdc36d10fff830b3e Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 28 Apr 2022 19:53:55 -0400 Subject: [PATCH] Update unittests to work with wxWidgets 3.1.6 --- etg/pickers.py | 2 +- unittests/test_bannerwindow.py | 2 +- unittests/test_bmpbndl.py | 32 ++++++++++++++++++++++++++++ unittests/test_button.py | 2 +- unittests/test_dataview.py | 2 +- unittests/test_headercol.py | 4 ++-- unittests/test_lib_agw_speedmeter.py | 2 +- unittests/test_preferences.py | 4 ++-- unittests/test_richtextbuffer.py | 8 ++++++- unittests/test_taskbar.py | 2 +- unittests/test_tglbtn.py | 2 +- unittests/test_toolbar.py | 2 +- unittests/test_wizard.py | 6 +++--- unittests/test_wxdatetime.py | 2 +- wx/lib/agw/infobar.py | 4 ++-- wx/lib/floatcanvas/NavCanvas.py | 3 ++- wx/lib/inspection.py | 16 +++++++------- 17 files changed, 67 insertions(+), 28 deletions(-) create mode 100644 unittests/test_bmpbndl.py diff --git a/etg/pickers.py b/etg/pickers.py index 293602e6..3ff77fdc 100644 --- a/etg/pickers.py +++ b/etg/pickers.py @@ -219,7 +219,7 @@ def run(): # force a copy, in case the _colorData is shared self.colour = wx.Colour(colour) bmp = self._makeBitmap() - self.SetBitmapLabel(bmp) + self.SetBitmapLabel(wx.BitmapBundle(bmp)) def GetColour(self): return self.colour diff --git a/unittests/test_bannerwindow.py b/unittests/test_bannerwindow.py index 399f5825..924f9beb 100644 --- a/unittests/test_bannerwindow.py +++ b/unittests/test_bannerwindow.py @@ -12,7 +12,7 @@ class bannerwindow_Tests(wtc.WidgetTestCase): def test_bannerwindow1(self): banner = wx.adv.BannerWindow(self.frame, dir=wx.LEFT) - banner.SetBitmap(wx.Bitmap(pngFile)) + banner.SetBitmap(wx.BitmapBundle(wx.Bitmap(pngFile))) def test_bannerwindow2(self): banner = wx.adv.BannerWindow(self.frame, dir=wx.LEFT) diff --git a/unittests/test_bmpbndl.py b/unittests/test_bmpbndl.py new file mode 100644 index 00000000..db5a436c --- /dev/null +++ b/unittests/test_bmpbndl.py @@ -0,0 +1,32 @@ +import unittest +from unittests import wtc +import wx +import os + +icoFile = os.path.join(os.path.dirname(__file__), 'mondrian.ico') +pngFile = os.path.join(os.path.dirname(__file__), 'pointy.png') + +#--------------------------------------------------------------------------- + +class bmpbndl_Tests(wtc.WidgetTestCase): + + def test_BitmapBundleCtor1(self): + b1 = wx.BitmapBundle() + self.assertTrue( not b1.IsOk() ) + + def test_BitmapBundleCtor2(self): + b2 = wx.BitmapBundle(wx.Bitmap(5, 10, 32)) + self.assertTrue( b2.IsOk() ) + + def test_BitmapBundleCtor3(self): + b3 = wx.BitmapBundle(wx.Icon(icoFile)) + self.assertTrue( b3.IsOk() ) + + def test_BitmapBundleCtor4(self): + b4 = wx.BitmapBundle(wx.Image(pngFile)) + self.assertTrue( b4.IsOk() ) + +#--------------------------------------------------------------------------- + +if __name__ == '__main__': + unittest.main() diff --git a/unittests/test_button.py b/unittests/test_button.py index 77e7b5e9..4ffc52c2 100644 --- a/unittests/test_button.py +++ b/unittests/test_button.py @@ -12,7 +12,7 @@ class ButtonTests(wtc.WidgetTestCase): def test_ButtonCtors(self): btn = wx.Button(self.frame, label='label') btn = wx.Button(self.frame, -1, 'label', (10,10), (100,-1), wx.BU_LEFT) - bmp = wx.Bitmap(pngFile) + bmp = wx.BitmapBundle(wx.Bitmap(pngFile)) btn.SetBitmap(bmp) def test_ButtonProperties(self): diff --git a/unittests/test_dataview.py b/unittests/test_dataview.py index 2a96ea45..2f7c07e3 100644 --- a/unittests/test_dataview.py +++ b/unittests/test_dataview.py @@ -87,7 +87,7 @@ class dataview_Tests(wtc.WidgetTestCase): def test_dataviewIconText2(self): icon = wx.Icon(pngFile) - dit = dv.DataViewIconText('Smile!', icon) + dit = dv.DataViewIconText('Smile!', wx.BitmapBundle(icon)) dit.Icon dit.Text diff --git a/unittests/test_headercol.py b/unittests/test_headercol.py index 98a03480..61ab1f23 100644 --- a/unittests/test_headercol.py +++ b/unittests/test_headercol.py @@ -14,9 +14,9 @@ class headercol_Tests(wtc.WidgetTestCase): def test_headercolCtor2(self): - bmp = wx.Bitmap(pngFile) + bmp = wx.BitmapBundle(wx.Bitmap(pngFile)) hc = wx.HeaderColumnSimple(bmp, flags=wx.COL_RESIZABLE) - hc.Bitmap + hc.BitmapBundle def test_headercolProperties(self): diff --git a/unittests/test_lib_agw_speedmeter.py b/unittests/test_lib_agw_speedmeter.py index cbc99276..13a06043 100644 --- a/unittests/test_lib_agw_speedmeter.py +++ b/unittests/test_lib_agw_speedmeter.py @@ -99,7 +99,7 @@ class lib_agw_speedmeter_Tests(wtc.WidgetTestCase): fgSizer.Add(panel1, 1, wx.EXPAND) boxSizer = wx.BoxSizer() - panel.SetSizer(boxSizer) + panel1.SetSizer(boxSizer) spW = SM.SpeedMeter(panel1, agwStyle=SM.SM_DRAW_HAND | SM.SM_DRAW_SECTORS | diff --git a/unittests/test_preferences.py b/unittests/test_preferences.py index 95ddc23c..a3c9c352 100644 --- a/unittests/test_preferences.py +++ b/unittests/test_preferences.py @@ -22,8 +22,8 @@ class preferences_Tests(wtc.WidgetTestCase): class MyPrefsPage(wx.PreferencesPage): def GetName(self): return 'MyPrefsPage' - def GetLargeIcon(self): - return wx.ArtProvider.GetBitmap(wx.ART_HELP, wx.ART_TOOLBAR, (32,32)) + def GetIcon(self): + return wx.ArtProvider.GetBitmapBundle(wx.ART_HELP, wx.ART_TOOLBAR) def CreateWindow(self, parent): return MyPrefsPanel(parent) diff --git a/unittests/test_richtextbuffer.py b/unittests/test_richtextbuffer.py index fb7e2b05..ef834171 100644 --- a/unittests/test_richtextbuffer.py +++ b/unittests/test_richtextbuffer.py @@ -238,7 +238,13 @@ class richtextbuffer_Tests(wtc.WidgetTestCase): o1 = wx.richtext.RichTextLine(None) def test_richtextbuffer26(self): - o1 = wx.richtext.RichTextLineList() + para = wx.richtext.RichTextParagraph() + para.AllocateLine(0) + para.AllocateLine(1) + lines = para.GetLines() + self.assertEqual(len(lines), 2) + for l in lines: + self.assertTrue(isinstance(l, wx.richtext.RichTextLine)) def test_richtextbuffer27(self): o1 = wx.richtext.RichTextParagraph() diff --git a/unittests/test_taskbar.py b/unittests/test_taskbar.py index 02c51e8a..f18284cd 100644 --- a/unittests/test_taskbar.py +++ b/unittests/test_taskbar.py @@ -12,7 +12,7 @@ class taskbar_Tests(wtc.WidgetTestCase): def test_taskbar1(self): icon = wx.adv.TaskBarIcon(wx.adv.TBI_DOCK) - icon.SetIcon(wx.Icon(icoFile), "The tip string") + icon.SetIcon(wx.BitmapBundle(wx.Icon(icoFile)), "The tip string") self.assertTrue(icon.IsOk()) icon.Destroy() self.myYield() diff --git a/unittests/test_tglbtn.py b/unittests/test_tglbtn.py index cef0a53b..2f717420 100644 --- a/unittests/test_tglbtn.py +++ b/unittests/test_tglbtn.py @@ -12,7 +12,7 @@ class tglbtn_Tests(wtc.WidgetTestCase): def test_tglbtnCtors(self): btn = wx.ToggleButton(self.frame, label='label') btn = wx.ToggleButton(self.frame, -1, 'label', (10,10), (100,-1), wx.BU_LEFT) - bmp = wx.Bitmap(pngFile) + bmp = wx.BitmapBundle(wx.Bitmap(pngFile)) btn.SetBitmap(bmp) diff --git a/unittests/test_toolbar.py b/unittests/test_toolbar.py index 4ba1089e..3a5f1eae 100644 --- a/unittests/test_toolbar.py +++ b/unittests/test_toolbar.py @@ -43,7 +43,7 @@ class toolbar_Tests(wtc.WidgetTestCase): tools = [] for bmp in bmps: - tool = tb.AddTool(-1, 'label', bmp) + tool = tb.AddTool(-1, 'label', wx.BitmapBundle(bmp)) self.assertTrue(isinstance(tool, wx.ToolBarToolBase)) tools.append(tool) tb.Realize() diff --git a/unittests/test_wizard.py b/unittests/test_wizard.py index eecceac4..2bf5248b 100644 --- a/unittests/test_wizard.py +++ b/unittests/test_wizard.py @@ -34,7 +34,7 @@ class wizard_Tests(wtc.WidgetTestCase): def test_wizard2(self): # Create the wizard - bmp = wx.Bitmap(pngFile) + bmp = wx.BitmapBundle(wx.Bitmap(pngFile)) wiz = wx.adv.Wizard(self.frame, title="Test Wizard 2", bitmap=bmp) # create the pages @@ -54,7 +54,7 @@ class wizard_Tests(wtc.WidgetTestCase): def test_wizard3(self): # Same as above but use the Chain function to connect the pages - bmp = wx.Bitmap(pngFile) + bmp = wx.BitmapBundle(wx.Bitmap(pngFile)) wiz = wx.adv.Wizard(self.frame, title="Test Wizard 2", bitmap=bmp) pages = [] @@ -74,7 +74,7 @@ class wizard_Tests(wtc.WidgetTestCase): def test_wizard4(self): # Create the wizard - bmp = wx.Bitmap(pngFile) + bmp = wx.BitmapBundle(wx.Bitmap(pngFile)) wiz = wx.adv.Wizard(self.frame, title="Test Wizard 2", bitmap=bmp) # create the pages diff --git a/unittests/test_wxdatetime.py b/unittests/test_wxdatetime.py index 6b4f5e3a..62e7d141 100644 --- a/unittests/test_wxdatetime.py +++ b/unittests/test_wxdatetime.py @@ -158,7 +158,7 @@ class datetime_Tests(wtc.WidgetTestCase): def test_datetimeParseDate3(self): d = wx.DateTime() val = d.ParseDate('10/25/2015 non-date text') - self.assertEqual(val, 13) + self.assertEqual(val, 10) def test_datetimeParseDateTime1(self): diff --git a/wx/lib/agw/infobar.py b/wx/lib/agw/infobar.py index 7e528a39..1b8ee9ef 100644 --- a/wx/lib/agw/infobar.py +++ b/wx/lib/agw/infobar.py @@ -381,8 +381,8 @@ class InfoBar(wx.Control): self._button = wx.BitmapButton(self, wx.ID_ANY, bmp, style=wx.BORDER_NONE) if wx.Platform != '__WXGTK__': - self._button.SetBitmapPressed(GetCloseButtonBitmap(self, sizeBmp, colBg, wx.CONTROL_PRESSED)) - self._button.SetBitmapCurrent(GetCloseButtonBitmap(self, sizeBmp, colBg, wx.CONTROL_CURRENT)) + self._button.SetBitmapPressed(wx.BitmapBundle(GetCloseButtonBitmap(self, sizeBmp, colBg, wx.CONTROL_PRESSED))) + self._button.SetBitmapCurrent(wx.BitmapBundle(GetCloseButtonBitmap(self, sizeBmp, colBg, wx.CONTROL_CURRENT))) self._button.SetBackgroundColour(colBg) self._button.SetToolTip(_("Hide this notification message.")) diff --git a/wx/lib/floatcanvas/NavCanvas.py b/wx/lib/floatcanvas/NavCanvas.py index fdd06427..4e24d150 100644 --- a/wx/lib/floatcanvas/NavCanvas.py +++ b/wx/lib/floatcanvas/NavCanvas.py @@ -119,7 +119,8 @@ class NavCanvas(wx.Panel): self.ModesDict = {} for Mode in Modes: tool = tb.AddTool(wx.ID_ANY, label=Mode[0], - shortHelp=Mode[0], bitmap=Mode[2], + shortHelp=Mode[0], + bitmap=wx.BitmapBundle(Mode[2]), kind=wx.ITEM_RADIO) self.Bind(wx.EVT_TOOL, self.SetMode, tool) self.ModesDict[tool.GetId()]=Mode[1] diff --git a/wx/lib/inspection.py b/wx/lib/inspection.py index 820c0cfa..eddf576c 100644 --- a/wx/lib/inspection.py +++ b/wx/lib/inspection.py @@ -208,15 +208,15 @@ class InspectionFrame(wx.Frame): tbar = self.CreateToolBar(wx.TB_HORIZONTAL | wx.TB_FLAT | wx.TB_TEXT | wx.NO_BORDER ) tbar.SetToolBitmapSize((24,24)) - refreshBmp = Refresh.GetBitmap() - findWidgetBmp = Find.GetBitmap() - showSizersBmp = ShowSizers.GetBitmap() - expandTreeBmp = ExpandTree.GetBitmap() - collapseTreeBmp = CollapseTree.GetBitmap() - highlightItemBmp = HighlightItem.GetBitmap() - evtWatcherBmp = EvtWatcher.GetBitmap() + refreshBmp = wx.BitmapBundle(Refresh.GetBitmap()) + findWidgetBmp = wx.BitmapBundle(Find.GetBitmap()) + showSizersBmp = wx.BitmapBundle(ShowSizers.GetBitmap()) + expandTreeBmp = wx.BitmapBundle(ExpandTree.GetBitmap()) + collapseTreeBmp = wx.BitmapBundle(CollapseTree.GetBitmap()) + highlightItemBmp = wx.BitmapBundle(HighlightItem.GetBitmap()) + evtWatcherBmp = wx.BitmapBundle(EvtWatcher.GetBitmap()) - toggleFillingBmp = ShowFilling.GetBitmap() + toggleFillingBmp = wx.BitmapBundle(ShowFilling.GetBitmap()) refreshTool = tbar.AddTool(-1, 'Refresh', refreshBmp, shortHelp = 'Refresh widget tree (F1)')