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

Squish: Clean up tst_qml_editor

Browse Source 
Should have been done in
4b4e5f6990

Change-Id: I0a747ea4bbf0ef02caaf31a14161dced9b4dd806
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2017-01-25 21:55:38 +01:00
parent 79c91e4c30
commit 8681608d8b
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/system/suite_editors/tst_qml_editor/test.py
View File

@@ -47,9 +47,6 @@ def main():
def testRenameId(): def testRenameId():
test.log("Testing rename of id") test.log("Testing rename of id")
navTree = waitForObject("{type='Utils::NavigationTreeView' unnamed='1' visible='1' "
"window=':Qt Creator_Core::Internal::MainWindow'}")
model = navTree.model()
files = ["FocusCore.ContextMenu\\.qml", "FocusCore.GridMenu\\.qml", files = ["FocusCore.ContextMenu\\.qml", "FocusCore.GridMenu\\.qml",
"FocusCore.ListMenu\\.qml", "focus\\.qml"] "FocusCore.ListMenu\\.qml", "focus\\.qml"]
originalTexts = {} originalTexts = {}
@@ -90,7 +87,7 @@ def testRenameId():
test.compare(originalText,formerTxt, "Comparing %s" % file.replace("FocusCore.","").replace("\\","")) test.compare(originalText,formerTxt, "Comparing %s" % file.replace("FocusCore.","").replace("\\",""))
invokeMenuItem("File","Save All") invokeMenuItem("File","Save All")
def __invokeFindUsage__(treeView, filename, line, additionalKeyPresses, expectedCount): def __invokeFindUsage__(filename, line, additionalKeyPresses, expectedCount):
openDocument("focus.QML.qml" + os.sep + "focus.%s" % filename) openDocument("focus.QML.qml" + os.sep + "focus.%s" % filename)
editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget")
if not placeCursorToLine(editor, line, True): if not placeCursorToLine(editor, line, True):
@@ -104,19 +101,15 @@ def __invokeFindUsage__(treeView, filename, line, additionalKeyPresses, expected
def testFindUsages(): def testFindUsages():
test.log("Testing find usage of an ID") test.log("Testing find usage of an ID")
navTree = waitForObject("{type='Utils::NavigationTreeView' unnamed='1' visible='1' " __invokeFindUsage__("focus\\.qml", "FocusScope\s*\{", ["<Down>"], 6)
"window=':Qt Creator_Core::Internal::MainWindow'}")
__invokeFindUsage__(navTree, "focus\\.qml", "FocusScope\s*\{", ["<Down>"], 6)
test.log("Testing find usage of a property") test.log("Testing find usage of a property")
clickButton(waitForObject(":*Qt Creator.Clear_QToolButton")) clickButton(waitForObject(":*Qt Creator.Clear_QToolButton"))
home = "<Home>" home = "<Home>"
if platform.system() == "Darwin": if platform.system() == "Darwin":
home = "<Ctrl+Left>" home = "<Ctrl+Left>"
__invokeFindUsage__(navTree, "focus\\.qml", "id: window", ["<Down>", "<Down>", home], 26) __invokeFindUsage__("focus\\.qml", "id: window", ["<Down>", "<Down>", home], 26)
def testHovering(): def testHovering():
navTree = waitForObject("{type='Utils::NavigationTreeView' unnamed='1' visible='1' "
"window=':Qt Creator_Core::Internal::MainWindow'}")
test.log("Testing hovering elements") test.log("Testing hovering elements")
openDocument("focus.QML.qml" + os.sep + "focus.focus\\.qml") openDocument("focus.QML.qml" + os.sep + "focus.focus\\.qml")
editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget")