From f04870647fa5f0250d2c6b4cf0f5331832daa8c7 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 10 Dec 2013 16:20:48 +0100 Subject: [PATCH] Squish: Remove workaround for fixed bug Change-Id: Ib6a47fbab85835fd33424134fefca153a3595d6b Reviewed-by: Robert Loehning --- tests/system/shared/editor_utils.py | 2 -- tests/system/shared/workarounds.py | 5 ----- tests/system/suite_editors/tst_basic_cpp_support/test.py | 3 --- tests/system/suite_editors/tst_delete_externally/test.py | 2 -- tests/system/suite_editors/tst_revert_changes/test.py | 2 -- tests/system/suite_editors/tst_select_all/test.py | 2 -- 6 files changed, 16 deletions(-) diff --git a/tests/system/shared/editor_utils.py b/tests/system/shared/editor_utils.py index ef48fdfd399..ec0b8762d7d 100644 --- a/tests/system/shared/editor_utils.py +++ b/tests/system/shared/editor_utils.py @@ -94,8 +94,6 @@ def widgetContainsPoint(widget, point): # at the same position where the text cursor is located at def openContextMenuOnTextCursorPosition(editor): rect = editor.cursorRect(editor.textCursor()) - if platform.system() == 'Darwin': - JIRA.performWorkaroundForBug(8735, JIRA.Bug.CREATOR, editor) openContextMenu(editor, rect.x+rect.width/2, rect.y+rect.height/2, 0) menuInList = [None] waitFor("menuVisibleAtEditor(editor, menuInList)", 5000) diff --git a/tests/system/shared/workarounds.py b/tests/system/shared/workarounds.py index 1db3a107515..509e4291d87 100644 --- a/tests/system/shared/workarounds.py +++ b/tests/system/shared/workarounds.py @@ -216,7 +216,6 @@ class JIRA: def __initBugDict__(self): self.__bugs__= { 'QTCREATORBUG-6853':self._workaroundCreator6853_, - 'QTCREATORBUG-8735':self._workaroundCreator_MacEditorFocus_ } # helper function - will be called if no workaround for the requested bug is deposited def _exitFatal_(self, bugType, number): @@ -227,7 +226,3 @@ class JIRA: def _workaroundCreator6853_(self, *args): if "Release" in args[0] and platform.system() == "Linux": snooze(2) - - def _workaroundCreator_MacEditorFocus_(self, *args): - editor = args[0] - nativeMouseClick(editor.mapToGlobal(QPoint(50, 50)).x, editor.mapToGlobal(QPoint(50, 50)).y, Qt.LeftButton) diff --git a/tests/system/suite_editors/tst_basic_cpp_support/test.py b/tests/system/suite_editors/tst_basic_cpp_support/test.py index 106c45c5b6a..12aef06d040 100644 --- a/tests/system/suite_editors/tst_basic_cpp_support/test.py +++ b/tests/system/suite_editors/tst_basic_cpp_support/test.py @@ -63,9 +63,6 @@ def main(): # - Press F2 or select from the menu: Tools / C++ / Follow Symbol under Cursor # Creator will show you the declaration of the variable. - if platform.system() == "Darwin": - JIRA.performWorkaroundForBug(8735, JIRA.Bug.CREATOR, cppwindow) - type(cppwindow, "") type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), " xi") type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), "") diff --git a/tests/system/suite_editors/tst_delete_externally/test.py b/tests/system/suite_editors/tst_delete_externally/test.py index 2c4a22f9ebc..ab622af5834 100644 --- a/tests/system/suite_editors/tst_delete_externally/test.py +++ b/tests/system/suite_editors/tst_delete_externally/test.py @@ -61,8 +61,6 @@ def main(): "Skipping this file for now.") continue - if platform.system() == 'Darwin': - JIRA.performWorkaroundForBug(8735, JIRA.Bug.CREATOR, editor) contentBefore = readFile(currentFile) popupText = "The file %s was removed. Do you want to save it under a different name, or close the editor?" os.remove(currentFile) diff --git a/tests/system/suite_editors/tst_revert_changes/test.py b/tests/system/suite_editors/tst_revert_changes/test.py index 670adcccde6..b08ec394a53 100644 --- a/tests/system/suite_editors/tst_revert_changes/test.py +++ b/tests/system/suite_editors/tst_revert_changes/test.py @@ -91,8 +91,6 @@ def __modifyProFile__(): # re-order some stuff inside header def __modifyHeader__(): global cppEditorStr, homeShortCut, endShortCut - if platform.system() == "Darwin": - JIRA.performWorkaroundForBug(8735, JIRA.Bug.CREATOR, waitForObject(cppEditorStr, 1000)) if placeCursorToLine(cppEditorStr, "class.+", True): type(cppEditorStr, homeShortCut) markText(cppEditorStr, "Down", 5) diff --git a/tests/system/suite_editors/tst_select_all/test.py b/tests/system/suite_editors/tst_select_all/test.py index 29a07fe7f11..c0a2b58ec3d 100644 --- a/tests/system/suite_editors/tst_select_all/test.py +++ b/tests/system/suite_editors/tst_select_all/test.py @@ -51,8 +51,6 @@ def main(): test.fatal("Could not get the editor for '%s'" % currentFile, "Skipping this file for now.") continue - if platform.system() == 'Darwin': - JIRA.performWorkaroundForBug(8735, JIRA.Bug.CREATOR, editor) for key in ["", "", "", ""]: test.log("Selecting everything") invokeMenuItem("Edit", "Select All")