sc/qa/uitest/autofilter/autofilter.py | 4 ++-- sw/qa/uitest/sidebar/tdf152921.py | 16 ++++++++-------- sw/qa/uitest/writer_tests4/spellDialog.py | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-)
New commits: commit 4e254871c801c4af84f33c13385e3d9e725d4bc3 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Jun 20 15:17:38 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Jun 20 17:31:53 2025 +0200 uitest: use assertEqual instead of assertTrue/False As seen in sc/qa/uitest/autofilter/autofilter.py, get_state_as_dict(xTreeList.getChild('0'))['IsSelected'] return 'true' or 'false', so assertTrue is always true, because the string is not empty. Change-Id: Ia388ed269ebb0f6d0aea0bdb7f2e208dd7a08d77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186768 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sc/qa/uitest/autofilter/autofilter.py b/sc/qa/uitest/autofilter/autofilter.py index fbf46cc5d397..bcbc8ccad769 100644 --- a/sc/qa/uitest/autofilter/autofilter.py +++ b/sc/qa/uitest/autofilter/autofilter.py @@ -114,8 +114,8 @@ class AutofilterTest(UITestCase): xTreeList = xCheckListMenu.getChild("check_tree_box") self.assertEqual(2, len(xTreeList.getChildren())) - self.assertTrue(get_state_as_dict(xTreeList.getChild('0'))['IsSelected']) - self.assertTrue(get_state_as_dict(xTreeList.getChild('1'))['IsSelected']) + self.assertEqual('true', get_state_as_dict(xTreeList.getChild('0'))['IsSelected']) + self.assertEqual('false', get_state_as_dict(xTreeList.getChild('1'))['IsSelected']) xOkBtn = xFloatWindow.getChild("ok") xOkBtn.executeAction("CLICK", tuple()) diff --git a/sw/qa/uitest/sidebar/tdf152921.py b/sw/qa/uitest/sidebar/tdf152921.py index 77f0370e2de1..2bc953258ae5 100644 --- a/sw/qa/uitest/sidebar/tdf152921.py +++ b/sw/qa/uitest/sidebar/tdf152921.py @@ -28,43 +28,43 @@ class tdf152921(UITestCase): xDeckTitleToolBar.executeAction("CLICK", mkPropertyValues({"POS": "1"})) # tabbar is visible, deck is not # without the patch this assert would fail, a tab would be highlighted - self.assertFalse(len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) + self.assertEqual(0, len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) # open a panel and assert that a tab is highlighted, also assert that only one tab is # highlighted, only a single tab should ever be highlighted xWriterEdit.executeAction("SIDEBAR", mkPropertyValues({"PANEL": "TextPropertyPanel"})) - self.assertTrue(len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) + self.assertEqual(12, len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) self.assertEqual(len(get_state_as_dict(xTabBar)['HighlightedTabsIds'].split(",")), 1) # click on the 'Close Sidebar Deck' button in the deck title tool bar xDeckTitleToolBar.executeAction("CLICK", mkPropertyValues({"POS": "1"})) # without the patch this assert would fail, a tab would be highlighted - self.assertFalse(len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) + self.assertEqual(0, len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) # open a deck by simulating a click on a tab in the tabbar xTabBar.executeAction("CLICK", mkPropertyValues({"POS": "4"})) - self.assertTrue(len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) + self.assertEqual(14, len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) self.assertEqual(len(get_state_as_dict(xTabBar)['HighlightedTabsIds'].split(",")), 1) # close it by clicking on the same tab xTabBar.executeAction("CLICK", mkPropertyValues({"POS": "4"})) # tabbar is visible, deck is not # without the patch this assert would fail, a tab would be highlighted - self.assertFalse(len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) + self.assertEqual(0, len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) # open a deck xTabBar.executeAction("CLICK", mkPropertyValues({"POS": "3"})) - self.assertTrue(len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) + self.assertEqual(13, len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) self.assertEqual(len(get_state_as_dict(xTabBar)['HighlightedTabsIds'].split(",")), 1) # open a different deck xTabBar.executeAction("CLICK", mkPropertyValues({"POS": "1"})) - self.assertTrue(len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) + self.assertEqual(13, len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) self.assertEqual(len(get_state_as_dict(xTabBar)['HighlightedTabsIds'].split(",")), 1) # click on the 'Close Sidebar Deck' button xDeckTitleToolBar.executeAction("CLICK", mkPropertyValues({"POS": "1"})) # without the patch this assert would fail, a tab would be highlighted - self.assertFalse(len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) + self.assertEqual(0, len(get_state_as_dict(xTabBar)['HighlightedTabsIds'])) # vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sw/qa/uitest/writer_tests4/spellDialog.py b/sw/qa/uitest/writer_tests4/spellDialog.py index c01e78e10593..76804053f7e7 100644 --- a/sw/qa/uitest/writer_tests4/spellDialog.py +++ b/sw/qa/uitest/writer_tests4/spellDialog.py @@ -75,7 +75,7 @@ frog, dogg, catt""" checkgrammar = xDialog.getChild('checkgrammar') if get_state_as_dict(checkgrammar)['Selected'] == 'true': checkgrammar.executeAction('CLICK', ()) - self.assertTrue(get_state_as_dict(checkgrammar)['Selected'] == 'false') + self.assertEqual('false', get_state_as_dict(checkgrammar)['Selected']) # Step 4: Repetitively click on "Correct all" for each misspelling # prompt until end of document is reached. @@ -126,7 +126,7 @@ frog, dogg, catt""" checkgrammar = xDialog.getChild('checkgrammar') if get_state_as_dict(checkgrammar)['Selected'] == 'true': checkgrammar.executeAction('CLICK', ()) - self.assertTrue(get_state_as_dict(checkgrammar)['Selected'] == 'false') + self.assertEqual('false', get_state_as_dict(checkgrammar)['Selected']) # Step 2: Click on "Correct all" for each misspelling # prompt until end of document is reached. @@ -163,7 +163,7 @@ frog, dogg, catt""" checkgrammar = xDialog.getChild('checkgrammar') if get_state_as_dict(checkgrammar)['Selected'] == 'true': checkgrammar.executeAction('CLICK', ()) - self.assertTrue(get_state_as_dict(checkgrammar)['Selected'] == 'false') + self.assertEqual('false', get_state_as_dict(checkgrammar)['Selected']) change = xDialog.getChild('change') change.executeAction("CLICK", ())
