Merge lp:~mzanetti/reminders-app/qmltest2 into lp:reminders-app

[Michael Zanetti]

Add some qmltests

This uses elopio's branch for qmltests and adds some more.

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

FAILED: Continuous integration, rev:296
http://91.189.93.70:8080/job/reminders-app-ci/723/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2381/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/325/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/144/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/723/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:297
http://91.189.93.70:8080/job/reminders-app-ci/725/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2385/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/327/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/146/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/725/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:298
http://91.189.93.70:8080/job/reminders-app-ci/727/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2387/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/329/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/148/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/727/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:297
http://91.189.93.70:8080/job/reminders-app-ci/728/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2388/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/330/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/149/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/728/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:297
http://91.189.93.70:8080/job/reminders-app-ci/729/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2389/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/331/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/151/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/729/rebuild

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

There is one test failing:

FAIL! : qmltestrunner::notebooksDelegateTestCase::test_createNoteFromBottomEdge() property count

Also, there are many warnings on the test output. It would be great to fix them, or silence the ones that are expected. This branch is already big, so that can be done separately.

173 + print("closing editview")

Is it right to print to console? Shouldn't this go to a log file?

576 + //wait(500)

That commented code can be removed.

581 + wait(500)
582 + //waitForRendering(mainView)

Can we use the waitForRendering instead of the hardcoded sleep?
If not, please remove the commented statement, and add a comment on the sleep so others reading the code understand why it was added.

596 + var x = mainView.width / 2;
[...]
601 + mouseRelease(mainView, x, startY + dY)

It would be nice to wrap this into a function with a nice name.

610 + // clear the textField
611 + mouseClick(titleTextField, titleTextField.width - units.gu(1), titleTextField.height / 2);
612 + compare(titleTextField.text, "");

If this is a normal textfield from the SDK, then clearing has already been tested. I would make the test shorter by just doing titleTextField.text = "".

639 + var x = delegate.width / 2
[...]
646 + mouseClick(delegate, units.gu(3), y)

It's hard to understand what this is doing. Please make a function for it too.

669 + // TODO: Is there a better way to click on toolbar actions?

They have an object name, don't they? That's how we click them in autopilot tests.

I love the three tests in NotesPage. Thank you very much. This looks great for me. I don't fully understand some of the cpp statements, but they look simple enough.

review: Needs Fixing

[Michael Zanetti (mzanetti)]

Thanks for the review, will fix the issues. It seems there's an issue with Jenkins though :/ Leo, can you help me out there? I found a bug which might be related to this: https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-snapshot/+bug/1389729

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

FAILED: Continuous integration, rev:297
http://91.189.93.70:8080/job/reminders-app-ci/730/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2401/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/332/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/152/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/730/rebuild

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

CI have a card for this which they're tracking.
https://trello.com/c/2f8qfYun/87-vanguard-reminders-app-ci-failures-due-to-https-bugs-launchpad-net-ubuntu-source-llvm-toolchain-snapshot-bug-1389729
No solution proposed though.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

#blocked on https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-snapshot/+bug/1389729

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

FAILED: Continuous integration, rev:297
http://91.189.93.70:8080/job/reminders-app-ci/775/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/197/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/775/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Text conflict in CMakeLists.txt
Text conflict in src/app/qml/Reminders.qml
Text conflict in src/app/qml/ui/EditNoteView.qml
3 conflicts encountered.
bzr: ERROR: Conflicts from merge

review: Needs Fixing

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

FAILED: Continuous integration, rev:298
http://91.189.93.70:8080/job/reminders-app-ci/776/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/198/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/776/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

This needs the vivid overlay ppa added to the job in order to pass. Working on it.

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

FAILED: Continuous integration, rev:298
http://91.189.93.70:8080/job/reminders-app-ci/777/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/199/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/777/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:298
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/19/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/93/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/19/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Bah, this should work now, but:

Merging 'lp:reminders-app' in to 'build_dir'.
Text conflict in src/app/qml/components/NoteHeader.qml
Text conflict in src/app/qml/components/SortingDialog.qml

[Michael Zanetti (mzanetti)]

