sc/qa/uitest/autofilter/autofilter.py | 27 +++++++++++++-------------- sc/qa/uitest/autofilter/tdf68113.py | 14 ++++++-------- 2 files changed, 19 insertions(+), 22 deletions(-)
New commits: commit 9290bf7dc16c0b407a77a693ba56a1330d8f9db2 Author: Gabor Kelemen <[email protected]> AuthorDate: Thu Aug 19 19:01:45 2021 +0200 Commit: Gabor Kelemen <[email protected]> CommitDate: Thu Aug 19 19:15:52 2021 +0200 Uncomment formerly commented uitest asserts Change-Id: I1d6b0cd7dc679ac73e3efb71f9bc4483fcc9a778 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120758 Tested-by: Gabor Kelemen <[email protected]> Reviewed-by: Gabor Kelemen <[email protected]> diff --git a/sc/qa/uitest/autofilter/autofilter.py b/sc/qa/uitest/autofilter/autofilter.py index 3f0335afe47f..b45fa0a5196b 100644 --- a/sc/qa/uitest/autofilter/autofilter.py +++ b/sc/qa/uitest/autofilter/autofilter.py @@ -309,11 +309,11 @@ class AutofilterTest(UITestCase): xCheckListMenu = xFloatWindow.getChild("check_list_menu") xTreeList = xCheckListMenu.getChild("check_list_box") self.assertEqual(5, len(xTreeList.getChildren())) - #self.assertEqual('true', get_state_as_dict(xTreeList.getChild('0'))['IsChecked']) - #self.assertEqual('false', get_state_as_dict(xTreeList.getChild('1'))['IsChecked']) - #self.assertEqual('true', get_state_as_dict(xTreeList.getChild('2'))['IsChecked']) - #self.assertEqual('false', get_state_as_dict(xTreeList.getChild('3'))['IsChecked']) - #self.assertEqual('true', get_state_as_dict(xTreeList.getChild('4'))['IsChecked']) + self.assertEqual('true', get_state_as_dict(xTreeList.getChild('0'))['IsChecked']) + self.assertEqual('false', get_state_as_dict(xTreeList.getChild('1'))['IsChecked']) + self.assertEqual('true', get_state_as_dict(xTreeList.getChild('2'))['IsChecked']) + self.assertEqual('false', get_state_as_dict(xTreeList.getChild('3'))['IsChecked']) + self.assertEqual('true', get_state_as_dict(xTreeList.getChild('4'))['IsChecked']) xOkBtn = xFloatWindow.getChild("cancel") xOkBtn.executeAction("CLICK", tuple()) @@ -343,11 +343,11 @@ class AutofilterTest(UITestCase): self.assertEqual("0.500", get_state_as_dict(xTreeList.getChild('3'))['Text']) self.assertEqual("0.516", get_state_as_dict(xTreeList.getChild('4'))['Text']) - #self.assertEqual('false', get_state_as_dict(xTreeList.getChild('0'))['IsChecked']) - #self.assertEqual('true', get_state_as_dict(xTreeList.getChild('1'))['IsChecked']) - #self.assertEqual('false', get_state_as_dict(xTreeList.getChild('2'))['IsChecked']) - #self.assertEqual('true', get_state_as_dict(xTreeList.getChild('3'))['IsChecked']) - #self.assertEqual('true', get_state_as_dict(xTreeList.getChild('4'))['IsChecked']) + self.assertEqual('false', get_state_as_dict(xTreeList.getChild('0'))['IsChecked']) + self.assertEqual('true', get_state_as_dict(xTreeList.getChild('1'))['IsChecked']) + self.assertEqual('false', get_state_as_dict(xTreeList.getChild('2'))['IsChecked']) + self.assertEqual('true', get_state_as_dict(xTreeList.getChild('3'))['IsChecked']) + self.assertEqual('true', get_state_as_dict(xTreeList.getChild('4'))['IsChecked']) xFirstEntry = xTreeList.getChild("0") xFirstEntry.executeAction("CLICK", tuple()) @@ -403,10 +403,9 @@ class AutofilterTest(UITestCase): xCheckListMenu = xFloatWindow.getChild("check_list_menu") xList = xCheckListMenu.getChild("check_list_box") self.assertEqual(3, len(xList.getChildren())) - # FIXME these lines somehow fail but UI works fine - #self.assertEqual('true', get_state_as_dict(xList.getChild('0'))['IsChecked']) - #self.assertEqual('true', get_state_as_dict(xList.getChild('1'))['IsChecked']) - #self.assertEqual('false', get_state_as_dict(xList.getChild('2'))['IsChecked']) + self.assertEqual('true', get_state_as_dict(xList.getChild('0'))['IsChecked']) + self.assertEqual('true', get_state_as_dict(xList.getChild('1'))['IsChecked']) + self.assertEqual('false', get_state_as_dict(xList.getChild('2'))['IsChecked']) xCloseButton = xFloatWindow.getChild("cancel") xCloseButton.executeAction("CLICK", tuple()) diff --git a/sc/qa/uitest/autofilter/tdf68113.py b/sc/qa/uitest/autofilter/tdf68113.py index 3b1fa3fd9863..dd211665f614 100644 --- a/sc/qa/uitest/autofilter/tdf68113.py +++ b/sc/qa/uitest/autofilter/tdf68113.py @@ -44,10 +44,9 @@ class tdf68113(UITestCase): xCheckListMenu = xFloatWindow.getChild("check_list_menu") xTreeList = xCheckListMenu.getChild("check_list_box") self.assertEqual(5, len(xTreeList.getChildren())) - # FIXME this fails for some reason - #self.assertEqual('false', get_state_as_dict(xTreeList.getChild('0'))['IsChecked']) - #self.assertEqual('false', get_state_as_dict(xTreeList.getChild('2'))['IsChecked']) - #self.assertEqual('true', get_state_as_dict(xTreeList.getChild('4'))['IsChecked']) + self.assertEqual('false', get_state_as_dict(xTreeList.getChild('0'))['IsChecked']) + self.assertEqual('false', get_state_as_dict(xTreeList.getChild('2'))['IsChecked']) + self.assertEqual('true', get_state_as_dict(xTreeList.getChild('4'))['IsChecked']) xCancelBtn = xFloatWindow.getChild("cancel") xCancelBtn.executeAction("CLICK", tuple()) @@ -67,10 +66,9 @@ class tdf68113(UITestCase): xCheckListMenu = xFloatWindow.getChild("check_list_menu") xTreeList = xCheckListMenu.getChild("check_list_box") self.assertEqual(5, len(xTreeList.getChildren())) - # FIXME this fails for some reason - #self.assertEqual('true', get_state_as_dict(xTreeList.getChild('0'))['IsChecked']) - #self.assertEqual('true', get_state_as_dict(xTreeList.getChild('2'))['IsChecked']) - #self.assertEqual('false', get_state_as_dict(xTreeList.getChild('4'))['IsChecked']) + self.assertEqual('true', get_state_as_dict(xTreeList.getChild('0'))['IsChecked']) + self.assertEqual('true', get_state_as_dict(xTreeList.getChild('2'))['IsChecked']) + self.assertEqual('false', get_state_as_dict(xTreeList.getChild('4'))['IsChecked']) xCancelBtn = xFloatWindow.getChild("cancel") xCancelBtn.executeAction("CLICK", tuple())
