Merge lp:~unity-team/unity/phablet.test_greeter-clock into lp:unity/phablet

[Andrea Cimitan]

Add tests for Greeter's Clock

Add tests for Greeter's Clock

[Michael Zanetti (mzanetti)]

* I'd say it would make sense to change __date to something predefined and then actually check if the labels also change to the wanted value

* The code itself updates the clock only once per minute... That's not enough precision for a clock imho... I'd say 5 seconds or something would better (Just a notice as we are touching the code anyways... You decide if you want to fix that now or not)

I would probably add something like this:

- set clock to invisible => timer is stopped
- change __date to something else than the current date
- set clock to visible
- check if time is updated properly

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:556
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/367/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/91
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/368/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/367/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/243/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/247/console

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

> * I'd say it would make sense to change __date to something predefined and
> then actually check if the labels also change to the wanted value
>
> * The code itself updates the clock only once per minute... That's not enough
> precision for a clock imho... I'd say 5 seconds or something would better
> (Just a notice as we are touching the code anyways... You decide if you want
> to fix that now or not)
>
> I would probably add something like this:
>
> - set clock to invisible => timer is stopped
> - change __date to something else than the current date
> - set clock to visible
> - check if time is updated properly

We save battery by not updating the clock every 5 seconds... isn't it?

[Michael Zanetti (mzanetti)]

> We save battery by not updating the clock every 5 seconds... isn't it?

In general yes, try to avoid frequently ticking timers. However, Its better to have a very precise timer that is enabled when needed and disabled when not needed.

For that short amount of time when the user actually looks on the lockscreen, a precision of one minute is way too long. I would actually even use half a second or something like that - because in that time frame the user wants to know what time it is now, and not what time it was a minute ago.

Looking through the code, the timer is stopped while the device is unlocked, which is good. The only thing that concerns me right now, is that currently the the timer might be active while the device is locked and the screen is off - that would need to be checked. Once we are sure the timer is stopped when the screen is off, we can easily use a one second interval or something like that. If the timer keeps on ticking while the device is locked, even one minute is still too frequent.

[Michał Sawicz (saviq)]

We need to capture the requirement for a Clock component (as in date/time as properties of that component) at a given precision.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:558
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/407/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/150/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/408/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/407/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/283/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/287/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:563
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/413/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/157/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/414
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/414/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/413
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/289
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/289/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/293
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/844

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:563
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/420/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/176/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/421/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/420/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/296/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/300/console

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Please merge trunk.

[Michael Zanetti (mzanetti)]

42 -add_subdirectory(plugins)
43 \ No newline at end of file
44 +add_subdirectory(plugins)

probably not harmful for us in practive, but I've seen weird failures because of things like this in the past.

[Michał Sawicz (saviq)]

Yeah but that actually _added_ the newline, isn't that what we want?