> Bah, this should work now, but:
>
> Merging 'lp:reminders-app' in to 'build_dir'.
> Text conflict in src/app/qml/components/NoteHeader.qml
> Text conflict in src/app/qml/components/SortingDialog.qml

merged

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

FAILED: Continuous integration, rev:299
http://91.189.93.70:8080/job/reminders-app-ci/794/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/216/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/794/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:300
http://91.189.93.70:8080/job/reminders-app-ci/795/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/217/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/795/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Adding the dependency and rebuilding.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:298
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/20/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/103/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/20/rebuild

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:300
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/27/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/110/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/27/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Approving these :-)

[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/reminders-app-autolanding/469/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/191/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/4/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/110/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (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/reminders-app-autolanding/470/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/192/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/6/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/112/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (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/reminders-app-autolanding/471/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/193/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/8/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/114/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:300
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/28/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/112/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/28/rebuild

review: Approve (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/reminders-app-autolanding/472/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/194/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/12/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/118/console

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Stupid old bot stopping the merge . .. grr...

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (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/reminders-app-autolanding/473/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/195/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/15/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/121/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (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/reminders-app-autolanding/474/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/196/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/19/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/126/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/19/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/127/console
    FAILURE: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/126/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/19/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/128/console
    FAILURE: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/127/console
    FAILURE: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/126/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (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/reminders-app-autolanding/475/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-autolanding/197/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://core-apps-jenkins.ubuntu.com/job/reminders-app-autolanding/21/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/131/console

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:300
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/29/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/119/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/29/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

This is merged already...

DEBUG: Merging lp:~mzanetti/reminders-app/qmltest2 to lp:reminders-app
Traceback (most recent call last):
  File "/usr/bin/autoland", line 9, in <module>
    load_entry_point('jenkins-launchpad-plugin==0.1', 'console_scripts', 'autoland')()
  File "/usr/lib/python2.7/dist-packages/jlp/commands/autoland.py", line 262, in autoland
    ret = merge_and_commit(mp, args)
  File "/usr/lib/python2.7/dist-packages/jlp/commands/autoland.py", line 101, in merge_and_commit
    target.merge(source, str(mp.reviewed_revid))
  File "/usr/lib/python2.7/dist-packages/tarmac/branch.py", line 118, in merge
    branch.bzr_branch, to_revision=revid)
  File "<string>", line 4, in merge_from_branch_write_locked
  File "/usr/lib/python2.7/dist-packages/bzrlib/workingtree.py", line 807, in merge_from_branch
    raise errors.PointlessMerge
bzrlib.errors.PointlessMerge: Nothing to merge.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-09-08 18:10:48 +0000
+++ CMakeLists.txt	2015-11-02 21:42:17 +0000
@@ -12,6 +12,9 @@
 
 option(INSTALL_TESTS "Install the tests on make install" on)
 option(CLICK_MODE "Installs to a contained location" on)
+option(USE_XVFB "Use XVFB to run qml tests" on)
+
+enable_testing()
 
 set(APP_NAME reminders)
 set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
@@ -112,9 +115,6 @@
 configure_file(${APPLICATION_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_FILE})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_FILE} DESTINATION ${APPLICATION_DIR})
 
-# Tests
-enable_testing()
-
 add_subdirectory(po)
 add_subdirectory(tests)
 add_subdirectory(3rdParty)

=== modified file 'debian/control'
--- debian/control	2015-03-20 11:16:35 +0000
+++ debian/control	2015-11-02 21:42:17 +0000
@@ -10,9 +10,20 @@
                libssl-dev,
                pkg-config,
                python3-all,
+               qml-module-qttest,
+               qml-module-qt-labs-settings,
+               qml-module-ubuntu-connectivity,
                qt5-default,
+               qtdeclarative5-accounts-plugin,
                qtdeclarative5-dev,
-               qtpim5-dev
+               qtdeclarative5-dev-tools,
+               qtdeclarative5-online-accounts-client0.1 (>= 0.3+14.10.20140506),
+               qtdeclarative5-quicklayouts-plugin,
+               qtdeclarative5-ubuntu-content1,
+               qtdeclarative5-ubuntu-push-plugin,
+               qtdeclarative5-ubuntu-ui-toolkit-plugin,
+               xvfb,
+               qtpim5-dev,
 Standards-Version: 3.9.5
 Section: misc
 Homepage: https://launchpad.net/reminders-app
@@ -21,6 +32,7 @@
 Package: reminders-app
 Architecture: any
 Depends: account-plugin-evernote,
+         liboxideqt-qmlplugin,
          qml-module-ubuntu-connectivity,
          qtdeclarative5-accounts-plugin,
          qtdeclarative5-evernote0.1,

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2014-11-10 00:54:16 +0000
+++ src/app/CMakeLists.txt	2015-11-02 21:42:17 +0000
@@ -2,7 +2,6 @@
 
 set(reminders_SRCS
     main.cpp
-    formattinghelper.cpp
     preferences.cpp
     ${QML_SRCS}
 )

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2015-03-08 18:52:46 +0000
+++ src/app/main.cpp	2015-11-02 21:42:17 +0000
@@ -21,7 +21,6 @@
  */
 
 #include "preferences.h"
-#include "formattinghelper.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtQuick/QQuickView>
@@ -156,11 +155,8 @@
     Preferences preferences;
     view.engine()->rootContext()->setContextProperty("preferences", &preferences);
 
-    // Register FormattingHelper
-    qmlRegisterType<FormattingHelper>("reminders", 1, 0, "FormattingHelper");
-
     QString qmlfile;
-    const QString filePath = QLatin1String("qml/reminders.qml");
+    const QString filePath = QLatin1String("qml/Reminders.qml");
     QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation);
     paths.prepend(QDir::currentPath());
     paths.prepend(QCoreApplication::applicationDirPath());

=== renamed file 'src/app/qml/reminders.qml' => 'src/app/qml/Reminders.qml'
--- src/app/qml/reminders.qml	2015-09-15 14:50:55 +0000
+++ src/app/qml/Reminders.qml	2015-11-02 21:42:17 +0000
@@ -190,8 +190,6 @@
             if (pagestack.depth > 1) {
                 pagestack.pop();
             }
-            var page = pagestack.push(Qt.resolvedUrl("ui/EditNotePage.qml"), {note: note});
-            page.exitEditMode.connect(function() {Qt.inputMethod.hide(); pagestack.pop()});
         } else {
             sideViewLoader.clear();
             var view = sideViewLoader.embed(Qt.resolvedUrl("ui/EditNoteView.qml"))

=== modified file 'src/app/qml/components/SortingDialog.qml'
--- src/app/qml/components/SortingDialog.qml	2015-09-15 14:50:55 +0000
+++ src/app/qml/components/SortingDialog.qml	2015-11-02 21:42:17 +0000
@@ -33,7 +33,9 @@
                     i18n.tr("Title (ascending)"),
                     i18n.tr("Title (descending)")
                 ]
-
+                delegate: OptionSelectorDelegate {
+                    objectName: "sortingOption" + index
+                }
                 onDelegateClicked: {
                     root.sortOrder = index
                     root.accepted();
@@ -43,4 +45,3 @@
         }
     }
 }
