Merge lp:~unity-team/unity/phablet.test_GenericLensView into lp:unity/phablet

[Andrea Cimitan]

Add tests for the GenericLensView

Add tests for the GenericLensView

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:607
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/712/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/530
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/714
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/714/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/712
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/588
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/588/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1242

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/712/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

You need to remerge this with trunk UnityTestCase is "gone"

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:610
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/729/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/555
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/731
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/731/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/605
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/605/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/609
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1272

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/729/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:610
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity/phablet.test_GenericLensView/+merge/160335/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/735/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/562
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/737
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/737/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/735
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/611
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/611/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/615
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1277

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/735/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:610
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/751/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/587
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/753
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/753/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/751/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/627
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/627/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/631

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/751/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:610
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/752/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/588
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/754
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/754/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/752
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/628
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/628/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/632
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1299

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/752/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Do you think that you could add a test that checks that onMovementStarted the header is shown?

review: Needs Information

[Andrea Cimitan (cimi)]

> Do you think that you could add a test that checks that onMovementStarted the
> header is shown?

I thought about it, however I'm not sure how I could do that... because it's inside the implementation of LVWPH

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:610
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/764/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/624/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/766/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/764/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/640/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/644/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/764/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Ok, let's go with this, seems you need to remerge though

[Andrea Cimitan (cimi)]

ok

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:611
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/772/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/648
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/648/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/652

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/772/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/264/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/198
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/198/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/198

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/266/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/650
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/200
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/200/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/200
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1321

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Dash/GenericLensView.qml'
--- Dash/GenericLensView.qml	2013-02-15 09:49:36 +0000
+++ Dash/GenericLensView.qml	2013-04-26 10:04:39 +0000
@@ -86,6 +86,7 @@
         }
         pageHeader: PageHeader {
             id: pageHeader
+            objectName: "pageHeader"
             width: categoryView.width
             text: lensView.lens.name
             searchEntryEnabled: true

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-04-24 14:21:44 +0000
+++ tests/qmltests/CMakeLists.txt	2013-04-26 10:04:39 +0000
@@ -42,6 +42,7 @@
 add_qml_test(Components Tile)
 add_qml_test(Components PageHeader)
 add_qml_test(Dash DashPreview)
+add_qml_test(Dash GenericLensView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Dash LensView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_BINARY_DIR}/plugins)
 add_qml_test(Dash PeoplePreview)
 add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins)

=== added file 'tests/qmltests/Dash/tst_GenericLensView.qml'
--- tests/qmltests/Dash/tst_GenericLensView.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/tst_GenericLensView.qml	2013-04-26 10:04:39 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013 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.0
+import QtTest 1.0
+import Unity 0.1
+import ".."
+import "../../../Dash"
+import Ubuntu.Components 0.1
+import Unity.Test 0.1 as UT
+
+Item {
+    width: units.gu(120)
+    height: units.gu(80)
+
+    Lenses {
+        id: lenses
+    }
+
+    GenericLensView {
+        id: genericLensView
+        anchors.fill: parent
+
+        UT.UnityTestCase {
+            name: "GenericLensView"
+            when: lenses.loaded
+
+            function init() {
+                genericLensView.lens = lenses.get(0)
+            }
+
+            function test_isCurrent() {
+                var pageHeader = findChild(genericLensView, "pageHeader");
+                genericLensView.isCurrent = true
+                pageHeader.searchQuery = "test"
+                genericLensView.isCurrent = false
+                tryCompare(pageHeader, "searchQuery", "")
+            }
+        }
+    }
+}