feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Replaced duplicate bugreport

Browse Source 
Change-Id: I73bc3a633e47ddd0580976dd355da323e2426b4f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Robert Loehning
2013-04-02 20:03:33 +02:00
parent eb872d3204
commit f694b04b68
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/system/shared/editor_utils.py
View File

@@ -64,7 +64,7 @@ def widgetContainsPoint(widget, point):
def openContextMenuOnTextCursorPosition(editor): def openContextMenuOnTextCursorPosition(editor):
rect = editor.cursorRect(editor.textCursor()) rect = editor.cursorRect(editor.textCursor())
if platform.system() == 'Darwin': 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) openContextMenu(editor, rect.x+rect.width/2, rect.y+rect.height/2, 0)
menuInList = [None] menuInList = [None]
waitFor("menuVisibleAtEditor(editor, menuInList)", 5000) waitFor("menuVisibleAtEditor(editor, menuInList)", 5000)

2
tests/system/shared/workarounds.py
View File

@@ -201,7 +201,7 @@ class JIRA:
def __initBugDict__(self): def __initBugDict__(self):
self.__bugs__= { self.__bugs__= {
'QTCREATORBUG-6853':self._workaroundCreator6853_, '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 # helper function - will be called if no workaround for the requested bug is deposited
def _exitFatal_(self, bugType, number): def _exitFatal_(self, bugType, number):

2
tests/system/suite_editors/tst_basic_cpp_support/test.py
View File

@@ -39,7 +39,7 @@ def main():
# Creator will show you the declaration of the variable. # Creator will show you the declaration of the variable.
if platform.system() == "Darwin": if platform.system() == "Darwin":
JIRA.performWorkaroundIfStillOpen(6918, JIRA.Bug.CREATOR, cppwindow) JIRA.performWorkaroundIfStillOpen(8735, JIRA.Bug.CREATOR, cppwindow)
type(cppwindow, "<Ctrl+F>") type(cppwindow, "<Ctrl+F>")
type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), " xi") type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), " xi")

2
tests/system/suite_editors/tst_delete_externally/test.py
View File

@@ -39,7 +39,7 @@ def main():
continue continue
if platform.system() == 'Darwin': if platform.system() == 'Darwin':
JIRA.performWorkaroundIfStillOpen(6918, JIRA.Bug.CREATOR, editor) JIRA.performWorkaroundIfStillOpen(8735, JIRA.Bug.CREATOR, editor)
contentBefore = readFile(currentFile) contentBefore = readFile(currentFile)
popupText = "The file %s was removed. Do you want to save it under a different name, or close the editor?" popupText = "The file %s was removed. Do you want to save it under a different name, or close the editor?"
os.remove(currentFile) os.remove(currentFile)

2
tests/system/suite_editors/tst_revert_changes/test.py
View File

@@ -63,7 +63,7 @@ def __modifyProFile__():
def __modifyHeader__(): def __modifyHeader__():
global cppEditorStr, homeShortCut, endShortCut global cppEditorStr, homeShortCut, endShortCut
if platform.system() == "Darwin": 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): if placeCursorToLine(cppEditorStr, "class.+", True):
type(cppEditorStr, homeShortCut) type(cppEditorStr, homeShortCut)
markText(cppEditorStr, "Down", 5) markText(cppEditorStr, "Down", 5)

2
tests/system/suite_editors/tst_select_all/test.py
View File

@@ -30,7 +30,7 @@ def main():
"Skipping this file for now.") "Skipping this file for now.")
continue continue
if platform.system() == 'Darwin': if platform.system() == 'Darwin':
JIRA.performWorkaroundIfStillOpen(6918, JIRA.Bug.CREATOR, editor) JIRA.performWorkaroundIfStillOpen(8735, JIRA.Bug.CREATOR, editor)
for key in ["<Up>", "<Down>", "<Left>", "<Right>"]: for key in ["<Up>", "<Down>", "<Left>", "<Right>"]:
test.log("Selecting everything") test.log("Selecting everything")
invokeMenuItem("Edit", "Select All") invokeMenuItem("Edit", "Select All")