-

=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml	2015-09-15 14:50:55 +0000
+++ src/app/qml/ui/EditNoteView.qml	2015-11-02 21:42:17 +0000
@@ -24,7 +24,6 @@
 import Ubuntu.Content 0.1
 import Ubuntu.Components.Themes.Ambiance 1.3
 import Evernote 0.1
-import reminders 1.0
 import "../components"
 
 Item {
@@ -170,6 +169,7 @@
 
                      TextArea {
                          id: noteTextArea
+                         objectName: "noteTextArea"
                          width: flick.width
 //                         height: Math.max(flick.height - header.height, paintedHeight + units.gu(2))
                          autoSize: true

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2015-09-15 14:50:55 +0000
+++ src/app/qml/ui/NotesPage.qml	2015-11-02 21:42:17 +0000
@@ -27,6 +27,7 @@
 
 PageWithBottomEdge {
     id: root
+    objectName: "notesPage"
 
     property var selectedNote: null
     property bool readOnly: false
@@ -158,6 +159,7 @@
         }
 
         delegate: NotesDelegate {
+            objectName: "notesDelegate" + index
             title: model.title
             date: notes.sortOrder == Notes.SortOrderUpdatedOldest || notes.sortOrder == Notes.SortOrderUpdatedNewest ?
                       model.updated : model.created

=== modified file 'src/libqtevernote/notes.cpp'
--- src/libqtevernote/notes.cpp	2015-03-15 20:00:21 +0000
+++ src/libqtevernote/notes.cpp	2015-11-02 21:42:17 +0000
@@ -229,12 +229,24 @@
 
 bool Notes::lessThan(const QModelIndex &left, const QModelIndex &right) const
 {
-    QVariant leftValue = sourceModel()->data(left, sortRole()).toString();
-    QVariant rightValue = sourceModel()->data(right, sortRole()).toString();
+    QVariant leftValue = sourceModel()->data(left, sortRole());
+    QVariant rightValue = sourceModel()->data(right, sortRole());
 
-    if (leftValue == rightValue) {
-        return sourceModel()->data(left, NotesStore::RoleTitle).toString() < sourceModel()->data(right, NotesStore::RoleTitle).toString();
+    switch (m_sortOrder) {
+    case SortOrderDateCreatedNewest:
+    case SortOrderDateCreatedOldest:
+    case SortOrderDateUpdatedNewest:
+    case SortOrderDateUpdatedOldest:
+        if (leftValue.toDateTime().toMSecsSinceEpoch() < rightValue.toDateTime().toMSecsSinceEpoch()) {
+            return true;
+        } else if (leftValue.toDateTime().toMSecsSinceEpoch() > rightValue.toDateTime().toMSecsSinceEpoch()) {
+            return false;
+        }
+        break;
+    case SortOrderTitleAscending:
+    case SortOrderTitleDescending:
+        // fall trough
+        break;
     }
-
-    return leftValue < rightValue;
+    return leftValue.toString() < rightValue.toString();
 }

=== modified file 'src/libqtevernote/notesstore.cpp'
--- src/libqtevernote/notesstore.cpp	2015-07-05 19:25:39 +0000
+++ src/libqtevernote/notesstore.cpp	2015-11-02 21:42:17 +0000
@@ -258,6 +258,11 @@
     return m_notes;
 }
 
+Note *NotesStore::note(int index) const
+{
+    return m_notes.at(index);
+}
+
 Note *NotesStore::note(const QString &guid)
 {
     return m_notesHash.value(guid);
@@ -268,6 +273,11 @@
     return m_notebooks;
 }
 
+Notebook *NotesStore::notebook(int index) const
+{
+    return m_notebooks.at(index);
+}
+
 Notebook *NotesStore::notebook(const QString &guid)
 {
     return m_notebooksHash.value(guid);

=== modified file 'src/libqtevernote/notesstore.h'
--- src/libqtevernote/notesstore.h	2015-06-21 16:28:58 +0000
+++ src/libqtevernote/notesstore.h	2015-11-02 21:42:17 +0000
@@ -119,6 +119,7 @@
     QHash<int, QByteArray> roleNames() const;
 
     QList<Note*> notes() const;
+    Q_INVOKABLE Note* note(int index) const;
 
     Q_INVOKABLE Note* note(const QString &guid);
     Q_INVOKABLE Note* createNote(const QString &title, const QString &notebookGuid = QString(), const QString &richTextContent = QString());
@@ -129,6 +130,7 @@
     Q_INVOKABLE void clearSearchResults();
 
     QList<Notebook*> notebooks() const;
+    Q_INVOKABLE Notebook* notebook(int index) const;
     Q_INVOKABLE Notebook* notebook(const QString &guid);
     Q_INVOKABLE void createNotebook(const QString &name);
     Q_INVOKABLE void saveNotebook(const QString &guid);

=== modified file 'src/plugin/CMakeLists.txt'
--- src/plugin/CMakeLists.txt	2014-10-23 21:27:46 +0000
+++ src/plugin/CMakeLists.txt	2015-11-02 21:42:17 +0000
@@ -1,1 +1,3 @@
+project(plugin)
+
 add_subdirectory(Evernote)

=== modified file 'src/plugin/Evernote/CMakeLists.txt'
--- src/plugin/Evernote/CMakeLists.txt	2014-10-23 21:27:46 +0000
+++ src/plugin/Evernote/CMakeLists.txt	2015-11-02 21:42:17 +0000
@@ -9,6 +9,7 @@
 
 set(evernoteplugin_SRCS
     evernoteplugin.cpp
+    formattinghelper.cpp
 )
 
 add_library(evernoteplugin MODULE
@@ -30,4 +31,3 @@
 # Install plugin file
 install(TARGETS evernoteplugin DESTINATION ${QT_IMPORTS_DIR}/Evernote/)
 install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/Evernote/)
-

=== modified file 'src/plugin/Evernote/evernoteplugin.cpp'
--- src/plugin/Evernote/evernoteplugin.cpp	2015-03-06 00:42:42 +0000
+++ src/plugin/Evernote/evernoteplugin.cpp	2015-11-02 21:42:17 +0000
@@ -19,6 +19,7 @@
  */
 
 #include "evernoteplugin.h"
+#include "formattinghelper.h"
 
 #include "evernoteconnection.h"
 #include "userstore.h"
@@ -62,6 +63,10 @@
     qmlRegisterUncreatableType<Notebook>(uri, 0, 1, "Notebook", "Cannot create Notes in QML. Use NotesStore.createNotebook() instead.");
     qmlRegisterUncreatableType<Tag>(uri, 0, 1, "Tag", "Cannot create Tags in QML. Use NotesStore.createTag() instead.");
     qmlRegisterUncreatableType<Resource>(uri, 0, 1, "Resource", "Cannot create Resources. Use Note.attachFile() instead.");
+
+    // Register FormattingHelper
+    qmlRegisterType<FormattingHelper>(uri, 0, 1, "FormattingHelper");
+
 }
 
 void EvernotePlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== renamed file 'src/app/formattinghelper.cpp' => 'src/plugin/Evernote/formattinghelper.cpp'
=== renamed file 'src/app/formattinghelper.h' => 'src/plugin/Evernote/formattinghelper.h'
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-01-19 13:59:12 +0000
+++ tests/CMakeLists.txt	2015-11-02 21:42:17 +0000
@@ -1,1 +1,3 @@
+add_subdirectory(qml)
+
 add_subdirectory(autopilot)

=== added directory 'tests/qml'
=== added file 'tests/qml/CMakeLists.txt'
--- tests/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qml/CMakeLists.txt	2015-11-02 21:42:17 +0000
@@ -0,0 +1,48 @@
+find_program(QMLTESTRUNNER_BIN
+    NAMES qmltestrunner
+    PATHS /usr/lib/*/qt5/bin
+    NO_DEFAULT_PATH
+)
+
+find_program(XVFB_RUN_BIN
+    NAMES xvfb-run
+)
+
+set(QML_TST_FILES "")
+
+macro(DECLARE_QML_TEST TST_NAME TST_QML_FILE)
+    set(qmltest_command
+        ${QMLTESTRUNNER_BIN} -import ${CMAKE_BINARY_DIR}/src/plugin -input ${CMAKE_CURRENT_SOURCE_DIR}/${TST_QML_FILE}
+    )
+
+    if(USE_XVFB)
+        set(COMMAND_PREFIX ${XVFB_RUN_BIN} -a -s "-screen 0 1024x768x24")
+        add_custom_target(xvfbTest${TST_NAME} ${COMMAND_PREFIX} ${qmltest_command})
+    else()
+        set(COMMAND_PREFIX "")
+    endif()
+    add_custom_target(test${TST_NAME} ${qmltest_command})
+
+    add_test(NAME ${TST_NAME}
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMAND ${COMMAND_PREFIX} ${qmltest_command}
+    )
+
+    set(QML_TST_FILES ${QML_TST_FILES} ${TST_QML_FILE})
+endmacro()
+
+if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
+
+    # Add new tests here
+    declare_qml_test("NotebooksDelegate" tst_NotebooksDelegate.qml)
+    declare_qml_test("NotesPage" tst_NotesPage.qml)
+
+else()
+    if (NOT QMLTESTRUNNER_BIN)
+        message(WARNING "Qml tests disabled: qmltestrunner not found")
+    else()
+        message(WARNING "Qml tests disabled: xvfb-run not found")
+    endif()
+endif()
+
+add_custom_target(tst_QmlFiles ALL SOURCES ${QML_TST_FILES})

=== added file 'tests/qml/tst_NotebooksDelegate.qml'
--- tests/qml/tst_NotebooksDelegate.qml	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_NotebooksDelegate.qml	2015-11-02 21:42:17 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright: 2014 Canonical, Ltd
+ *
+ * This file is part of reminders
+ *
+ * reminders 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.
+ *
+ * reminders 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.2
+import QtTest 1.0
+import Ubuntu.Components 1.1
+import Ubuntu.Test 0.1
+
+import '../../src/app/qml/components'
+
+Item {
+    id: root
+
+    width: units.gu(40)
+    height: units.gu(60)
+
+    ListModel {
+        id: notebooks
+
+       ListElement {
+            objectName: 'privateNote'
+            guid: 'dummy'
+            name: 'dummy'
+            lastUpdatedString: 'dummy'
+            published: false
+            noteCount: 'dummy'
+        }
+
+        ListElement {
+            objectName: 'sharedNote'
+            guid: 'dummy'
+            name: 'dummy'
+            lastUpdatedString: 'dummy'
+            published: true
+            noteCount: 'dummy'
+        }
+    }
+
+    ListView {
+        id: notebooksListView
+        anchors.fill: parent
+
+        model: notebooks
+
+        delegate: NotebooksDelegate {
+            objectName: model.objectName
+        }
+    }
+
+    UbuntuTestCase {
+        id: notebooksDelegateTestCase
+        name: 'notebooksDelegateTestCase'
+
+        when: windowShown
+
+        function init() {
+        }
+
+        function test_unpublishedNotebookMustDisplayPrivateLabel() {
+            var privateNote = findChild(notebooksListView, 'privateNote')
+            var publishedLabel = findChild(
+                privateNote, 'notebookPublishedLabel')
+
+            compare(publishedLabel.text, 'Private')
+            compare(publishedLabel.color, '#b3b3b3')
+            compare(publishedLabel.font.bold, false)
+        }
+
+        function test_publishedNotebookMustDisplaySharedLabel() {
+            var privateNote = findChild(notebooksListView, 'sharedNote')
+            var publishedLabel = findChild(
+                privateNote, 'notebookPublishedLabel')
+
+            compare(publishedLabel.text, 'Shared')
+            compare(publishedLabel.color, '#000000')
+            compare(publishedLabel.font.bold, true)
+        }
+    }
+
+}

=== added file 'tests/qml/tst_NotesPage.qml'
--- tests/qml/tst_NotesPage.qml	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_NotesPage.qml	2015-11-02 21:42:17 +0000
@@ -0,0 +1,181 @@
+/*
+ * Copyright: 2014 Canonical, Ltd
+ *
+ * This file is part of reminders
+ *
+ * reminders 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.
+ *
+ * reminders 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.2
+import QtTest 1.0
+import Ubuntu.Components 1.1
+import Ubuntu.Test 0.1
+import Evernote 0.1
+
+import '../../src/app/qml/components'
+import '../../src/app/qml/'
+
+Item {
+    id: root
+
+    width: units.gu(40)
+    height: units.gu(60)
+
+    QtObject {
+        id: preferences
+
+        property string accountName: "@local"
+        property int sortOrder: 0
+
+        function colorForNotebook(notebookguid) {
+            return "black";
+        }
+    }
+
+    Reminders {
+        id: mainView
+        anchors.fill: parent
+
+        applicationName: "com.ubuntu.reminders_test"
+
+        property bool useSandbox: false
+        property bool tablet: false
+        property bool phone: true
+    }
+
+    UbuntuTestCase {
+        id: notebooksDelegateTestCase
+        name: 'notebooksDelegateTestCase'
+        when: windowShown
+
+        function init() {
+            tryCompare(NotesStore, "username", "@local")
+            while (NotesStore.count > 0) {
+                NotesStore.deleteNote(NotesStore.note(0).guid)
+            }
+        }
+
+        function cleanupTestCase() {
+            while (NotesStore.count > 0) {
+                NotesStore.deleteNote(NotesStore.note(0).guid)
+            }
+            //wait(500)
+            waitForRendering(mainView)
+        }
+
+        function initTestCase() {
+            wait(500)
+            //waitForRendering(mainView)
+        }
+
+        function createNote(title) {
+            var note = NotesStore.createNote(title);
+            waitForRendering(mainView);
+            var saveButton = findChild(mainView, "saveButton");
+            mouseClick(saveButton, 1, 1);
+            waitForRendering(mainView);
+            return note;
+        }
+
+        function test_createNoteFromBottomEdge() {
+
+            var x = mainView.width / 2;
+            var startY = mainView.height - 1;
+            var dY = -mainView.height * 3 / 4;
+            mousePress(mainView, x, startY)
+            mouseMoveSlowly(mainView, x, startY, 0, dY, 10, 10)
+            mouseRelease(mainView, x, startY + dY)
+
+            tryCompare(NotesStore, "count", 1);
+            waitForRendering(mainView);
+
+            var noteTextArea = findChild(mainView, "noteTextArea");
+            var titleTextField = findChild(mainView, "titleTextField");
+
+            mouseClick(titleTextField, 1, 1);
+            // clear the textField
+            mouseClick(titleTextField, titleTextField.width - units.gu(1), titleTextField.height / 2);
+            compare(titleTextField.text, "");
+
+            typeString("testnote1");
+
+            mouseClick(noteTextArea, 1, 1)
+
+            typeString("This is a note for testing");
+
+            var saveButton = findChild(mainView, "saveButton");
+            mouseClick(saveButton, 1, 1);
+
+            // Wait for bottom edge to close
+            var notesPage = findChild(mainView, "notesPage")
+            tryCompare(notesPage, "bottomEdgeContentShown", false);
+            waitForRendering(mainView)
+
+            var newNote = NotesStore.note(0);
+            compare(newNote.title, "testnote1");
+            compare(newNote.plaintextContent, "This is a note for testing");
+        }
+
+        function test_deleteNoteFromListItemAction() {
+            createNote("testNote1")
+            waitForRendering(mainView);
+
+            var delegate = findChild(mainView, "notesDelegate0");
+
+            var x = delegate.width / 2
+            var y = delegate.height / 2
+            var dx = delegate.width / 2
+            mousePress(delegate, 1, 1)
+            mouseMoveSlowly(delegate, x, y, dx, 0, 10, 20)
+            mouseRelease(delegate, x + dx, y)
+            waitForRendering(mainView)
+            mouseClick(delegate, units.gu(3), y)
+            tryCompare(NotesStore, "count", 0);
+        }
+
+        function test_sorting_data() {
+            return [
+                { tag: "Date created (newest first)", sortingOption: 0, sortOrder: [3, 2, 1] },
+                { tag: "Date created (oldest first)", sortingOption: 1, sortOrder: [1, 2, 3] },
+                { tag: "Date updated (newest first)", sortingOption: 2, sortOrder: [2, 3, 1] },
+                { tag: "Date updated (oldest first)", sortingOption: 3, sortOrder: [1, 3, 2] },
+                { tag: "Title (ascending)", sortingOption: 4, sortOrder: [1, 2, 3] },
+                { tag: "Title (descending)", sortingOption: 5, sortOrder: [3, 2, 1] }
+            ];
+        }
+
+        function test_sorting(data) {
+            var note1 = createNote("testNote1");
+            var note2 = createNote("testNote2");
+            var note3 = createNote("testNote3");
+
+            note2.reminder = true;
+            NotesStore.saveNote(note2.guid);
+
+            // TODO: Is there a better way to click on toolbar actions?
+            mouseClick(mainView, mainView.width - units.gu(10), units.gu(4))
+
+            waitForRendering(mainView);
+
+            var sortOption = findChild(root, "sortingOption" + data.sortingOption);
+            mouseClick(sortOption, 1, 1);
+
+            waitForRendering(root);
+
+            for (var i = 0; i < data.sortOrder.length; i++) {
+                var delegate = findChild(mainView, "notesDelegate" + i);
+                compare(delegate.title, "testNote" + data.sortOrder[i]);
+            }
+        }
+    }
+}