diff options
| author | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-07-28 14:28:57 +0200 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-07-28 13:48:37 +0000 |
| commit | 84952c5a9609e72f32dd1e291a442d1c68c9569f (patch) | |
| tree | 92343a5eff84ee0d6f470e74208f86a2a1144b0d | |
| parent | 129918d8ee8639fc3372b3d36304c1b2faaaec83 (diff) | |
| download | qt-creator-84952c5a9609e72f32dd1e291a442d1c68c9569f.tar.gz | |
Squish: Fix tst_session_handling for Qt 5.5
Change-Id: I9347656c659055472cdda42fe07348c07bc3037e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
| -rw-r--r-- | tests/system/suite_general/tst_session_handling/test.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tests/system/suite_general/tst_session_handling/test.py b/tests/system/suite_general/tst_session_handling/test.py index 44a062b00d..e80f2b878a 100644 --- a/tests/system/suite_general/tst_session_handling/test.py +++ b/tests/system/suite_general/tst_session_handling/test.py @@ -111,19 +111,22 @@ def createAndSwitchToSession(toSession): "window=%s}" % sessionInputDialog)) def checkWelcomePage(sessionName, isCurrent=False): + if isQt54Build: + welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView" + else: + welcomePage = ":Qt Creator.WelcomePage_QQuickWidget" switchViewTo(ViewConstants.WELCOME) - mouseClick(waitForObject("{container=':WelcomePageStyledBar.WelcomePage_QQuickView' text='Projects' " - "type='Button' unnamed='1' visible='true'}"), 5, 5, Qt.LeftButton) - waitForObject("{container=':WelcomePageStyledBar.WelcomePage_QQuickView' id='sessionsTitle' " - "text='Sessions' type='Text' unnamed='1' visible='true'}") + mouseClick(waitForObject("{container='%s' text='Projects' type='Button' " + "unnamed='1' visible='true'}" % welcomePage)) + waitForObject("{container='%s' id='sessionsTitle' text='Sessions' type='Text' " + "unnamed='1' visible='true'}" % welcomePage) if isCurrent: sessions = ["default", "%s (current session)" % sessionName] else: sessions = ["default (current session)", sessionName] for sessionName in sessions: - test.verify(object.exists("{container=':WelcomePageStyledBar.WelcomePage_QQuickView' " - "enabled='true' type='LinkedText' " - "unnamed='1' visible='true' text='%s'}" % sessionName), + test.verify(object.exists("{container='%s' enabled='true' type='LinkedText' unnamed='1' " + "visible='true' text='%s'}" % (welcomePage, sessionName)), "Verifying session '%s' exists." % sessionName) def checkNavigator(expectedRows, message): |