Merge lp:~tpeeters/ubuntu-ui-toolkit/popup-focus-test into lp:ubuntu-ui-toolkit/staging

[Tim Peeters]

Fix the tests for focus restoration in tst_focus.qml

This MR adds the proper tests, but they fail because focus restoration is broken in some cases now. See https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1569979 and https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1569981

[lp:~tpeeters/ubuntu-ui-toolkit/popup-focus-test]

1942. By Tim Peeters on 2016-04-13

remove second popoverTest button focus test.

[Cris Dywan (kalikiana)]

Hmmm I might have renamed the clashing variables for more clarity. Though no super strong opinion. This looks pretty good (given the circumstances). Good job catching the silent breakage due to the id clash.

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1941
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/681/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2604/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/681/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1941
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/462/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2605/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/462/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1941
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/648/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2606/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/648/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1942
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/464/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2607/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/464/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1941
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/436/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2608/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/436/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1941
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/284/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/648
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/648/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/681
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/462
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/436
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2609/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2606
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2604
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2605
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2608

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/284/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1942
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/683/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2610/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/683/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1942
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/438/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2614/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/438/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1942
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/650/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/2615/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/650/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/unit_x11/tst_components/tst_focus.qml'
--- tests/unit_x11/tst_components/tst_focus.qml	2016-03-14 16:45:38 +0000
+++ tests/unit_x11/tst_components/tst_focus.qml	2016-04-13 16:12:54 +0000
@@ -131,10 +131,14 @@
         Button {
             id: popoverTest
             text: "Popovers"
-            property var popover
-            property Component popoverComponent
+            property var popover: null
+            property Component popoverComponent: popoverComponent
             onClicked: {
-                popover = PopupUtils.open(popoverComponent)
+                if (popoverTest.popoverComponent) {
+                    popoverTest.popover = PopupUtils.open(popoverTest.popoverComponent);
+                } else {
+                    popoverTest.popover.show();
+                }
             }
         }
     }
@@ -165,6 +169,26 @@
         }
     }
 
+    Dialog {
+        id: dialogItem
+        title: "TestDialog"
+        Button {
+            text: "close"
+            onClicked: dialogItem.hide()
+        }
+    }
+
+    Popover {
+        id: popoverItem
+        contentWidth: units.gu(20)
+        contentHeight: item.height
+        ListItem.Standard {
+            id: item
+            text: "close"
+            onClicked: popoverItem.hide();
+        }
+    }
+
     UbuntuTestCase {
         name: "FocusingTests"
         when: windowShown
@@ -192,8 +216,11 @@
         function cleanup() {
             // empty event buffer
             wait(200);
+            popoverTest.popover = null;
+            popoverTest.popoverComponent = popoverComponent;
             popupCloseSpy.clear();
             popupCloseSpy.target = null;
+            popupCloseSpy.signalName = "onDestruction";
         }
 
         function test_tab_focus_data() {
@@ -310,29 +337,63 @@
 
         function test_popover_refocus_data() {
             return [
-                {tag: "Dialog", component: dialogComponent},
-                {tag: "Popover", component: popoverComponent},
+                        {   tag: "Dialog component",
+                            component: dialogComponent,
+                            item: null,
+                            foreground_name: "dialogForeground",
+                            bug: "1569979"
+                        },
+                        {   tag: "Popover component",
+                            component: popoverComponent,
+                            item: null,
+                            foreground_name: "popover_foreground",
+                            bug: "" // this is the only case without a bug
+                        },
+                        {   tag: "Dialog item",
+                            component: null,
+                            item: dialogItem,
+                            foreground_name: "dialogForeground",
+                            bug: "1569979 and 1569981"
+                        },
+                        {   tag: "Popover item",
+                            component: null,
+                            item: popoverItem,
+                            foreground_name: "popover_foreground",
+                            bug: "1569981"
+                        },
             ];
         }
 
         function test_popover_refocus(data) {
             popoverTest.popoverComponent = data.component;
+            popoverTest.popover = data.item;
             var center = centerOf(popoverTest);
             mouseClick(popoverTest, center.x, center.y);
             verify(popoverTest.popover !== undefined, "No popover created");
             waitForRendering(popoverTest.popover);
             verify(!popoverTest.focus, "Button focus not lost.");
-            var foreground = findChild(popoverTest.popover, "popover_foreground");
+            var foreground = findChild(popoverTest.popover, data.foreground_name);
             verify(foreground, "Popover foreground not ready");
             verify(foreground.focus, "Popover focus not gained. Focus went to %1".arg(window.activeFocusItem));
-            popupCloseSpy.target = popoverTest.popover.Component;
+
+            if (data.item) {
+                // popup will only be hidden, not destroyed.
+                popupCloseSpy.signalName = "onVisibleChanged";
+                popupCloseSpy.target = popoverTest.popover;
+            } else {
+                popupCloseSpy.signalName = "onDestruction";
+                popupCloseSpy.target = popoverTest.popover.Component;
+            }
 
             var closeButton = findChildWithProperty(popoverTest.popover, "text", "close");
             verify(closeButton, "Close button not accessible");
             center = centerOf(closeButton);
             mouseClick(closeButton, center.x, center.y);
-            verify(!popoverTest.focus, "Button focus not lost.");
             popupCloseSpy.wait();
+            if (data.bug) {
+                expectFailContinue(data.tag,
+                                   "Incorrect focus restoration. See bug " + data.bug + ".");
+            }
             verify(popoverTest.focus, "Button focus not restored.");
         }