[Michael Zanetti (mzanetti)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:564
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/508/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/509
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/509/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/508
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/384
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/384/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/388
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/959

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

review: Approve (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/198/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/292/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/198/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/198/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/132/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/132/console

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Greeter/Clock.qml'
--- Greeter/Clock.qml	2013-01-15 11:37:07 +0000
+++ Greeter/Clock.qml	2013-04-12 15:39:38 +0000
@@ -24,8 +24,11 @@
     implicitHeight: childrenRect.height
 
     property date __date
+    property alias __timerInterval: timer.interval
+    readonly property bool __timerRunning: timer.running
 
     Timer {
+        id: timer
         interval: 1000 * 60
         running: clock.enabled && clock.visible && clock.opacity != 0
         repeat: true
@@ -38,6 +41,7 @@
 
         Label {
             id: timeLabel
+            objectName: "timeLabel"
 
             anchors.horizontalCenter: parent.horizontalCenter
             font.pixelSize: units.gu(7.5)
@@ -49,6 +53,7 @@
 
         Label {
             id: dateLabel
+            objectName: "dateLabel"
 
             anchors.horizontalCenter: parent.horizontalCenter
             fontSize: "medium"

=== modified file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	2013-04-12 13:15:12 +0000
+++ tests/unittests/CMakeLists.txt	2013-04-12 15:39:38 +0000
@@ -4,6 +4,8 @@
 set(qmltest_DEFAULT_PROPERTIES PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
 
 add_subdirectory(Components)
+add_subdirectory(Greeter)
 add_subdirectory(Panel)
 add_subdirectory(SideStage)
 add_subdirectory(plugins)
+

=== added directory 'tests/unittests/Greeter'
=== added file 'tests/unittests/Greeter/CMakeLists.txt'
--- tests/unittests/Greeter/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/Greeter/CMakeLists.txt	2013-04-12 15:39:38 +0000
@@ -0,0 +1,1 @@
+add_qml_test(Clock)

=== added file 'tests/unittests/Greeter/tst_Clock.qml'
--- tests/unittests/Greeter/tst_Clock.qml	1970-01-01 00:00:00 +0000
+++ tests/unittests/Greeter/tst_Clock.qml	2013-04-12 15:39:38 +0000
@@ -0,0 +1,88 @@
+/*
+ * 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 "../../qmluitests"
+import "../../../Greeter"
+import Ubuntu.Components 0.1
+
+Rectangle {
+    width: units.gu(60)
+    height: units.gu(40)
+    color: "black"
+
+    Clock {
+        id: clock
+        anchors {
+            top: parent.top
+            topMargin: units.gu(2)
+            horizontalCenter: parent.horizontalCenter
+        }
+    }
+
+    UnityTestCase {
+        name: "Clock"
+
+        function test_customDate() {
+            var dateObj = new Date("October 13, 1975 11:13:00")
+            var dateString = Qt.formatDate(dateObj, Qt.DefaultLocaleLongDate)
+            var timeString = Qt.formatTime(dateObj)
+
+            clock.__timerInterval = 60000
+            clock.__date = dateObj
+            var dateLabel = findChild(clock, "dateLabel")
+            compare(dateLabel.text, dateString, "Not the expected date")
+            var timeLabel = findChild(clock, "timeLabel")
+            compare(timeLabel.text, timeString, "Not the expected time")
+        }
+
+        function test_dateUpdate() {
+            var dateObj = new Date("October 13, 1975 11:13:00")
+            var dateString = Qt.formatDate(dateObj, Qt.DefaultLocaleLongDate)
+            var timeString = Qt.formatTime(dateObj)
+
+            clock.enabled = false
+            compare(clock.__timerRunning, false, "Timer should not be running")
+            clock.__date = dateObj
+            clock.__timerInterval = 5
+            wait(5) // spin event loop (only that would trigger the timer and reveal eventual bugs)
+            var dateLabel = findChild(clock, "dateLabel")
+            compare(dateLabel.text, dateString, "Not the expected date")
+            var timeLabel = findChild(clock, "timeLabel")
+            compare(timeLabel.text, timeString, "Not the expected time")
+
+            clock.enabled = true
+            compare(clock.__timerRunning, true, "Timer should be running")
+            wait(0) // spin event loop to trigger the timer
+            verify(dateLabel.text !== dateString)
+            if (timeLabel.text == "11:13") wait(60000) // next test will fail at 11:13, wait 1 minute
+            verify(timeLabel.text !== timeString)
+        }
+
+        function test_timerRunning() {
+            // tests for clock.enabled property are already in test_dateUpdate()
+            clock.opacity = 0.0
+            compare(clock.__timerRunning, false, "Timer should not be running")
+            clock.opacity = 1.0
+            compare(clock.__timerRunning, true, "Timer should be running")
+            clock.visible = false
+            compare(clock.__timerRunning, false, "Timer should not be running")
+            clock.visible = true
+            compare(clock.__timerRunning, true, "Timer should be running")
+        }
+    }
+}