From f694b04b68c143f9f99368598e11ad358c6aa7db Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Tue, 2 Apr 2013 20:03:33 +0200 Subject: [PATCH] Squish: Replaced duplicate bugreport Change-Id: I73bc3a633e47ddd0580976dd355da323e2426b4f Reviewed-by: Christian Stenger --- tests/system/shared/editor_utils.py | 2 +- tests/system/shared/workarounds.py | 2 +- tests/system/suite_editors/tst_basic_cpp_support/test.py | 2 +- 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, 6 insertions(+), 6 deletions(-) diff --git a/tests/system/shared/editor_utils.py b/tests/system/shared/editor_utils.py index 8188af8da9e..294093314fb 100644 --- a/tests/system/shared/editor_utils.py +++ b/tests/system/shared/editor_utils.py @@ -64,7 +64,7 @@ def widgetContainsPoint(widget, point): def openContextMenuOnTextCursorPosition(editor): rect = editor.cursorRect(editor.textCursor()) if platform.system() == 'Darwin': - JIRA.performWorkaroundIfStillOpen(6918, JIRA.Bug.CREATOR, editor) + JIRA.performWorkaroundIfStillOpen(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 2e5d16f544b..f0ce4c348cc 100644 --- a/tests/system/shared/workarounds.py +++ b/tests/system/shared/workarounds.py @@ -201,7 +201,7 @@ class JIRA: def __initBugDict__(self): self.__bugs__= { 'QTCREATORBUG-6853':self._workaroundCreator6853_, - 'QTCREATORBUG-6918':self._workaroundCreator_MacEditorFocus_ + 'QTCREATORBUG-8735':self._workaroundCreator_MacEditorFocus_ } # helper function - will be called if no workaround for the requested bug is deposited def _exitFatal_(self, bugType, number): 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 e79148072e4..8837eca8c43 100644 --- a/tests/system/suite_editors/tst_basic_cpp_support/test.py +++ b/tests/system/suite_editors/tst_basic_cpp_support/test.py @@ -39,7 +39,7 @@ def main(): # Creator will show you the declaration of the variable. if platform.system() == "Darwin": - JIRA.performWorkaroundIfStillOpen(6918, JIRA.Bug.CREATOR, cppwindow) + JIRA.performWorkaroundIfStillOpen(8735, JIRA.Bug.CREATOR, cppwindow) type(cppwindow, "") type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), " xi") diff --git a/tests/system/suite_editors/tst_delete_externally/test.py b/tests/system/suite_editors/tst_delete_externally/test.py index abbd7d7ca1a..21bfaf3318c 100644 --- a/tests/system/suite_editors/tst_delete_externally/test.py +++ b/tests/system/suite_editors/tst_delete_externally/test.py @@ -39,7 +39,7 @@ def main(): continue if platform.system() == 'Darwin': - JIRA.performWorkaroundIfStillOpen(6918, JIRA.Bug.CREATOR, editor) + JIRA.performWorkaroundIfStillOpen(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 8f5f5b5d20d..159396c75c4 100644 --- a/tests/system/suite_editors/tst_revert_changes/test.py +++ b/tests/system/suite_editors/tst_revert_changes/test.py @@ -63,7 +63,7 @@ def __modifyProFile__(): def __modifyHeader__(): global cppEditorStr, homeShortCut, endShortCut if platform.system() == "Darwin": - JIRA.performWorkaroundIfStillOpen(6918, JIRA.Bug.CREATOR, waitForObject(cppEditorStr, 1000)) + JIRA.performWorkaroundIfStillOpen(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 045adfe15bd..9bdf546eeb7 100644 --- a/tests/system/suite_editors/tst_select_all/test.py +++ b/tests/system/suite_editors/tst_select_all/test.py @@ -30,7 +30,7 @@ def main(): "Skipping this file for now.") continue if platform.system() == 'Darwin': - JIRA.performWorkaroundIfStillOpen(6918, JIRA.Bug.CREATOR, editor) + JIRA.performWorkaroundIfStillOpen(8735, JIRA.Bug.CREATOR, editor) for key in ["", "", "", ""]: test.log("Selecting everything") invokeMenuItem("Edit", "Select All")