diff --git a/sc/qa/uitest/calc_tests8/navigator.py b/sc/qa/uitest/calc_tests8/navigator.py index ec8fa2ae9a2e..f917e6e84b30 100644 --- a/sc/qa/uitest/calc_tests8/navigator.py +++ b/sc/qa/uitest/calc_tests8/navigator.py @@ -142,8 +142,7 @@ class navigator(UITestCase): xColumn.executeAction("TYPE", mkPropertyValues({"TEXT":"B"})) xColumn.executeAction("TYPE", mkPropertyValues({"KEYCODE":"RETURN"})) xToolkit.processEventsToIdle() -# disable flakey UITest -# self.assertEqual(get_state_as_dict(xColumn)['Value'], '2') + self.assertEqual(get_state_as_dict(xColumn)['Value'], '2') xRow.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) xRow.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) diff --git a/sw/UITest_sw_navigator.mk b/sw/UITest_sw_navigator.mk index 270ca6a9844a..901807349812 100644 --- a/sw/UITest_sw_navigator.mk +++ b/sw/UITest_sw_navigator.mk @@ -15,6 +15,6 @@ $(eval $(call gb_UITest_set_defs,sw_navigator, \ TDOC="$(SRCDIR)/sw/qa/uitest/data" \ )) -$(eval $(call gb_UITest_use_oneprocess,sw_navigator)) +$(eval $(call gb_UITest_avoid_oneprocess,sw_navigator)) # vim: set noet sw=4 ts=4: diff --git a/sw/qa/uitest/navigator/tdf134960.py b/sw/qa/uitest/navigator/tdf134960.py index 031852d15fb4..8388b63e40f9 100644 --- a/sw/qa/uitest/navigator/tdf134960.py +++ b/sw/qa/uitest/navigator/tdf134960.py @@ -34,9 +34,8 @@ class tdf134960_hyperlinks(UITestCase): xHyperlinks.executeAction("EXPAND", tuple()) expectedHyperlinksOrder = [1, 2, 8, 9, 7, 10, 11, 3, 12, 4, 5, 6] -# disable flakey test -# for i in range(12): -# self.assertEqual('Hyperlink ' + str(expectedHyperlinksOrder[i]), get_state_as_dict(xHyperlinks.getChild(str(i)))['Text']) + for i in range(12): + self.assertEqual('Hyperlink ' + str(expectedHyperlinksOrder[i]), get_state_as_dict(xHyperlinks.getChild(str(i)))['Text']) xHyperlinks.executeAction("COLLAPSE", tuple()) diff --git a/sw/qa/uitest/navigator/tdf137274.py b/sw/qa/uitest/navigator/tdf137274.py index f984d78b032a..5273ddcb2f91 100644 --- a/sw/qa/uitest/navigator/tdf137274.py +++ b/sw/qa/uitest/navigator/tdf137274.py @@ -59,24 +59,23 @@ class tdf137274(UITestCase): # wait until the second comment is available self.ui_test.wait_until_child_is_available('Comment2') -# disable flakey test -# # xComments needs reassigned after content tree change -# while True: -# xComments = self.get_item(xContentTree, 'Comments') -# if '1' in xComments.getChildren(): -# break -# time.sleep(self.ui_test.get_default_sleep()) -# self.assertEqual('Comments', get_state_as_dict(xComments)['Text']) -# -# xComments.executeAction("EXPAND", tuple()) -# -# # Without the fix in place, this test would have failed with AssertionError: 2 != 0 -# self.assertEqual(2, len(xComments.getChildren())) -# self.assertEqual('C1', get_state_as_dict(xComments.getChild('0'))['Text']) -# -# xComments.executeAction("COLLAPSE", tuple()) -# -# self.xUITest.executeCommand(".uno:Sidebar") + # xComments needs reassigned after content tree change + while True: + xComments = self.get_item(xContentTree, 'Comments') + if '1' in xComments.getChildren(): + break + time.sleep(self.ui_test.get_default_sleep()) + self.assertEqual('Comments', get_state_as_dict(xComments)['Text']) + + xComments.executeAction("EXPAND", tuple()) + + # Without the fix in place, this test would have failed with AssertionError: 2 != 0 + self.assertEqual(2, len(xComments.getChildren())) + self.assertEqual('C1', get_state_as_dict(xComments.getChild('0'))['Text']) + + xComments.executeAction("COLLAPSE", tuple()) + + self.xUITest.executeCommand(".uno:Sidebar") # vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sw/qa/uitest/navigator/tdf144672.py b/sw/qa/uitest/navigator/tdf144672.py index 790840ad3329..4bded66dcb08 100644 --- a/sw/qa/uitest/navigator/tdf144672.py +++ b/sw/qa/uitest/navigator/tdf144672.py @@ -40,21 +40,21 @@ class tdf144672(UITestCase): # tdf#129625: Without the fix in place, this test would have failed with # AssertionError: 'true' != 'false' self.assertEqual('true', get_state_as_dict(xReferences)['IsSemiTransparent']) -# disable flakey UITest -# xIndexes = self.get_item(xContentTree, 'Indexes') -# self.assertEqual('Indexes', get_state_as_dict(xIndexes)['Text']) -# self.assertEqual('false', get_state_as_dict(xIndexes)['IsSemiTransparent']) -# -# xIndexes.executeAction("EXPAND", tuple()) -# -# self.assertEqual('3', get_state_as_dict(xIndexes)['Children']) -# -# for i in range(3): -# # Without the fix in place, this test would have failed here with -# # AssertionError: 'false' != 'true' -# self.assertEqual('false', get_state_as_dict(xIndexes.getChild(i))['IsSemiTransparent']) -# -# xIndexes.executeAction("COLLAPSE", tuple()) + + xIndexes = self.get_item(xContentTree, 'Indexes') + self.assertEqual('Indexes', get_state_as_dict(xIndexes)['Text']) + self.assertEqual('false', get_state_as_dict(xIndexes)['IsSemiTransparent']) + + xIndexes.executeAction("EXPAND", tuple()) + + self.assertEqual('3', get_state_as_dict(xIndexes)['Children']) + + for i in range(3): + # Without the fix in place, this test would have failed here with + # AssertionError: 'false' != 'true' + self.assertEqual('false', get_state_as_dict(xIndexes.getChild(i))['IsSemiTransparent']) + + xIndexes.executeAction("COLLAPSE", tuple()) self.xUITest.executeCommand(".uno:Sidebar") diff --git a/sw/qa/uitest/navigator/tdf148198.py b/sw/qa/uitest/navigator/tdf148198.py index f22f9ada7cae..3e7b00e7d5e0 100644 --- a/sw/qa/uitest/navigator/tdf148198.py +++ b/sw/qa/uitest/navigator/tdf148198.py @@ -58,8 +58,7 @@ class tdf148198(UITestCase): # without the fix in place, this would fail: # AssertionError: '2' != '11' -# Disable unreliable test, sometimes fails with AssertionError: '2' != '0' -# self.assertEqual('2', get_state_as_dict(xHyperlinks)['Children']) + self.assertEqual('2', get_state_as_dict(xHyperlinks)['Children']) self.assertEqual(sHyperlink0, get_state_as_dict(xHyperlinks.getChild('0'))['Text']) self.assertEqual(sHyperlink1, get_state_as_dict(xHyperlinks.getChild('1'))['Text']) diff --git a/sw/qa/uitest/navigator/tdf154521.py b/sw/qa/uitest/navigator/tdf154521.py index 35972c5f53a7..7b2125646ec6 100644 --- a/sw/qa/uitest/navigator/tdf154521.py +++ b/sw/qa/uitest/navigator/tdf154521.py @@ -155,48 +155,47 @@ class tdf154521(UITestCase): # Try the same selection with Bookmark 2 xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"})) -# disable flakey UITest -# self.ui_test.wait_until_property_is_updated(xContentTree, "SelectEntryText", "Bookmark 2") -# self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "Bookmark 2") -# self.assertEqual(get_state_as_dict(xContentTree)["SelectionCount"], "1") -# xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) -# self.ui_test.wait_until_property_is_updated(xContentTree, "SelectEntryText", "Bookmark 2") -# self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "Bookmark 2") -# self.assertEqual(get_state_as_dict(xContentTree)["SelectionCount"], "1") - -# # This was "Navigator" -# self.assertEqual(self.getTitle(xDoc), "Bookmark 2") - -# # Try the same selection with Bookmark 3 - -# # why we need this extra UP? -# xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"})) -# self.ui_test.wait_until_property_is_updated(xContentTree, "SelectEntryText", "Bookmark 2") -# xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"})) -# self.ui_test.wait_until_property_is_updated(xContentTree, "SelectEntryText", "Bookmark 3") - -# self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "Bookmark 3") -# self.assertEqual(get_state_as_dict(xContentTree)["SelectionCount"], "1") -# xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) -# self.ui_test.wait_until_property_is_updated(xContentTree, "SelectEntryText", "Bookmark 3") -# self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "Bookmark 3") -# self.assertEqual(get_state_as_dict(xContentTree)["SelectionCount"], "1") - -# # This was "Navigator" -# self.assertEqual(self.getTitle(xDoc), "Bookmark 3") - -# # go to the previous item - -# # why we need this extra UP? -# xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"})) -# self.ui_test.wait_until_property_is_updated(xContentTree, "SelectEntryText", "Bookmark 3") -# xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"})) -# self.ui_test.wait_until_property_is_updated(xContentTree, "SelectEntryText", "Bookmarks") -# self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "Bookmarks") -# xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) + self.ui_test.wait_until_property_is_updated(xContentTree, "SelectEntryText", "Bookmark 2") + self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "Bookmark 2") + self.assertEqual(get_state_as_dict(xContentTree)["SelectionCount"], "1") + xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) + self.ui_test.wait_until_property_is_updated(xContentTree, "SelectEntryText", "Bookmark 2") + self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "Bookmark 2") + self.assertEqual(get_state_as_dict(xContentTree)["SelectionCount"], "1") # This was "Navigator" -# self.assertEqual(self.getTitle(xDoc), "") + self.assertEqual(self.getTitle(xDoc), "Bookmark 2") + + # Try the same selection with Bookmark 3 + + # why we need this extra UP? + xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"})) + self.ui_test.wait_until_property_is_updated(xContentTree, "SelectEntryText", "Bookmark 2") + xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"})) + self.ui_test.wait_until_property_is_updated(xContentTree, "SelectEntryText", "Bookmark 3") + + self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "Bookmark 3") + self.assertEqual(get_state_as_dict(xContentTree)["SelectionCount"], "1") + xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) + self.ui_test.wait_until_property_is_updated(xContentTree, "SelectEntryText", "Bookmark 3") + self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "Bookmark 3") + self.assertEqual(get_state_as_dict(xContentTree)["SelectionCount"], "1") + + # This was "Navigator" + self.assertEqual(self.getTitle(xDoc), "Bookmark 3") + + # go to the previous item + + # why we need this extra UP? + xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"})) + self.ui_test.wait_until_property_is_updated(xContentTree, "SelectEntryText", "Bookmark 3") + xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"})) + self.ui_test.wait_until_property_is_updated(xContentTree, "SelectEntryText", "Bookmarks") + self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "Bookmarks") + xContentTree.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) + + # This was "Navigator" + self.assertEqual(self.getTitle(xDoc), "") self.xUITest.executeCommand(".uno:Sidebar")