From ca4b3f9d1d2090393f2f0daf436948eee52e2456 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Thu, 7 Feb 2013 20:48:00 +0100 Subject: Squish: Wait for parsing in createNewQtQuickApplication() This is what createProject_Qt_GUI() and createProject_Qt_Console() have always done Change-Id: Iaead1767c699e4fd237d999e6f3d94d277b1d84f Reviewed-by: Christian Stenger --- tests/system/shared/project.py | 2 ++ tests/system/suite_APTW/tst_APTW02/test.py | 1 - tests/system/suite_CSUP/tst_CSUP01/test.py | 1 - tests/system/suite_CSUP/tst_CSUP02/test.py | 1 - tests/system/suite_SCOM/tst_SCOM05/test.py | 2 -- tests/system/suite_debugger/tst_simple_debug/test.py | 3 --- tests/system/suite_editors/tst_qml_editor/test.py | 3 --- tests/system/suite_editors/tst_qml_indent/test.py | 2 -- tests/system/suite_qtquick/tst_qtquick_creation/test.py | 2 -- tests/system/suite_qtquick/tst_qtquick_creation2/test.py | 2 -- 10 files changed, 2 insertions(+), 17 deletions(-) diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 5560c25295..96f3d1cf47 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -225,6 +225,8 @@ def createNewQtQuickApplication(workingDir, projectName = None, templateFile = N nextButton = waitForObject(":Next_QPushButton") clickButton(nextButton) __createProjectHandleLastPage__() + + waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 10000) return checkedTargets, projectName def createNewQtQuickUI(workingDir): diff --git a/tests/system/suite_APTW/tst_APTW02/test.py b/tests/system/suite_APTW/tst_APTW02/test.py index 2011b4c6a5..8789986998 100644 --- a/tests/system/suite_APTW/tst_APTW02/test.py +++ b/tests/system/suite_APTW/tst_APTW02/test.py @@ -6,7 +6,6 @@ source("../shared/aptw.py") def main(): startApplication("qtcreator" + SettingsPath) checkedTargets, projectName = createNewQtQuickApplication(tempDir(), "SampleApp") - waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)") # run project for debug and release and verify results runVerify(checkedTargets) #close Qt Creator diff --git a/tests/system/suite_CSUP/tst_CSUP01/test.py b/tests/system/suite_CSUP/tst_CSUP01/test.py index b3ca9bdece..a6e15cbee2 100644 --- a/tests/system/suite_CSUP/tst_CSUP01/test.py +++ b/tests/system/suite_CSUP/tst_CSUP01/test.py @@ -7,7 +7,6 @@ def main(): # create qt quick application # Step 1: Open test .pro project. createNewQtQuickApplication(tempDir(), "SampleApp") - waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)") # Step 2: Open .cpp file in Edit mode. if not openDocument("SampleApp.Sources.main\\.cpp"): test.fatal("Could not open main.cpp") diff --git a/tests/system/suite_CSUP/tst_CSUP02/test.py b/tests/system/suite_CSUP/tst_CSUP02/test.py index c235574b0e..461a20ec8c 100644 --- a/tests/system/suite_CSUP/tst_CSUP02/test.py +++ b/tests/system/suite_CSUP/tst_CSUP02/test.py @@ -7,7 +7,6 @@ def main(): # create qt quick application # Step 1: Open test .pro project. createNewQtQuickApplication(tempDir(), "SampleApp") - waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)") # Step 2: Open .cpp file in Edit mode. if not openDocument("SampleApp.Sources.main\\.cpp"): test.fatal("Could not open main.cpp") diff --git a/tests/system/suite_SCOM/tst_SCOM05/test.py b/tests/system/suite_SCOM/tst_SCOM05/test.py index fa38a43cd4..b0ed04a73c 100644 --- a/tests/system/suite_SCOM/tst_SCOM05/test.py +++ b/tests/system/suite_SCOM/tst_SCOM05/test.py @@ -28,10 +28,8 @@ def main(): startApplication("qtcreator" + SettingsPath) # create qt quick application 1 createNewQtQuickApplication(tempDir(), projectName1) - waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 5000) # create qt quick application 2 createNewQtQuickApplication(tempDir(), projectName2) - waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 5000) # change to project 1 verifyChangeProject(projectName1) # change to project 2 diff --git a/tests/system/suite_debugger/tst_simple_debug/test.py b/tests/system/suite_debugger/tst_simple_debug/test.py index bc581174db..2a11fbe1df 100644 --- a/tests/system/suite_debugger/tst_simple_debug/test.py +++ b/tests/system/suite_debugger/tst_simple_debug/test.py @@ -15,9 +15,6 @@ def main(): # using a temporary directory won't mess up a potentially existing workingDir = tempDir() checkedTargets, projectName = createNewQtQuickApplication(workingDir) - # wait for parsing to complete - waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", - "sourceFilesRefreshed(QStringList)") editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") if placeCursorToLine(editor, "MouseArea.*", True): type(editor, '') diff --git a/tests/system/suite_editors/tst_qml_editor/test.py b/tests/system/suite_editors/tst_qml_editor/test.py index 1ab23fea9b..975d673ad8 100644 --- a/tests/system/suite_editors/tst_qml_editor/test.py +++ b/tests/system/suite_editors/tst_qml_editor/test.py @@ -13,12 +13,9 @@ def main(): # add docs to have the correct tool tips addHelpDocumentationFromSDK() templateDir = prepareTemplate(sourceExample) - prepareForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)") installLazySignalHandler("{type='Core::FutureProgress' unnamed='1'}", "finished()", "__handleFutureProgress__") # using a temporary directory won't mess up a potentially existing createNewQtQuickApplication(tempDir(), "untitled", os.path.join(templateDir, qmlFile)) - # wait for parsing to complete - waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)") testRenameId() testFindUsages() testHovering() diff --git a/tests/system/suite_editors/tst_qml_indent/test.py b/tests/system/suite_editors/tst_qml_indent/test.py index ea20cd59da..9cdebd2174 100644 --- a/tests/system/suite_editors/tst_qml_indent/test.py +++ b/tests/system/suite_editors/tst_qml_indent/test.py @@ -4,8 +4,6 @@ def main(): startApplication("qtcreator" + SettingsPath) # using a temporary directory won't mess up a potentially exisiting createNewQtQuickApplication(tempDir(), "untitled") - # wait for parsing to complete - waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 5000) if not prepareQmlFile(): invokeMenuItem("File", "Save All") invokeMenuItem("File", "Exit") diff --git a/tests/system/suite_qtquick/tst_qtquick_creation/test.py b/tests/system/suite_qtquick/tst_qtquick_creation/test.py index 46938338d2..207b8f52af 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation/test.py @@ -6,8 +6,6 @@ def main(): workingDir = tempDir() checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets = QtQuickConstants.Targets.DESKTOP_474_GCC) - # wait for parsing to complete - waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)") test.log("Building project") result = modifyRunSettingsForHookInto(projectName, len(checkedTargets), 11223) invokeMenuItem("Build", "Build All") diff --git a/tests/system/suite_qtquick/tst_qtquick_creation2/test.py b/tests/system/suite_qtquick/tst_qtquick_creation2/test.py index 5d9d6e3f1d..b7ac6881fc 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation2/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation2/test.py @@ -11,8 +11,6 @@ def main(): checkedTargets, projectName = createNewQtQuickApplication(workingDir, None, os.path.join(prepareTemplate(sourceExample), qmlFile), QtQuickConstants.Targets.DESKTOP_474_GCC) - # wait for parsing to complete - waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)") test.log("Building project") result = modifyRunSettingsForHookInto(projectName, len(checkedTargets), 11223) invokeMenuItem("Build","Build All") -- cgit v1.2.1