Merge lp:~canonical-platform-qa/messaging-app/qmltests1 into lp:messaging-app

[Leo Arias]

Added a suite of simple QML tests.

Are there any related MPs required for this MP to build/function as expected? No related MPs.

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes.

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
More or less. I ran the new tests many times, in many ways.

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Not changing any functionality, so no need to run the manual tests.

If you changed the UI, was the change specified/approved by design?
No UI changes.

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
Yes, I added them.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/298/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2340
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1922
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/92
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2522
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3552
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3552/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10244
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1611
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2152
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2152/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/298/rebuild

review: Needs Fixing (continuous-integration)

[Chris Gagnon (chris.gagnon)]

I confirmed that the test runs at build time.

LGTM

review: Approve

[Leo Arias (elopio)]

The error is not related to this branch and will be fixed in Iftikhar's branch.

[lp:~canonical-platform-qa/messaging-app/qmltests1]

160. By Leo Arias on 2014-07-25

Merged with trunk.

161. By Leo Arias on 2014-07-25

Remove the arqs.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/308/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2477
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2005
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/102
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2634
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3720
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3720/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1677
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2257
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2257/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/308/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

why is that in the ubuntu sponsoring queue? that doesn't seem to be an Ubuntu targetted upload

[lp:~canonical-platform-qa/messaging-app/qmltests1]

162. By Leo Arias on 2014-07-28

Merged with trunk.

[Leo Arias (elopio)]

Sebastien, I added the core-devs as reviewers because that's part of the policy when we change the debian packaging. I'm not sure if that's what you are asking though.

[Michał Karnicki (karni)]

I changed the test to cause an expected failure (compare evaluates to false).
From tests/qml I ran:
$ cmake . && make
I see:
"Built target tst_QmlFiles" and no failures.

[Michał Karnicki (karni)]

From the root of the project, ran:
cmake .
make
make test

http://paste.ubuntu.com/7886872/

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:162
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/316/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2597
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/110
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2731
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3840
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3840/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2333
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2333/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/316/rebuild

review: Approve (continuous-integration)

[Leo Arias (elopio)]

karni was missing some dependencies. We confirmed that the tests fail if we change the expected result, and he could get them passing too.

bzr bd it's an easy way to confirm you have the dependencies and run the tests.

The only problem we have left is that it seems that the tests are slow. I'm not sure if that's the expected runtime of qmltests, or we can improve it somehow.

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-07-08 13:30:42 +0000
+++ debian/control	2014-07-28 17:05:10 +0000
@@ -8,10 +8,14 @@
                python-flake8,
                pkg-config,
                python3,
+               qml-module-qttest,
                qt5-default,
                qtbase5-dev (>= 5.0),
                qtdeclarative5-dev (>= 5.0),
+               qtdeclarative5-dev-tools,
+               qtdeclarative5-ubuntu-ui-toolkit-plugin,
                qtpim5-dev,
+               xvfb,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/messaging-app
 # If you aren't a member of ~phablet-team but need to upload packaging changes,

=== modified file 'src/qml/CMakeLists.txt'
--- src/qml/CMakeLists.txt	2014-05-05 16:56:56 +0000
+++ src/qml/CMakeLists.txt	2014-07-28 17:05:10 +0000
@@ -1,3 +1,5 @@
+project(qml)
+
 file(GLOB QML_JS_FILES *.qml *.js)
 
 set(QML_DIRS

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-07-10 17:59:04 +0000
+++ tests/CMakeLists.txt	2014-07-28 17:05:10 +0000
@@ -1,3 +1,5 @@
+add_subdirectory(qml)
+
 set(AUTOPILOT_DIR autopilot/messaging_app)
 
 execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"

=== 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-07-28 17:05:10 +0000
@@ -0,0 +1,31 @@
+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)
+    add_test(NAME ${TST_NAME}
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMAND ${XVFB_RUN_BIN} -a -s "-screen 0 1024x768x24" ${QMLTESTRUNNER_BIN} -import ${qml_BINARY_DIR} -input ${CMAKE_CURRENT_SOURCE_DIR}/${TST_QML_FILE}
+    )
+endmacro()
+
+if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
+    declare_qml_test("message_bubble" tst_MessageBubble.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_MessageBubble.qml
+)
+add_custom_target(tst_QmlFiles ALL SOURCES ${QML_TST_FILES})

=== added file 'tests/qml/tst_MessageBubble.qml'
--- tests/qml/tst_MessageBubble.qml	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_MessageBubble.qml	2014-07-28 17:05:10 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of messaging-app.
+ *
+ * messaging-app 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.
+ *
+ * messaging-app 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.Test 0.1
+
+import '../../src/qml/'
+
+Item {
+    id: root
+
+    width: units.gu(40)
+    height: units.gu(40)
+
+    MessageBubble {
+        id: incomingMessageBubble
+        objectName: 'incomingMessageBubble'
+
+        height: parent.height / 3
+
+        incoming: true
+    }
+
+    MessageBubble {
+        id: outgoingMessageBubble
+        objectName: 'outgoingMessageBubble'
+
+        anchors.top: incomingMessageBubble.bottom
+        height: parent.height / 3
+
+        incoming: false
+    }
+
+    MessageBubble {
+        id: changeIncomingMessageBubble
+        objectName: 'changeIncomingMessageBubble'
+
+        anchors.top: outgoingMessageBubble.bottom
+        height: parent.height / 3
+
+        incoming: true
+    }
+
+    UbuntuTestCase {
+        id: messageBubbleTestCase
+        name: 'messageBubbleTestCase'
+
+        when: windowShown
+
+        function init() {
+            waitForRendering(incomingMessageBubble);
+            waitForRendering(outgoingMessageBubble);
+            waitForRendering(changeIncomingMessageBubble);
+        }
+
+        function cleanup() {
+            changeIncomingMessageBubble.incoming = true;
+        }
+
+        function getFileName(filePath) {
+            return String(filePath).split('/').reverse()[0];
+        }
+
+        function test_incomingMessageBubbleMustUseIncomingSource() {
+            var incomingMessageBubble = findChild(
+                root, 'incomingMessageBubble');
+            compare(
+                getFileName(incomingMessageBubble.source),
+                'conversation_incoming.sci');
+        }
+
+        function test_outgoingMessageBubbleMustUseOutgoingSource() {
+            var outgoingMessageBubble = findChild(
+                root, 'outgoingMessageBubble');
+            compare(
+                getFileName(outgoingMessageBubble.source),
+                'conversation_outgoing.sci');
+        }
+
+        function test_changeIncomingMustUpdateSource() {
+            var changeIncomingMessageBubble = findChild(
+                root, 'changeIncomingMessageBubble');
+            changeIncomingMessageBubble.incoming = false;
+            compare(
+                getFileName(changeIncomingMessageBubble.source),
+                'conversation_outgoing.sci');
+        }
+    }
+}