Merge lp:~dandrader/unity8/tutorial-launcher-gap into lp:unity8

[Daniel d'Andrada]

Ensure tutorial doesn't let user drag the launcher past screen edge.

This was because the bouncing animation on the left added a bit of extra offset to the launcher. So I just made sure that offset doesn't go past the screen edge as the user drags the launcher out.

And added a test.

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

* If you changed the UI, has there been a design review?
Not applicable

* Did you have a look at the warnings when running tests? Can they be reduced?
The tons of warnings were already there.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1812
http://jenkins.qa.ubuntu.com/job/unity8-ci/5816/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/108/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5816/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Maybe it makes sense to base this on top of lp:~dandrader/unity8/fixOrientedShellTests so that the tutorial changes that are not because of the bugfix don't appear on the diff?

Also the merging once the other one lands will be easier.

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1834
http://jenkins.qa.ubuntu.com/job/unity8-ci/5930/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/252/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/211
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/172/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/252
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/252/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21634

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5930/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

running make testTutorial fails in the function you just added (xvfbtestTutorial works)

Can you please check?

review: Needs Fixing

[Albert Astals Cid (aacid)]

FAIL! : qmltestrunner::Tutorial::test_launcherNoDragGap() 'verify()' returned FALSE. ()
   Loc: [/home/tsdgeos_work/phablet/unity8/tutorial-launcher-gap/tests/qmltests/Tutorial/tst_Tutorial.qml(336)]

is the error i get

[Daniel d'Andrada (dandrader)]

On 03/07/15 06:19, Albert Astals Cid wrote:
> FAIL! : qmltestrunner::Tutorial::test_launcherNoDragGap() 'verify()' returned FALSE. ()
> Loc: [/home/tsdgeos_work/phablet/unity8/tutorial-launcher-gap/tests/qmltests/Tutorial/tst_Tutorial.qml(336)]
>
> is the error i get

"make xvfbtestTutorial" has been running for a while here (in a loop)
and didn't fail yet. :-/

[lp:~dandrader/unity8/tutorial-launcher-gap]

1835. By Daniel d'Andrada <dandrader@panzer> on 2015-07-06

Merge trunk

[ Albert Astals Cid ]
* Save screenshots of suspended apps to disk
* Set width of title label when inside the title row (LP: #1461979)
* qmluitests was renamed to uitests
[ CI Train Bot ]
* Resync trunk.
[ Daniel d'Andrada ]
* Fix tst_OrientedShell and tst_Tutorial (LP: #1469761, #1466947)
[ Leo Arias ]
* Reorganized the python test helper modules. Deprecated the
  unity8.shell.emulators namespace. (LP: #1306340)
[ Leonardo Arias Fonseca ]
* Reorganized the python test helper modules. Deprecated the
  unity8.shell.emulators namespace. (LP: #1306340)
[ Lukáš Tinkl ]
* fix PO files extraction
[ Michael Zanetti ]
* Make use of QInputDeviceInfo in order to automatically switch
  between usage modes and hide the OSK.
[ Nick Dedekind ]
* Fixed qtmultimedia mock which was generating errors in tests
[ Richard Huddie ]
* Reorganized the python test helper modules. Deprecated the
  unity8.shell.emulators namespace. (LP: #1306340)
* Implement full-shell rotation (LP: #1210199)

[Albert Astals Cid (aacid)]

> On 03/07/15 06:19, Albert Astals Cid wrote:
> > FAIL! : qmltestrunner::Tutorial::test_launcherNoDragGap() 'verify()'
> returned FALSE. ()
> > Loc: [/home/tsdgeos_work/phablet/unity8/tutorial-launcher-
> gap/tests/qmltests/Tutorial/tst_Tutorial.qml(336)]
> >
> > is the error i get
>
> "make xvfbtestTutorial" has been running for a while here (in a loop)
> and didn't fail yet. :-/

Maybe my wording was weird, what i meant is that "make xvfbtestTutorial" works and "make testTutorial" fails.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1835
http://jenkins.qa.ubuntu.com/job/unity8-ci/5944/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/225
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/268
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/268/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21673

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5944/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

FWIW

=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
--- tests/qmltests/Tutorial/tst_Tutorial.qml 2015-07-02 16:13:08 +0000
+++ tests/qmltests/Tutorial/tst_Tutorial.qml 2015-07-09 11:33:14 +0000
@@ -332,14 +332,14 @@
             verify(teaseAnimation.running);

             // Start a drag, make sure animation stops
- touchFlick(shell, 0, halfHeight, units.gu(3), halfHeight, true, false);
+ touchFlick(shell, 0, halfHeight, units.gu(4), halfHeight, true, false);
             verify(!teaseAnimation.running);
             verify(launcher.visibleWidth > 0);
             verify(launcher.x > 0);
             compare(launcher.x, teaseAnimation.bounce);

             // Continue drag, make sure we don't create a gap on the left hand side
- touchFlick(shell, units.gu(3), halfHeight, shell.width, halfHeight, false, false);
+ touchFlick(shell, units.gu(4), halfHeight, shell.width, halfHeight, false, false);
             verify(!teaseAnimation.running);
             compare(launcher.visibleWidth, launcher.panelWidth);
             compare(launcher.x, 0);

Fixes "make testTutorial" for me

[lp:~dandrader/unity8/tutorial-launcher-gap]

1836. By Albert Astals Cid on 2015-07-09

Make test more reliable

[Daniel d'Andrada (dandrader)]

On 09/07/15 09:39, Albert Astals Cid wrote:
> FWIW
>
> === modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
> --- tests/qmltests/Tutorial/tst_Tutorial.qml 2015-07-02 16:13:08 +0000
> +++ tests/qmltests/Tutorial/tst_Tutorial.qml 2015-07-09 11:33:14 +0000
> @@ -332,14 +332,14 @@
> verify(teaseAnimation.running);
>
> // Start a drag, make sure animation stops
> - touchFlick(shell, 0, halfHeight, units.gu(3), halfHeight, true, false);
> + touchFlick(shell, 0, halfHeight, units.gu(4), halfHeight, true, false);
> verify(!teaseAnimation.running);
> verify(launcher.visibleWidth > 0);
> verify(launcher.x > 0);
> compare(launcher.x, teaseAnimation.bounce);
>
> // Continue drag, make sure we don't create a gap on the left hand side
> - touchFlick(shell, units.gu(3), halfHeight, shell.width, halfHeight, false, false);
> + touchFlick(shell, units.gu(4), halfHeight, shell.width, halfHeight, false, false);
> verify(!teaseAnimation.running);
> compare(launcher.visibleWidth, launcher.panelWidth);
> compare(launcher.x, 0);
>
> Fixes "make testTutorial" for me

Added your patch.

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass? If not, please explain why.
AP needs work :/

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1836
http://jenkins.qa.ubuntu.com/job/unity8-ci/6010/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/301/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/249
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/211/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/301
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/301/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21755

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6010/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1836
http://jenkins.qa.ubuntu.com/job/unity8-ci/6041/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/343
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/280
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/343
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/343/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21862

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6041/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1836
http://jenkins.qa.ubuntu.com/job/unity8-ci/6053/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/356
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/291
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/292
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/356
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/356/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21875

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6053/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Tutorial/TutorialLeft.qml'
--- qml/Tutorial/TutorialLeft.qml	2015-01-09 17:58:05 +0000
+++ qml/Tutorial/TutorialLeft.qml	2015-07-09 12:45:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,24 +46,34 @@
 
     SequentialAnimation {
         id: teaseAnimation
+        objectName: "teaseAnimation"
         paused: running && root.paused
         running: !slider.active && root.launcher.visibleWidth === 0 && root.shown
         loops: Animation.Infinite
+        property real bounce: 0
+        readonly property real maxBounce: units.gu(2)
 
         UbuntuNumberAnimation {
-            target: root.launcher
-            property: "x"
-            to: units.gu(2)
+            target: teaseAnimation
+            property: "bounce"
+            to: teaseAnimation.maxBounce
             duration: UbuntuAnimation.SleepyDuration
         }
         UbuntuNumberAnimation {
-            target: root.launcher
-            property: "x"
+            target: teaseAnimation
+            property: "bounce"
             to: 0
             duration: UbuntuAnimation.SleepyDuration
         }
     }
 
+    Binding {
+        target: root.launcher
+        when: root.shown
+        property: "x"
+        value: Math.min(root.launcher.panelWidth - root.launcher.visibleWidth, teaseAnimation.bounce)
+    }
+
     Timer {
         id: finishTimer
         interval: 1

=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
--- tests/qmltests/Tutorial/tst_Tutorial.qml	2015-06-23 14:05:51 +0000
+++ tests/qmltests/Tutorial/tst_Tutorial.qml	2015-07-09 12:45:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013,2014 Canonical, Ltd.
+ * Copyright (C) 2013,2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -319,6 +319,36 @@
             tryCompare(left, "shown", true); // and we should still be on left
         }
 
+        function test_launcherNoDragGap() {
+            // See bug 1454882, where if you dragged the launcher while it was
+            // visible, you could pull it further than the edge of the screen.
+
+            var left = goToPage("tutorialLeft");
+            var launcher = findChild(shell, "launcher");
+            var teaseAnimation = findInvisibleChild(left, "teaseAnimation");
+
+            // Wait for launcher to be really out there
+            tryCompareFunction(function() {return launcher.x > teaseAnimation.maxBounce/2}, true);
+            verify(teaseAnimation.running);
+
+            // Start a drag, make sure animation stops
+            touchFlick(shell, 0, halfHeight, units.gu(4), halfHeight, true, false);
+            verify(!teaseAnimation.running);
+            verify(launcher.visibleWidth > 0);
+            verify(launcher.x > 0);
+            compare(launcher.x, teaseAnimation.bounce);
+
+            // Continue drag, make sure we don't create a gap on the left hand side
+            touchFlick(shell, units.gu(4), halfHeight, shell.width, halfHeight, false, false);
+            verify(!teaseAnimation.running);
+            compare(launcher.visibleWidth, launcher.panelWidth);
+            compare(launcher.x, 0);
+
+            // Finish and make sure we continue animation
+            touchFlick(shell, shell.width, halfHeight, shell.width, halfHeight, false, true);
+            tryCompare(teaseAnimation, "running", true);
+        }
+
         function test_spread() {
             // Unfortunately, most of what we want to test of the spread is
             // "did it render correctly?" but that's hard to test.  So instead,