Merge lp:~doflah/ubuntu-calendar-app/testing into lp:ubuntu-calendar-app

[Dennis O'Flaherty]

Add unit tests for JS date functions.

Add unit tests for js date functions.

[Dennis O'Flaherty (doflah)]

Some of the routines in dateExt.js aren't used anywhere or seem to be duplicated, so it may be worth cleaning that file up in addition to adding the tests.

[Olivier Tilloy (osomon)]

91 + compare(todayTest.getMonth(), todayReal.getMonth(), "Today's year");
92 + compare(todayTest.getDate(), todayReal.getDate(), "Today's year");

I guess this should be "Today’s month" and "Today’s day".

review: Needs Fixing

[Dennis O'Flaherty (doflah)]

Fixed. Thanks for catching that.

[Olivier Tilloy (osomon)]

Overall this looks like a great addition to the already existing autopilot tests, to ensure no regressions in the JS helpers. Thanks for this!

A few remarks:

 - For consistency with other apps, instead of "unit-tests/", I would place those tests under "tests/unittests/" (when you do that you’ll have to add another "../" to the import statement for dateExt.js.

 - It would be great to have the build system automatically run those tests when building a package. To achieve this, you’ll need to apply the following changes:

=== modified file 'debian/control'
--- debian/control 2013-08-20 08:24:45 +0000
+++ debian/control 2013-09-23 11:23:04 +0000
@@ -1,7 +1,8 @@
 Source: calendar-app
 Priority: extra
 Maintainer: Ubuntu App Cats <email address hidden>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
+ qtdeclarative5-dev-tools,
 Standards-Version: 3.9.4
 Section: misc
 Homepage: https://launchpad.net/ubuntu-calendar-app

=== modified file 'debian/rules'
--- debian/rules 2013-06-17 11:10:21 +0000
+++ debian/rules 2013-09-23 11:20:25 +0000
@@ -7,6 +7,9 @@
 %:
  dh $@

+override_dh_auto_test:
+ QT_QPA_PLATFORM=minimal qmltestrunner -input tests/unittests/
+
 override_dh_install:
  dh_install --fail-missing
  appname=calendar-app; \

[Olivier Tilloy (osomon)]

Thanks for the changes!
I’ve had a go at building a package in a saucy chroot, and it appears we are missing the following build dependencies:

    qt5-default,
    qtdeclarative5-qtquick2-plugin,
    qtdeclarative5-test-plugin,

(on top of qtdeclarative5-dev-tools that was already added).

Can you please add those to the Build-Depends section (and while you’re at it, ensure they are all aligned on the same column as the first dependency, using spaces not tabs)?
Thanks!

review: Needs Fixing

[Dennis O'Flaherty (doflah)]

No problem! Hopefully you should be all set now.

[Olivier Tilloy (osomon)]

Looks perfect now!

review: Approve

[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/31/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/443
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-autolanding/31/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-autolanding/31/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/31
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/31

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

It looks like there a problem with the jenkins setup, it can’t find the Qt5 build dependencies on precise and quantal, I asked the CI team to look into this.

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

FAILED: Continuous integration, rev:126
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/77/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/453/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/77/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/77
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/77/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/77/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/77/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:126
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/78/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/454/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/78
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/78
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/78
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/78

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/78/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:126
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/79/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/455/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/79
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/79
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/79
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/79

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/79/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:126
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/80/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/456/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/80
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/80
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/80
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/80

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/80/rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:126
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/81/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/457
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/81
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/81
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/81
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/81

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/81/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-08-20 08:24:45 +0000
+++ debian/control	2013-09-24 11:19:44 +0000
@@ -2,6 +2,10 @@
 Priority: extra
 Maintainer: Ubuntu App Cats <[e-mail]>
 Build-Depends: debhelper (>= 9), 
+               qtdeclarative5-dev-tools,
+               qt5-default,
+               qtdeclarative5-qtquick2-plugin,
+               qtdeclarative5-test-plugin,
 Standards-Version: 3.9.4
 Section: misc
 Homepage: https://launchpad.net/ubuntu-calendar-app

=== modified file 'debian/rules'
--- debian/rules	2013-06-17 11:10:21 +0000
+++ debian/rules	2013-09-24 11:19:44 +0000
@@ -7,6 +7,9 @@
 %:
 	dh $@
 
+override_dh_auto_test:
+	QT_QPA_PLATFORM=minimal qmltestrunner -input tests/unittests/
+
 override_dh_install:
 	dh_install --fail-missing
 	appname=calendar-app; \

=== added directory 'tests/unittests'
=== added file 'tests/unittests/tst_date.qml'
--- tests/unittests/tst_date.qml	1970-01-01 00:00:00 +0000
+++ tests/unittests/tst_date.qml	2013-09-24 11:19:44 +0000
@@ -0,0 +1,101 @@
+import QtQuick 2.0
+import QtTest 1.0
+import "../../dateExt.js" as DATE
+
+TestCase{
+    name: "Date tests"
+
+    // Data \\
+
+    function test_leap_year_data() {
+        return [{year:2013}, {year: 2000}, {year: 2012}, {year: 2100}];
+    }
+
+    function test_days_per_month_data() {
+        return [
+            // all months in a non-leap year
+            new Date(2013,  0),
+            new Date(2013,  1),
+            new Date(2013,  2),
+            new Date(2013,  3),
+            new Date(2013,  4),
+            new Date(2013,  5),
+            new Date(2013,  6),
+            new Date(2013,  7),
+            new Date(2013,  8),
+            new Date(2013,  9),
+            new Date(2013, 10),
+            new Date(2013, 11),
+            // Feb in leap year, century, and millenium
+            new Date(2112,  1),
+            new Date(2000,  1),
+            new Date(2100,  1)
+        ];
+    }
+
+    function test_add_days_data() {
+        return [
+            // regular add days
+            { start: new Date(2013, 0, 1), days: 4, end: new Date(2013, 0, 5)},
+            // start daylight savings: March 10, 2013
+            { start: new Date(2013, 2, 10), days: 1, end: new Date(2013, 2, 11)},
+            // end daylight savings: November 3, 2013
+            { start: new Date(2013, 10, 3), days: 1, end: new Date(2013, 10, 4)},
+            // cross month boundary
+            { start: new Date(2013, 2, 31), days: 2, end: new Date(2013, 3, 2)},
+            // cross year boundary
+            { start: new Date(2013, 11, 31), days: 2, end: new Date(2014, 0, 2)},
+        ];
+    }
+
+    function test_add_months_data() {
+        return [
+            // regular add months
+            { start: new Date(2013, 0, 1), months: 1, end: new Date(2013, 1, 1)},
+            // add multiple months
+            { start: new Date(2013, 0, 1), months: 4, end: new Date(2013, 4, 1)},
+            // start daylight savings: March 10, 2013
+            { start: new Date(2013, 2, 1), months: 1, end: new Date(2013, 3, 1)},
+            // end daylight savings: November 3, 2013
+            { start: new Date(2013, 10, 1), months: 1, end: new Date(2013, 11, 1)},
+            // cross year boundary
+            { start: new Date(2013, 11, 1), months: 1, end: new Date(2014, 0, 1)},
+        ];
+    }
+
+    // Tests \\
+
+    function test_days_per_month(month) {
+        compare(Date.daysInMonth(month.getFullYear(), month.getMonth()),
+                new Date(month.getFullYear(), month.getMonth() + 1, 0).getDate(),
+                Qt.locale().standaloneMonthName(month.getMonth()) + ", " + month.getFullYear());
+    }
+
+    function test_leap_year(test) {
+        compare(Date.leapYear(test.year), new Date(test.year, 2, 0).getDate() == 29, "Check if Feb, " + test.year + " has the right number of days.");
+    }
+
+    function test_midnight() {
+        var date = new Date();
+        compare(date.midnight(), new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0, 0), "Midnight");
+    }
+
+    function test_today() {
+        var todayReal = new Date(), todayTest = DATE.today();
+        compare(todayTest.getFullYear(), todayReal.getFullYear(), "Today's year");
+        compare(todayTest.getMonth(), todayReal.getMonth(), "Today's month");
+        compare(todayTest.getDate(), todayReal.getDate(), "Today's date");
+        compare(todayTest.getHours(), 0, "Midnight, zero hours");
+        compare(todayTest.getMinutes(), 0, "Midnight, zero minutes");
+        compare(todayTest.getSeconds(), 0, "Midnight, zero seconds");
+    }
+
+    function test_add_days(test) {
+        compare(test.start.addDays(test.days), test.end, test.start + " + " + test.days + " days");
+    }
+
+    function test_add_months(test) {
+        compare(test.start.addMonths(test.months), test.end, test.start + " + " + test.months + " months");
+    }
+
+}