diff options
| author | Robert Loehning <robert.loehning@nokia.com> | 2011-11-07 21:35:30 +0100 |
|---|---|---|
| committer | Robert Löhning <robert.loehning@nokia.com> | 2011-11-08 10:47:19 +0100 |
| commit | c79d8b32b4b0a490fce1fcd1c1f56242df4226d1 (patch) | |
| tree | e1a3a0e3b04280517d303adba6a6ccf8ab714e00 | |
| parent | 28668eea867a4006cc09140994e8c4ffa46df32c (diff) | |
| download | qt-creator-c79d8b32b4b0a490fce1fcd1c1f56242df4226d1.tar.gz | |
Squish: Some more reuse of code
Change-Id: I3d4e7c0b9d8afc31fb5cfa2bc7879ea999129158
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
| -rw-r--r-- | tests/system/shared/project.py | 7 | ||||
| -rw-r--r-- | tests/system/shared/qtquick.py | 6 | ||||
| -rw-r--r-- | tests/system/suite_debugger/tst_build_new_project/test.py | 8 |
3 files changed, 7 insertions, 14 deletions
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 68dde819ae..fee725f7b1 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -95,12 +95,7 @@ def __createProjectHandleLastPage__(expectedFiles = None): def createProject_Qt_GUI(path, projectName, qtVersion, checks): __createProjectSelectType__("Qt Widget Project", "Qt Gui Application") __createProjectSetNameAndPath__(path, projectName, checks) - - desktopCheckbox = waitForObject(":scrollArea.Desktop_QCheckBox", 20000) - if checks: - test.compare(desktopCheckbox.text, "Desktop") - if not desktopCheckbox.checked: - clickButton(desktopCheckbox) + __chooseTargets__() selectFromCombo(":scrollArea.Create Build Configurations:_QComboBox_2", "For One Qt Version One Debug And One Release") selectFromCombo(":scrollArea.Qt Version:_QComboBox", qtVersion.replace(".", "\\.")) if checks: diff --git a/tests/system/shared/qtquick.py b/tests/system/shared/qtquick.py index 858a5dce41..c5d3d56c17 100644 --- a/tests/system/shared/qtquick.py +++ b/tests/system/shared/qtquick.py @@ -105,7 +105,11 @@ def runAndCloseApp(): # the following is currently a work-around for not using hooking into subprocesses if (waitForObject(":Qt Creator_Core::Internal::OutputPaneToggleButton").checked!=True): clickButton(":Qt Creator_Core::Internal::OutputPaneToggleButton") - clickButton(":Qt Creator.Stop_QToolButton") + playButton = verifyEnabled(":Qt Creator.ReRun_QToolButton", False) + stopButton = verifyEnabled(":Qt Creator.Stop_QToolButton") + clickButton(stopButton) + test.verify(playButton.enabled) + test.compare(stopButton.enabled, False) return True def runAndCloseQtQuickUI(): diff --git a/tests/system/suite_debugger/tst_build_new_project/test.py b/tests/system/suite_debugger/tst_build_new_project/test.py index 2da3f55574..5673f1669b 100644 --- a/tests/system/suite_debugger/tst_build_new_project/test.py +++ b/tests/system/suite_debugger/tst_build_new_project/test.py @@ -6,13 +6,7 @@ project = "SquishProject" def main(): startApplication("qtcreator" + SettingsPath) createProject_Qt_GUI(projectsPath, project, defaultQtVersion, True) - clickButton(verifyEnabled(":*Qt Creator.Run_Core::Internal::FancyToolButton")) - waitForSignal("{type='ProjectExplorer::BuildManager' unnamed='1'}", "buildQueueFinished(bool)") - playButton = verifyEnabled(":Qt Creator.ReRun_QToolButton", False) - stopButton = verifyEnabled(":Qt Creator.Stop_QToolButton") - clickButton(stopButton) - test.verify(playButton.enabled) - test.compare(stopButton.enabled, False) + runAndCloseApp() sendEvent("QCloseEvent", waitForObject(":Qt Creator_Core::Internal::MainWindow")) waitForCleanShutdown() |