diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2017-01-25 21:55:38 +0100 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2017-01-27 12:13:55 +0000 |
| commit | 8681608d8ba98a82ad029e861d741cd9954bef7f (patch) | |
| tree | 7b7c617a24d99db737a91fdf6ea0ca1f90561b2e /tests | |
| parent | 79c91e4c305cc49b614040a50b0a07ab51120f9d (diff) | |
| download | qt-creator-8681608d8ba98a82ad029e861d741cd9954bef7f.tar.gz | |
Squish: Clean up tst_qml_editor
Should have been done in
4b4e5f69901f80ace0c0dba683771c2139d5c2b8
Change-Id: I0a747ea4bbf0ef02caaf31a14161dced9b4dd806
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/system/suite_editors/tst_qml_editor/test.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/tests/system/suite_editors/tst_qml_editor/test.py b/tests/system/suite_editors/tst_qml_editor/test.py index 7f3fedb513..b751121a5e 100644 --- a/tests/system/suite_editors/tst_qml_editor/test.py +++ b/tests/system/suite_editors/tst_qml_editor/test.py @@ -47,9 +47,6 @@ def main(): def testRenameId(): 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", "FocusCore.ListMenu\\.qml", "focus\\.qml"] originalTexts = {} @@ -90,7 +87,7 @@ def testRenameId(): test.compare(originalText,formerTxt, "Comparing %s" % file.replace("FocusCore.","").replace("\\","")) 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) editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") if not placeCursorToLine(editor, line, True): @@ -104,19 +101,15 @@ def __invokeFindUsage__(treeView, filename, line, additionalKeyPresses, expected def testFindUsages(): test.log("Testing find usage of an ID") - navTree = waitForObject("{type='Utils::NavigationTreeView' unnamed='1' visible='1' " - "window=':Qt Creator_Core::Internal::MainWindow'}") - __invokeFindUsage__(navTree, "focus\\.qml", "FocusScope\s*\{", ["<Down>"], 6) + __invokeFindUsage__("focus\\.qml", "FocusScope\s*\{", ["<Down>"], 6) test.log("Testing find usage of a property") clickButton(waitForObject(":*Qt Creator.Clear_QToolButton")) home = "<Home>" if platform.system() == "Darwin": home = "<Ctrl+Left>" - __invokeFindUsage__(navTree, "focus\\.qml", "id: window", ["<Down>", "<Down>", home], 26) + __invokeFindUsage__("focus\\.qml", "id: window", ["<Down>", "<Down>", home], 26) def testHovering(): - navTree = waitForObject("{type='Utils::NavigationTreeView' unnamed='1' visible='1' " - "window=':Qt Creator_Core::Internal::MainWindow'}") test.log("Testing hovering elements") openDocument("focus.QML.qml" + os.sep + "focus.focus\\.qml") editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") |