Merge lp:~yohanboniface/ubuntu-calendar-app/fix1279933 into lp:ubuntu-calendar-app

[ybon]

Add a method for getting the correct end of day date, and use it on dayview.

Add a method for getting the correct end of day date, and use it on dayview.

[Olivier Tilloy (osomon)]

Thanks for the patch Yohan! I tested it and it seems to fix the issue, nice job.

Looking at the bug report, you were looking at writing tests. The calendar application has two types of tests:

 - unit tests that essentially test the helpers in dateExt.js
 - autopilot tests that test the UI and user interaction (they’re more like integration tests)

For this specific issue, I guess we could write both types of tests, but a good start would be to add a unit test for the new endOfDay() function. You can do that by adding a test to tests/unittests/tst_date.qml.
To execute the unit tests, just run:

    cmake .
    ctest -V

I’m approving as anyways it is good to be merged as is, the tests would be a nice addition but not strictly necessary.

review: Approve

[ybon (yohanboniface)]

Done :)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~yohanboniface/ubuntu-calendar-app/fix1279933/+merge/208970/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/109/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1566
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/109
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/109
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/49

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/112/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1610
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/112
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/112
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/52

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/129/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1737
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/129
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/129
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/69

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/130/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1744
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/130
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/130
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/70

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/133/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1748
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/133
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/133
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/73

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml	2014-01-31 03:20:40 +0000
+++ TimeLineBase.qml	2014-03-03 11:34:43 +0000
@@ -40,11 +40,9 @@
     function createEvents() {
         bubbleOverLay.destroyAllChildren();
 
-        var startDate = new Date(day);
-        startDate.setHours(0,0,0,0);
+        var startDate = new Date(day).midnight();
 
-        var endDate = startDate.addDays(1);
-        endDate.setHours(0,0,0,0);
+        var endDate = new Date(day).endOfDay();
 
         var itemIds = intern.model.itemIds(startDate,endDate);
         for(var i = 0 ; i < itemIds.length ; ++i) {

=== modified file 'dateExt.js'
--- dateExt.js	2013-09-03 23:46:17 +0000
+++ dateExt.js	2014-03-03 11:34:43 +0000
@@ -35,6 +35,12 @@
     return date
 }
 
+Date.prototype.endOfDay = function() {
+    var date = new Date(this)
+    date.setHours(23,59,59,0);
+    return date
+}
+
 Date.prototype.addDays = function(days) {
     var date = new Date(this)
     date.setDate(date.getDate() + days);

=== modified file 'tests/unittests/tst_date.qml'
--- tests/unittests/tst_date.qml	2013-09-23 11:32:47 +0000
+++ tests/unittests/tst_date.qml	2014-03-03 11:34:43 +0000
@@ -98,4 +98,9 @@
         compare(test.start.addMonths(test.months), test.end, test.start + " + " + test.months + " months");
     }
 
+    function test_endOfDay(test) {
+        var d = new Date(2014, 2, 3)
+        compare(d.endOfDay(), new Date(2014, 2, 3, 23, 59, 59, 0));
+    }
+
 }