diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-22 18:23:00 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-22 18:24:30 +0200 |
| commit | 6d36375fe3559f420a15b8240ed32679358a19e7 (patch) | |
| tree | 16d20788d187dcd1c5de343955b867a10a22f378 /tests/auto/controls/data/tst_popup.qml | |
| parent | 8b60bfd13f80588adab2c4778bc8de08832ecb7b (diff) | |
| parent | 92032bee2923024d126bc20929f79abd459cae49 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I82c2b8d97d639e24147118a2ca6276ae70195b45
Diffstat (limited to 'tests/auto/controls/data/tst_popup.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_popup.qml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml index 6217bb1d..7933bd9a 100644 --- a/tests/auto/controls/data/tst_popup.qml +++ b/tests/auto/controls/data/tst_popup.qml @@ -1068,7 +1068,9 @@ TestCase { window.requestActivate() tryCompare(window, "active", true) - compare(window.overlay.children.length, 6) // 3 drawers + 3 overlays + + var countBefore = window.overlay.children.length + compare(countBefore, 6) // 3 drawers + 3 overlays var firstOverlay = findOverlay(window, window.firstDrawer) verify(firstOverlay) @@ -1122,6 +1124,7 @@ TestCase { compare(modalOverlay.z, window.modalPopup.z) compare(window.modalPopup.visible, true) tryCompare(modalOverlay, "opacity", 1.0) + compare(window.overlay.children.length, countBefore + 2) // 1 popup + 1 overlay var modelessOverlay = findOverlay(window, window.modelessPopup) verify(!modelessOverlay) @@ -1131,23 +1134,23 @@ TestCase { compare(modelessOverlay.z, window.modelessPopup.z) compare(window.modelessPopup.visible, true) tryCompare(modelessOverlay, "opacity", 1.0) + compare(window.overlay.children.length, countBefore + 4) // 2 popups + 2 overlays window.modelessPopup.close() - tryCompare(modelessOverlay, "opacity", 0.0) tryCompare(window.modelessPopup, "visible", false) modelessOverlay = findOverlay(window, window.modelessPopup) verify(!modelessOverlay) + compare(window.overlay.children.length, countBefore + 2) // 1 popup + 1 overlay compare(window.modalPopup.visible, true) compare(modalOverlay.opacity, 1.0) window.modalPopup.close() - tryCompare(modalOverlay, "opacity", 0.0) tryCompare(window.modalPopup, "visible", false) modalOverlay = findOverlay(window, window.modalPopup) verify(!modalOverlay) + compare(window.overlay.children.length, countBefore) - var countBefore = window.overlay.children.length window.plainPopup.open() tryCompare(window.plainPopup, "visible", true) compare(window.overlay.children.length, countBefore + 1) // only popup added, no overlays involved |