Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/visualGallery into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Introduce gallery for browsing visual tests

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

FAILED: Continuous integration, rev:1995
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/854/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3574/console

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:1995
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/431/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/854/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/883
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/665
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/639
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3578/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3574
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3575
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3577
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3576

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

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

The first listitem that I click becomes blue, and if I click another listitem in the left column after that, it does open the page that I intend to open, but still the previously blue listitem stays blue. What is the logic behind this?

I'll repeat one question from the last MR: is gallery.sh the best name? We have another gallery.sh, and it may be confusing (ctrl+k to select files in qtc already gives a lot of duplicates for many of the qml files that we have, which is very annoying).

Also, one inline comment.

[Cris Dywan (kalikiana)]

> The first listitem that I click becomes blue, and if I click another listitem
> in the left column after that, it does open the page that I intend to open,
> but still the previously blue listitem stays blue. What is the logic behind
> this?

I don't get it. The code is the same as in the old MR, onClicked pushes the page. Nothing is getting blue here.

> I'll repeat one question from the last MR: is gallery.sh the best name? We
> have another gallery.sh, and it may be confusing (ctrl+k to select files in
> qtc already gives a lot of duplicates for many of the qml files that we have,
> which is very annoying).

It's still the the most obvious name. browser would make sense also but it's just as ambiguous. I don't really have much inspiration here.

> This filter seems random. We don't have a strict policy on the naming,
> and I think only the tests that have a deprecated test version for 1.2
> also have a *13.qml. Plenty of (new) tests do not have 13 in the name,
> like actionbar, adaptivepagelayout, listitem, header, pageheader, sections, toolbar

The filter *seems* random. All new tests being added lately, as far as I'm aware, have a 13 suffix if they use 1.3 and that's what the filter means. Maybe I missed one or two, but I think we'll want to get our naming sorted anyway if we haven't yet. There's no other special requirement. But I'd rather not rename and rewrite more tests in this MR - I patched two to display "something" but some tests need more work to be useful for manual testing. The way I see it, it's not harmful to have those in there, it's motivating to fix them.

[Tim Peeters (tpeeters)]

Ok. Happroving. We still need to fix the naming of the unit test filenames (in a separate MR).

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

FAILED: Continuous integration, rev:1995
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/858/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3595/console

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/319/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/858/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/887
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/669
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/643
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/327/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3595
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3597
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3596
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3598

review: Needs Fixing (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

=== added file 'tests/unit/visual/gallery.qml'
--- tests/unit/visual/gallery.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/visual/gallery.qml	2016-06-07 14:41:14 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Qt.labs.folderlistmodel 2.1
+
+MainView {
+    width: units.gu(120)
+    height: units.gu(75)
+
+    AdaptivePageLayout {
+        id: pageLayout
+        anchors.fill: parent
+        primaryPage: Page {
+            header: PageHeader {
+                flickable: testsListView
+                title: 'Unit Tests'
+            }
+
+            UbuntuListView {
+                id: testsListView
+                anchors.fill: parent
+                model: FolderListModel {
+                    Component.onCompleted: folder += '/tests/unit/visual'
+                    showDirs: false
+                    showOnlyReadable: true
+                    sortField: FolderListModel.Name
+                    nameFilters: [ "tst_*13.qml" ]
+                }
+
+                delegate: ListItem {
+                    height: listItemLayout.height
+                    ListItemLayout {
+                        id: listItemLayout
+                        title.text: fileBaseName
+                        ProgressionSlot {}
+                    }
+                    onClicked: pageLayout.addPageToNextColumn(pageLayout.primaryPage, testPage, { source: fileURL, title: fileBaseName })
+                }
+            }
+        }
+        asynchronous: false
+
+        Page {
+            id: testPage
+            property alias source: testLoader.source
+            header: PageHeader {
+                id: testPageHeader
+                title: testPage.title
+            }
+
+            Loader {
+                id: testLoader
+                anchors.fill: parent
+                anchors.topMargin: testPage.header.height
+                asynchronous: false
+            }
+        }
+    }
+}
+

=== added file 'tests/unit/visual/gallery.sh'
--- tests/unit/visual/gallery.sh	1970-01-01 00:00:00 +0000
+++ tests/unit/visual/gallery.sh	2016-06-07 14:41:14 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+. `dirname ${BASH_SOURCE[0]}`/../../../export_qml_dir.sh || exit 1
+
+SCRIPT_DIRECTORY=`dirname $0`
+$BUILD_DIR/ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher $@ $SCRIPT_DIRECTORY/gallery.qml

=== modified file 'tests/unit/visual/tst_picker13.qml'
--- tests/unit/visual/tst_picker13.qml	2016-03-15 13:26:55 +0000
+++ tests/unit/visual/tst_picker13.qml	2016-06-07 14:41:14 +0000
@@ -100,6 +100,7 @@
     Loader {
         id: pickerLoader
         asynchronous: false
+        sourceComponent: defaultPicker
     }
 
     ListModel {

=== modified file 'tests/unit/visual/tst_popups_dialog13.qml'
--- tests/unit/visual/tst_popups_dialog13.qml	2016-03-15 13:26:55 +0000
+++ tests/unit/visual/tst_popups_dialog13.qml	2016-06-07 14:41:14 +0000
@@ -26,6 +26,13 @@
     width: units.gu(40)
     height: units.gu(71)
 
+    Button {
+        id: pressMe
+        anchors.top: parent.top
+        text: "Open Dialog"
+        onClicked: PopupUtils.open(dialog)
+    }
+
     UbuntuTestCase {
         id: test
         name: "Popups.Dialog"
@@ -45,7 +52,13 @@
     Component {
         id: dialog
         Dialog {
+            id: ahojDialog
             title: "Ahoj"
+
+            Button {
+                text: "Close"
+                onClicked: PopupUtils.close(ahojDialog)
+            }
         }
     }
 }