Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 01:30:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Explicitly calling ShowModal and Destroy avoids having WidgetTestCase's

Browse Source 
tlw.Close(force=True) trigger an exception because the dialog's EVT_CLOSE
handler is trying to call EndModal on a dialog which isn't modal.
This commit is contained in:
James Wettenhall
2017-03-23 21:55:22 +11:00
parent b678971bf4
commit 220b97f9e7
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unittests/test_lib_agw_cubecolourdialog.py
View File

@@ -12,6 +12,9 @@ class lib_agw_cubecolourdialog_Tests(wtc.WidgetTestCase):
colourData = wx.ColourData() colourData = wx.ColourData()
colourData.SetColour(wx.RED) colourData.SetColour(wx.RED)
dlg = CCD.CubeColourDialog(self.frame, colourData, agwStyle=0) dlg = CCD.CubeColourDialog(self.frame, colourData, agwStyle=0)
wx.CallLater(250, dlg.EndModal, wx.ID_OK)
dlg.ShowModal()
dlg.Destroy()
def test_lib_agw_cubecolourdialogMethods(self): def test_lib_agw_cubecolourdialogMethods(self):
colourData = wx.ColourData() colourData = wx.ColourData()
@@ -28,6 +31,9 @@ class lib_agw_cubecolourdialog_Tests(wtc.WidgetTestCase):
ccd_colour = CCD.Colour(wx.Colour(colour)) ccd_colour = CCD.Colour(wx.Colour(colour))
html = CCD.rgb2html(ccd_colour) html = CCD.rgb2html(ccd_colour)
self.assertTrue(html in CCD.HTMLCodes) self.assertTrue(html in CCD.HTMLCodes)
wx.CallLater(250, dlg.EndModal, wx.ID_OK)
dlg.ShowModal()
dlg.Destroy()
def test_lib_agw_cubecolourdialogConstantsExist(self): def test_lib_agw_cubecolourdialogConstantsExist(self):
# CubeColourDialog agwStyle # CubeColourDialog agwStyle

6
unittests/test_lib_agw_multidirdialog.py
View File

@@ -11,6 +11,9 @@ class lib_agw_multidirdialog_Tests(wtc.WidgetTestCase):
def test_lib_agw_multidirdialogCtor(self): def test_lib_agw_multidirdialogCtor(self):
dlg = MDD.MultiDirDialog(self.frame, title="Custom MultiDirDialog", dlg = MDD.MultiDirDialog(self.frame, title="Custom MultiDirDialog",
agwStyle=MDD.DD_MULTIPLE|MDD.DD_DIR_MUST_EXIST) agwStyle=MDD.DD_MULTIPLE|MDD.DD_DIR_MUST_EXIST)
wx.CallLater(250, dlg.EndModal, wx.ID_OK)
dlg.ShowModal()
dlg.Destroy()
def test_lib_agw_multidirdialogMethods(self): def test_lib_agw_multidirdialogMethods(self):
dlg = MDD.MultiDirDialog(self.frame, title="Custom MultiDirDialog", dlg = MDD.MultiDirDialog(self.frame, title="Custom MultiDirDialog",
@@ -21,6 +24,9 @@ class lib_agw_multidirdialog_Tests(wtc.WidgetTestCase):
# it looks like the generic dir ctrl may start out with an item # it looks like the generic dir ctrl may start out with an item
# selected, so allow for that here # selected, so allow for that here
self.assertTrue(len(dlg.GetPaths()) in [0,1]) self.assertTrue(len(dlg.GetPaths()) in [0,1])
wx.CallLater(250, dlg.EndModal, wx.ID_OK)
dlg.ShowModal()
dlg.Destroy()
def test_lib_agw_multidirdialogConstantsExist(self): def test_lib_agw_multidirdialogConstantsExist(self):