ubuntu-touch-coreapps-reviewers team mailing list archive

[Renato Araujo Oliveira Filho <renato.filho@xxxxxxxxxxxxx>]

Renato Araujo Oliveira Filho has proposed merging lp:~renatofilho/ubuntu-calendar-app/fix-unit-tests into lp:ubuntu-calendar-app with lp:~osomon/ubuntu-calendar-app/deps-cleanup as a prerequisite.

Commit message:
[tst_new_event] Added missing build dep necessary for tests.
[tst_event_bubble] Make sure that initial event start date is always in the future.

Requested reviews:
  Ubuntu Calendar Developers (ubuntu-calendar-dev)

For more details, see:
https://code.launchpad.net/~renatofilho/ubuntu-calendar-app/fix-unit-tests/+merge/298447
-- 
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~renatofilho/ubuntu-calendar-app/fix-unit-tests into lp:ubuntu-calendar-app.

=== modified file 'debian/control'
--- debian/control	2016-06-27 16:54:08 +0000
+++ debian/control	2016-06-27 16:54:08 +0000
@@ -10,6 +10,7 @@
                qml-module-qttest,
                qt5-default,
                qtdeclarative5-dev-tools,
+               qtdeclarative5-ubuntu-content1,
 Standards-Version: 3.9.4
 Section: misc
 Homepage: https://launchpad.net/ubuntu-calendar-app

=== modified file 'tests/unittests/tst_event_bubble.qml'
--- tests/unittests/tst_event_bubble.qml	2016-03-31 19:19:33 +0000
+++ tests/unittests/tst_event_bubble.qml	2016-06-27 16:54:08 +0000
@@ -2,6 +2,8 @@
 import QtTest 1.0
 import QtOrganizer 5.0
 
+import "../../dateExt.js" as DATE
+
 TestCase{
     id: root
     name: "Event Bubble tests"
@@ -107,8 +109,9 @@
     function init()
     {
         var collectionId = get_collection_id_by_name(root.model, root.collection.name)
-        var startDate = new Date(2016, 3, 28, 14, 0,0 )
-        var endDate = new Date(2016, 3, 28, 15, 0,0 )
+        var startDate = new Date()
+        startDate = startDate.addDays(1)
+        var endDate = startDate.addMinutes(60)
         var eventData = {"collectionId": collectionId,
                          "label": "Sample Test Event",
                          "allDay": false,