diff options
| author | Robert Loehning <robert.loehning@digia.com> | 2014-09-04 12:50:03 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@digia.com> | 2014-09-05 12:27:12 +0200 |
| commit | 1f3d7c9e61d4d095cd25e228ce1413c898c7bd8a (patch) | |
| tree | 1e974cac6f8e5f4faff85699e029079c2466ffd6 | |
| parent | 79d5c78a4584f2ec503dce2b63c707794cd4618a (diff) | |
| download | qt-creator-1f3d7c9e61d4d095cd25e228ce1413c898c7bd8a.tar.gz | |
Squish: Include new Qt Quick templates
Change-Id: I92e359d95bc9cd62b5e1b8a059cb8aef3908bcb4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
| -rw-r--r-- | tests/system/objects.map | 1 | ||||
| -rw-r--r-- | tests/system/suite_general/tst_create_proj_wizard/test.py | 2 | ||||
| -rw-r--r-- | tests/system/suite_qtquick/tst_qtquick_creation/test.py | 5 | ||||
| -rw-r--r-- | tests/system/suite_qtquick/tst_qtquick_creation3/test.py | 12 |
4 files changed, 15 insertions, 5 deletions
diff --git a/tests/system/objects.map b/tests/system/objects.map index 3e52c4ff08..6f612b4fd4 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -1,3 +1,4 @@ +:*Qt Creator.Add Kit_QPushButton {text='Add Kit' type='QPushButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :*Qt Creator.Build Project_Core::Internal::FancyToolButton {text='Build Project' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :*Qt Creator.Cancel Build_QToolButton {text='Cancel Build' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :*Qt Creator.Cancel_QPushButton {text='Cancel' type='QPushButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} diff --git a/tests/system/suite_general/tst_create_proj_wizard/test.py b/tests/system/suite_general/tst_create_proj_wizard/test.py index f91efb6870..42a4567c61 100644 --- a/tests/system/suite_general/tst_create_proj_wizard/test.py +++ b/tests/system/suite_general/tst_create_proj_wizard/test.py @@ -33,7 +33,7 @@ import re def main(): global tmpSettingsDir - quickCombinations = ["1.1", "2.1", "2.2", "Controls 1.0", "Controls 1.1"] + quickCombinations = ["1.1", "2.1", "2.2", "2.3", "Controls 1.0", "Controls 1.1", "Controls 1.2"] startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return diff --git a/tests/system/suite_qtquick/tst_qtquick_creation/test.py b/tests/system/suite_qtquick/tst_qtquick_creation/test.py index 8b86dc94e5..cca8cfe85e 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation/test.py @@ -34,8 +34,9 @@ def main(): if not startedWithoutPluginError(): return for targ, qVer in [[Targets.DESKTOP_480_GCC, "1.1"], [Targets.DESKTOP_521_DEFAULT, "2.1"], - [Targets.DESKTOP_521_DEFAULT, "2.2"], [Targets.DESKTOP_521_DEFAULT, "Controls 1.0"], - [Targets.DESKTOP_521_DEFAULT, "Controls 1.1"]]: + [Targets.DESKTOP_521_DEFAULT, "2.2"], [Targets.DESKTOP_531_DEFAULT, "2.3"], + [Targets.DESKTOP_521_DEFAULT, "Controls 1.0"], [Targets.DESKTOP_521_DEFAULT, "Controls 1.1"], + [Targets.DESKTOP_531_DEFAULT, "Controls 1.2"]]: # using a temporary directory won't mess up a potentially existing workingDir = tempDir() checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets=targ, diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py index 64d6aaaa6b..b89a2685cd 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py @@ -33,12 +33,20 @@ def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - for quickVersion in ["1.1", "2.1", "2.2", "Controls 1.0", "Controls 1.1"]: + for quickVersion in ["1.1", "2.1", "2.2", "2.3", "Controls 1.0", "Controls 1.1", "Controls 1.2"]: # using a temporary directory won't mess up a potentially existing workingDir = tempDir() projectName = createNewQtQuickUI(workingDir, quickVersion) + switchViewTo(ViewConstants.PROJECTS) + clickButton(waitForObject(":*Qt Creator.Add Kit_QPushButton")) + menuItem = Targets.getStringForTarget(Targets.DESKTOP_531_DEFAULT) + if platform.system() == 'Darwin': + waitFor("macHackActivateContextMenuItem(menuItem)", 5000) + else: + activateItem(waitForObjectItem("{type='QMenu' unnamed='1' visible='1' " + "window=':Qt Creator_Core::Internal::MainWindow'}", menuItem)) test.log("Running project Qt Quick %s UI" % quickVersion) - qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(1, 0, workingDir, projectName, 11223, quickVersion) + qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(2, 1, workingDir, projectName, 11223, quickVersion) if qmlViewer!=None: qmlViewerPath = os.path.dirname(qmlViewer) qmlViewer = os.path.basename(qmlViewer) |