Merge lp:~canonical-platform-qa/reminders-app/qmltest1 into lp:reminders-app

[Leo Arias]

Added an initial QML test.

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

FAILED: Continuous integration, rev:289
http://91.189.93.70:8080/job/reminders-app-ci/563/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1226/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/259/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:291
http://91.189.93.70:8080/job/reminders-app-ci/566/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1249/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/262/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:292
http://91.189.93.70:8080/job/reminders-app-ci/568/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1254/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/264/console

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

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

There's something wrong on the build. Working on that...

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

FAILED: Continuous integration, rev:293
http://91.189.93.70:8080/job/reminders-app-ci/572/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1361
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1361/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/268/console

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

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Leo, would you mind adding to the description of the MP:
- What this test is supposed to be testing
- What the recommended way to add QML tests is, so that we can have some guidelines for future tests

Thanks!

review: Needs Information

[Nekhelesh Ramananthan (nik90)]

Leo, you might consider adding a README file which explains to new contributors on how to run these qml tests. You can use clock app's readme at https://bazaar.launchpad.net/~ubuntu-clock-dev/ubuntu-clock-app/utopic-3.0/view/head:/README.unittest as reference if required.

[Michael Zanetti (mzanetti)]

one inline comment. looks good to me otherwise.

[Leo Arias (elopio)]

ACK. Back to work in progress. I'll try to assign some time for this next week. Thanks for the reviews.

[Michael Zanetti (mzanetti)]

Elopio, I took this and did some fixes and more tests on top of it. Mainly I wanted to set up an environment to test the full app in offline mode with qmltests. Seems to work quite nicely. If you have time, it'd be great to get a review.

https://code.launchpad.net/~mzanetti/reminders-app/qmltest2/+merge/253598

As the other branch contains this one, I'll remove this one from the queue.

Thanks

[Leo Arias (elopio)]

you rule.
I'll review it tomorrow. Thanks!

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-02 16:28:04 +0000
+++ CMakeLists.txt	2014-10-28 22:49:19 +0000
@@ -11,6 +11,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")
@@ -105,9 +108,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)

=== modified file 'debian/control'
--- debian/control	2014-10-02 16:28:04 +0000
+++ debian/control	2014-10-28 22:49:19 +0000
@@ -9,8 +9,13 @@
                libboost-dev,
                libssl-dev,
                python3-all,
+               qml-module-qttest,
                qt5-default,
-               qtdeclarative5-dev
+               qtdeclarative5-dev,
+               qtdeclarative5-dev-tools,
+               qtdeclarative5-quicklayouts-plugin,
+               qtdeclarative5-ubuntu-ui-toolkit-plugin,
+               xvfb,
 Standards-Version: 3.9.5
 Section: misc
 Homepage: https://launchpad.net/reminders-app

=== modified file 'src/plugin/CMakeLists.txt'
--- src/plugin/CMakeLists.txt	2013-12-18 00:30:17 +0000
+++ src/plugin/CMakeLists.txt	2014-10-28 22:49:19 +0000
@@ -1,3 +1,5 @@
+project(plugin)
+
 include(FindPkgConfig)
 find_package(Qt5Core)
 find_package(Qt5Qml)

=== modified file 'src/plugin/Evernote/CMakeLists.txt'
--- src/plugin/Evernote/CMakeLists.txt	2014-10-09 00:08:52 +0000
+++ src/plugin/Evernote/CMakeLists.txt	2014-10-28 22:49:19 +0000
@@ -59,4 +59,3 @@
 # Install plugin file
 install(TARGETS evernoteplugin DESTINATION ${QT_IMPORTS_DIR}/Evernote/)
 install(FILES qmldir DESTINATION ${QT_IMPORTS_DIR}/Evernote/)
-

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-01-19 13:59:12 +0000
+++ tests/CMakeLists.txt	2014-10-28 22:49:19 +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	2014-10-28 22:49:19 +0000
@@ -0,0 +1,36 @@
+find_program(QMLTESTRUNNER_BIN
+    NAMES qmltestrunner
+    PATHS /usr/lib/*/qt5/bin
+    NO_DEFAULT_PATH
+)
+
+find_program(XVFB_RUN_BIN
+    NAMES xvfb-run
+)
+
+macro(DECLARE_QML_TEST TST_NAME TST_QML_FILE)
+    if(USE_XVFB)
+        set(COMMAND_PREFIX ${XVFB_RUN_BIN} -a -s "-screen 0 1024x768x24")
+    else()
+        set(COMMAND_PREFIX "")
+    endif()
+    add_test(NAME ${TST_NAME}
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMAND ${COMMAND_PREFIX} ${QMLTESTRUNNER_BIN} -import ${CMAKE_BINARY_DIR}/src/plugin -input ${CMAKE_CURRENT_SOURCE_DIR}/${TST_QML_FILE}
+    )
+endmacro()
+
+if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
+    declare_qml_test("NotebooksDelegate" tst_notebooksDelegate.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()
+
+set(QML_TST_FILES
+    tst_notebooksDelegate.qml
+)
+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	2014-10-28 22:49:19 +0000
@@ -0,0 +1,96 @@
+/*
+ * 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() {
+            waitForRendering(notebooksListView)
+        }
+
+        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)
+        }
+    }
+
+}