diff options
| author | Robert Loehning <robert.loehning@nokia.com> | 2012-06-13 18:09:13 +0200 |
|---|---|---|
| committer | Robert Löhning <robert.loehning@nokia.com> | 2012-06-18 19:49:04 +0200 |
| commit | 56c7facc687f10fb9f55ce3b99aadc381b377b07 (patch) | |
| tree | e079dbb413ded6191cbe24fcd7396f755e191f52 | |
| parent | 23c7665cc5d94bedd2278ef70e7cb1a7ae3ab431 (diff) | |
| download | qt-creator-56c7facc687f10fb9f55ce3b99aadc381b377b07.tar.gz | |
Squish: Testing GLSLEditor in tst_select_all
Change-Id: Ib1d16d7cb7fe108b23c9eca70da6b6de2f9c563a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
| -rw-r--r-- | tests/system/shared/editor_utils.py | 4 | ||||
| -rw-r--r-- | tests/system/suite_general/tst_select_all/test.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/system/shared/editor_utils.py b/tests/system/shared/editor_utils.py index 8f7b74026f..37a2ae9831 100644 --- a/tests/system/shared/editor_utils.py +++ b/tests/system/shared/editor_utils.py @@ -207,6 +207,7 @@ def getEditorForFileSuffix(curFile): "tcc", "tpp", "t++", "c", "cu", "m", "mm", "hh", "hxx", "h++", "hpp", "hp"] qmlEditorSuffixes = ["qml", "qmlproject", "js", "qs", "qtt"] proEditorSuffixes = ["pro", "pri", "prf"] + glslEditorSuffixes= ["frag", "vert", "fsh", "vsh"] suffix = __getFileSuffix__(curFile) if suffix in cppEditorSuffixes: editor = waitForObject("{type='CppEditor::Internal::CPPEditorWidget' unnamed='1' " @@ -217,6 +218,9 @@ def getEditorForFileSuffix(curFile): elif suffix in proEditorSuffixes: editor = waitForObject("{type='Qt4ProjectManager::Internal::ProFileEditorWidget' unnamed='1' " "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}") + elif suffix in glslEditorSuffixes: + editor = waitForObject("{type='GLSLEditor::GLSLTextEditorWidget' unnamed='1' " + "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}") else: test.log("Trying PlainTextEditor (file suffix: %s)" % suffix) try: diff --git a/tests/system/suite_general/tst_select_all/test.py b/tests/system/suite_general/tst_select_all/test.py index fda92a3ccf..e5f89b1b78 100644 --- a/tests/system/suite_general/tst_select_all/test.py +++ b/tests/system/suite_general/tst_select_all/test.py @@ -11,7 +11,8 @@ def charactersInFile(filename): def main(): files = [srcPath + "/creator/README", srcPath + "/creator/qtcreator.pri", - srcPath + "/creator/doc/snippets/qml/list-of-transitions.qml"] + srcPath + "/creator/doc/snippets/qml/list-of-transitions.qml", + srcPath + "/creator/share/qtcreator/glsl/glsl_120.frag"] for currentFile in files: if not neededFilePresent(currentFile): return |