Merge lp:~dandrader/unity8/fixDragHandleTest into lp:unity8

[Daniel d'Andrada]

Make DragHandle tests run again.

- "make tryDragHandle" was missing import paths
- "make testDragHandle" was crashing because of some uitk::Button style issue during
  initialization. So I decided to move entirely away from this extra complexity.

* 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2100
http://jenkins.qa.ubuntu.com/job/unity8-ci/6965/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5817/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/380/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1676
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/379
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/377
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4495/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5830
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5830/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26118
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/145/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/379
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/379/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26119

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

I think it'd be a good idea to fix xvfbtestDragHandle too, I did that here locally by adding

if (pixelsPerMm <= 0)
        pixelsPerMm = 6;

in DirectionalDragArea::itemChange

What do you think?

review: Needs Information

[Daniel d'Andrada (dandrader)]

On 16/12/2015 14:46, Albert Astals Cid wrote:
> Review: Needs Information
>
> I think it'd be a good idea to fix xvfbtestDragHandle too, I did that here locally by adding
>
> if (pixelsPerMm <= 0)
> pixelsPerMm = 6;
>
> in DirectionalDragArea::itemChange
>
> What do you think?

I think it's a good solution. Done. Thanks for investigating that crash.

[lp:~dandrader/unity8/fixDragHandleTest]

2101. By Daniel d'Andrada on 2015-12-16

Fix crash in "make xvfbtestDragHandle"

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2101
http://jenkins.qa.ubuntu.com/job/unity8-ci/6968/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5823/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/383/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1679
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/382
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1574
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1574
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/381
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/380
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4499/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5836
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5836/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26130
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/148/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/382
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/382/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26132

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Not ideal to bypass the SDK crashes but oh well...

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

 * Did CI run pass?
yes, except broken known tests

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

review: Approve

=== modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea.cpp'
--- plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2015-11-20 15:01:39 +0000
+++ plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2015-12-16 18:29:48 +0000
@@ -715,8 +715,14 @@
             value.window->installEventFilter(TouchRegistry::instance());
 
             // TODO: Handle window->screen() changes (ie window changing screens)
-            qreal pixelsPerMm = value.window->screen()->physicalDotsPerInch() / 25.4;
-            d->setPixelsPerMm(pixelsPerMm);
+
+            qreal pixelsPerInch = value.window->screen()->physicalDotsPerInch();
+            if (pixelsPerInch < 0) {
+                // It can return garbage when run in a XVFB server (Virtual Framebuffer 'fake' X server)
+                pixelsPerInch = 72;
+            }
+
+            d->setPixelsPerMm(pixelsPerInch / 25.4);
         }
     }
 }
 
=== modified file 'tests/qmltests/Components/CMakeLists.txt'
--- tests/qmltests/Components/CMakeLists.txt	2015-05-19 20:54:12 +0000
+++ tests/qmltests/Components/CMakeLists.txt	2015-12-16 18:29:48 +0000
@@ -15,7 +15,7 @@
 target_link_libraries(DragHandleTestExec UbuntuGesturesQml UbuntuGestures)
 
 add_unity8_uitest(DragHandle DragHandleTestExec ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures)
-add_manual_qml_test(. DragHandle IMPORT_PATHS ${UNITY_PLUGINPATH})
+add_manual_qml_test(. DragHandle IMPORT_PATHS ${UNITY_IMPORT_PATHS})
 
 ########## tst_EdgeDragEvaluator
 add_executable(EdgeDragEvaluatorTestExec tst_EdgeDragEvaluator.cpp)
 
=== modified file 'tests/qmltests/Components/tst_DragHandle.qml'
--- tests/qmltests/Components/tst_DragHandle.qml	2015-07-15 15:07:19 +0000
+++ tests/qmltests/Components/tst_DragHandle.qml	2015-12-16 18:29:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013,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
@@ -51,7 +51,7 @@
         objectName: "baseItem"
         anchors.fill: parent
 
-        Button {
+        SimpleButton {
             visible: root.bidirectional && bidirectionalShowable.fullyHidden
             text: "bidirectionalShowable.show()"
             anchors.centerIn: parent
@@ -169,12 +169,12 @@
         anchors.margins: units.gu(1)
         spacing: units.gu(1)
 
-        Button {
+        SimpleButton {
             text: root.stretch ? "stretch" : "move"
             onClicked: { root.stretch = !root.stretch; }
         }
 
-        Button {
+        SimpleButton {
             text: root.hintDisplacement > 0 ? "hint" : "no hint"
             onClicked: {
                 if (root.hintDisplacement > 0) {
@@ -185,7 +185,7 @@
             }
         }
 
-        Button {
+        SimpleButton {
             text: "rotation: " + baseItem.rotation
             onClicked: {
                 if (baseItem.rotation === 0.0) {
@@ -196,7 +196,7 @@
             }
         }
 
-        Button {
+        SimpleButton {
             text: root.bidirectional ? "bidirectional" : "directional"
             onClicked: { root.bidirectional = !root.bidirectional; }
         }
 
=== added file 'tests/qmltests/Components/tst_DragHandle/SimpleButton.qml'
--- tests/qmltests/Components/tst_DragHandle/SimpleButton.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Components/tst_DragHandle/SimpleButton.qml	2015-12-16 18:29:48 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 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
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+
+Rectangle {
+    id: root
+    property alias text: textItem.text
+    signal clicked()
+    width: textItem.width + units.gu(1.5)
+    height: textItem.height + units.gu(1.5)
+    Text {
+        id: textItem
+        anchors.centerIn: parent
+        font.pixelSize: units.gu(1.5)
+    }
+    MouseArea {
+        anchors.fill: parent
+        onClicked: root.clicked()
+    }
+}