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

Squish: Testing GLSLEditor in tst_select_all

Browse Source 
Change-Id: Ib1d16d7cb7fe108b23c9eca70da6b6de2f9c563a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
This commit is contained in:
Robert Loehning
2012-06-13 18:09:13 +02:00
committed by Robert Löhning
parent 23c7665cc5
commit 56c7facc68
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,6 +207,7 @@ def getEditorForFileSuffix(curFile):
"tcc", "tpp", "t++", "c", "cu", "m", "mm", "hh", "hxx", "h++", "hpp", "hp"] "tcc", "tpp", "t++", "c", "cu", "m", "mm", "hh", "hxx", "h++", "hpp", "hp"]
qmlEditorSuffixes = ["qml", "qmlproject", "js", "qs", "qtt"] qmlEditorSuffixes = ["qml", "qmlproject", "js", "qs", "qtt"]
proEditorSuffixes = ["pro", "pri", "prf"] proEditorSuffixes = ["pro", "pri", "prf"]
glslEditorSuffixes= ["frag", "vert", "fsh", "vsh"]
suffix = __getFileSuffix__(curFile) suffix = __getFileSuffix__(curFile)
if suffix in cppEditorSuffixes: if suffix in cppEditorSuffixes:
editor = waitForObject("{type='CppEditor::Internal::CPPEditorWidget' unnamed='1' " editor = waitForObject("{type='CppEditor::Internal::CPPEditorWidget' unnamed='1' "
@@ -217,6 +218,9 @@ def getEditorForFileSuffix(curFile):
elif suffix in proEditorSuffixes: elif suffix in proEditorSuffixes:
editor = waitForObject("{type='Qt4ProjectManager::Internal::ProFileEditorWidget' unnamed='1' " editor = waitForObject("{type='Qt4ProjectManager::Internal::ProFileEditorWidget' unnamed='1' "
"visible='1' window=':Qt Creator_Core::Internal::MainWindow'}") "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: else:
test.log("Trying PlainTextEditor (file suffix: %s)" % suffix) test.log("Trying PlainTextEditor (file suffix: %s)" % suffix)
try: try:

3
tests/system/suite_general/tst_select_all/test.py
View File

@@ -11,7 +11,8 @@ def charactersInFile(filename):
def main(): def main():
files = [srcPath + "/creator/README", srcPath + "/creator/qtcreator.pri", 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: for currentFile in files:
if not neededFilePresent(currentFile): if not neededFilePresent(currentFile):
return return