From 756222f28ef30ad0d098927a2093d78583f8cd90 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Thu, 11 Jul 2013 15:20:40 +0200 Subject: [PATCH] Squish: Expand tests to python editor Change-Id: I1c3062f2802531d7a6e2f3c2b75645432ba364a4 Reviewed-by: Christian Stenger --- tests/system/objects.map | 1 + tests/system/shared/editor_utils.py | 3 +++ tests/system/suite_editors/shared/testdata/files.tsv | 1 + 3 files changed, 5 insertions(+) diff --git a/tests/system/objects.map b/tests/system/objects.map index a564755497d..93019bf52ae 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -121,6 +121,7 @@ :Qt Creator_HelpSelector_QComboBox {occurrence='3' type='QComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_Issues_Core::Internal::OutputPaneToggleButton {occurrence='1' type='Core::Internal::OutputPaneToggleButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_ProFileEditorWidget {type='Qt4ProjectManager::Internal::ProFileEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} +:Qt Creator_PythonEditor::EditorWidget {type='PythonEditor::EditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_QDeclarativeView {type='QDeclarativeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_QHelpContentWidget {type='QHelpContentWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :Qt Creator_QTableView {type='QTableView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} diff --git a/tests/system/shared/editor_utils.py b/tests/system/shared/editor_utils.py index 10b7aa18f78..17208e7c960 100644 --- a/tests/system/shared/editor_utils.py +++ b/tests/system/shared/editor_utils.py @@ -244,6 +244,7 @@ def getEditorForFileSuffix(curFile): qmlEditorSuffixes = ["qml", "qmlproject", "js", "qs", "qtt"] proEditorSuffixes = ["pro", "pri", "prf"] glslEditorSuffixes= ["frag", "vert", "fsh", "vsh", "glsl", "shader", "gsh"] + pytEditorSuffixes = ["py", "pyw", "wsgi"] suffix = __getFileSuffix__(curFile) if suffix in cppEditorSuffixes: editor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget") @@ -254,6 +255,8 @@ def getEditorForFileSuffix(curFile): elif suffix in glslEditorSuffixes: editor = waitForObject("{type='GLSLEditor::GLSLTextEditorWidget' unnamed='1' " "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}") + elif suffix in pytEditorSuffixes: + editor = waitForObject(":Qt Creator_PythonEditor::EditorWidget") else: test.log("Trying PlainTextEditor (file suffix: %s)" % suffix) try: diff --git a/tests/system/suite_editors/shared/testdata/files.tsv b/tests/system/suite_editors/shared/testdata/files.tsv index cfdf5d87933..7845540756b 100644 --- a/tests/system/suite_editors/shared/testdata/files.tsv +++ b/tests/system/suite_editors/shared/testdata/files.tsv @@ -6,3 +6,4 @@ "creator/tests/manual/cplusplus-frontend/conf.c++" "creator/src/plugins/coreplugin/basefilewizard.cpp" "creator/src/plugins/coreplugin/basefilewizard.h" +"creator/tests/system/suite_debugger/tst_simple_debug/test.py"