gallery-app

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

qmltests1
Merge into trunk

Proposed by Leo Arias on 2014-09-20

Status:

Approved

Approved by:

Arthur Mello on 2014-09-30

Approved revision:

1069

Proposed branch:

lp:~canonical-platform-qa/gallery-app/qmltests1

Merge into:

lp:gallery-app

Diff against target:

205 lines (+121/-1)

8 files modified

CMakeLists.txt (+1/-0)
debian/control (+4/-0)
debian/rules (+0/-1)
rc/CMakeLists.txt (+2/-0)
rc/qml/Components/EventCard.qml (+2/-0)
tests/CMakeLists.txt (+1/-0)
tests/qml/CMakeLists.txt (+36/-0)
tests/qml/Components/tst_EventCard.qml (+75/-0)

To merge this branch:

bzr merge lp:~canonical-platform-qa/gallery-app/qmltests1

Related bugs:

Bug #1381260: Missing QML tests

Undecided

In Progress

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-09-30
Arthur Mello (community)		2014-09-24	Approve on 2014-09-29
Chris Gagnon (community)			Approve on 2014-09-29
Sebastien Bacher	the debian directory	2014-09-20	Approve on 2014-09-25
Review via email: mp+235390@code.launchpad.net

Commit message

Added the initial QML test suite.

Description of the change

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

No related MPs.

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

It is now.

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

No manual tests as I didn't change any functionality. But I ran the new suite many times in many different 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?

No manual tests needed.

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

No UI changes.

If you changed UI labels, did you update the pot file?

No labels changes.

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

Yes, it was reviewed by seb.

lp:~canonical-platform-qa/gallery-app/qmltests1 updated on 2014-09-20

1063. By Leo Arias on 2014-09-20: Added deps.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-20:

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

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/gallery-app/qmltests1 updated on 2014-09-20

1064. By Leo Arias on 2014-09-20: Override the dh_auto_test

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-20:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-20:

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

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/gallery-app/qmltests1 updated on 2014-09-24

1065. By Leo Arias on 2014-09-24: Merged with trunk.
1066. By Leo Arias on 2014-09-24: Removed the auto_test oerride.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-24:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-24:

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

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/gallery-app/qmltests1 updated on 2014-09-24

1067. By Leo Arias on 2014-09-24: Added the missing dependency.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-24:

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

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/gallery-app/qmltests1 updated on 2014-09-24

1068. By Leo Arias on 2014-09-24: Removed the minimal platform.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-24:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-09-25:

the packaging changes looks correct

review: Approve (the debian directory)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-09-25:

(can you remove ubuntu-core-dev from the reviewer so it stops being in the Ubuntu sponsoring queue?)

Revision history for this message

Leo Arias (elopio) wrote on 2014-09-25:

Yes. Thanks Sebastien.

Revision history for this message

Chris Gagnon (chris.gagnon) wrote on 2014-09-29:

The tests lgtm

review: Approve

Revision history for this message

Arthur Mello (artmello) wrote on 2014-09-29:

lgtm

review: Approve

lp:~canonical-platform-qa/gallery-app/qmltests1 updated on 2014-09-30

1069. By Leo Arias on 2014-09-30: Merged with trunk.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-30:

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

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/gallery-app/qmltests1 updated on 2014-10-10

1070. By Leo Arias on 2014-10-10: Merged with trunk.

Unmerged revisions

1070. By Leo Arias on 2014-10-10: Merged with trunk.
1069. By Leo Arias on 2014-09-30: Merged with trunk.
1068. By Leo Arias on 2014-09-24: Removed the minimal platform.
1067. By Leo Arias on 2014-09-24: Added the missing dependency.
1066. By Leo Arias on 2014-09-24: Removed the auto_test oerride.
1065. By Leo Arias on 2014-09-24: Merged with trunk.
1064. By Leo Arias on 2014-09-20: Override the dh_auto_test
1063. By Leo Arias on 2014-09-20: Added deps.
1062. By Leo Arias on 2014-09-20: Merged with trunk.
1061. By Leo Arias on 2014-09-20: Added the initial QML test suite.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Canonical Platform QA Team

Ubuntu Phablet Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2014-09-17 17:38:03 +0000
 +++ CMakeLists.txt	2014-10-10 16:43:41 +0000
@@ -53,6 +53,7 @@
  option(INSTALL_TESTS "Install the tests on make install" off)
  option(CLICK_MODE "Installs to a contained location" on)
++option(USE_XVFB "Use XVFB to run qml tests" on)
  set(GALLERY gallery-app)
  set(DESKTOP_FILE ${GALLERY}.desktop)
 === modified file 'debian/control'
 --- debian/control	2014-07-26 03:12:53 +0000
 +++ debian/control	2014-10-10 16:43:41 +0000
@@ -12,12 +12,16 @@
                 libgles2-mesa-dev,
                 libmediainfo-dev,
                 libqt5opengl5-dev,
++               qml-module-qttest,
                 qt5-default,
                 qtbase5-dev,
                 qtdeclarative5-dev,
++               qtdeclarative5-dev-tools,
++               qtdeclarative5-ubuntu-ui-toolkit-plugin,
                 python3-all,
  # for static linking of exiv2 in click mode
                 libexpat1-dev,
++               xvfb,
                 zlib1g-dev,
  Standards-Version: 3.9.5
  # If you don't have commit rights to lp:gallery-app but need to upload
 === modified file 'debian/rules'
 --- debian/rules	2014-09-09 08:14:03 +0000
 +++ debian/rules	2014-10-10 16:43:41 +0000
@@ -1,7 +1,6 @@
  #!/usr/bin/make -f
  export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
--export QT_QPA_PLATFORM = minimal
  %:
  	dh $@ --parallel --with translations
 === modified file 'rc/CMakeLists.txt'
 --- rc/CMakeLists.txt	2013-10-07 09:48:17 +0000
 +++ rc/CMakeLists.txt	2014-10-10 16:43:41 +0000
@@ -1,3 +1,5 @@
++project(rc)
++
  if(CLICK_MODE)
      set(GALLERY_RC_DIR rc)
  else(CLICK_MODE)
 === modified file 'rc/qml/Components/EventCard.qml'
 --- rc/qml/Components/EventCard.qml	2013-09-03 21:06:17 +0000
 +++ rc/qml/Components/EventCard.qml	2014-10-10 16:43:41 +0000
@@ -45,6 +45,7 @@
      Label {
          id: eventMonthYear
++        objectName: "eventMonthYear"
          y: units.gu(1.5)
          width: parent.width
@@ -60,6 +61,7 @@
      Label {
          id: eventDay
++        objectName: "eventDay"
          anchors.top: eventMonthYear.bottom
          width: parent.width
 === modified file 'tests/CMakeLists.txt'
 --- tests/CMakeLists.txt	2013-04-15 12:05:00 +0000
 +++ tests/CMakeLists.txt	2014-10-10 16:43:41 +0000
@@ -1,2 +1,3 @@
  add_subdirectory(autopilot)
++add_subdirectory(qml)
  add_subdirectory(unittests)
 === 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-10 16:43:41 +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 ${rc_BINARY_DIR} -input ${CMAKE_CURRENT_SOURCE_DIR}/${TST_QML_FILE}
++    )
++endmacro()
++
++if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
++    declare_qml_test("EventCard" Components/tst_EventCard.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
++    Components/tst_EventCard.qml
++)
++add_custom_target(tst_QmlFiles ALL SOURCES ${QML_TST_FILES})
 === added directory 'tests/qml/Components'
 === added file 'tests/qml/Components/tst_EventCard.qml'
 --- tests/qml/Components/tst_EventCard.qml	1970-01-01 00:00:00 +0000
 +++ tests/qml/Components/tst_EventCard.qml	2014-10-10 16:43:41 +0000
@@ -0,0 +1,75 @@
++/*
++ * Copyright (C) 2014 Canonical Ltd
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program 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 0.1
++import Ubuntu.Test 0.1
++
++import '../../../rc/qml/Components'
++
++Item {
++    id: root
++
++    width: units.gu(40)
++    height: units.gu(60)
++
++    EventCard {
++        id: eventCardWithoutEvent
++
++        height: parent.height / 2
++    }
++
++    EventCard {
++        id: eventCardWithEvent
++
++        height: parent.height / 2
++        anchors.top: eventCardWithoutEvent.bottom
++
++        event: {'date': new Date(2014, 08, 20)}
++    }
++
++    UbuntuTestCase {
++        id: eventCardTestCase
++        name: 'eventCardTestCase'
++
++        when: windowShown
++
++        function init() {
++            waitForRendering(eventCardWithoutEvent);
++            waitForRendering(eventCardWithEvent);
++        }
++
++        function test_eventCardLabelsWithoutEventMustBeEmpty() {
++            var eventMonthYear = findChild(
++                eventCardWithoutEvent, 'eventMonthYear');
++            compare(eventMonthYear.text, '');
++            var eventDay = findChild(eventCardWithoutEvent, 'eventDay');
++            compare(eventDay.text, '');
++        }
++
++        function test_eventCardLabelsWithEventMustDisplayDate() {
++            var eventMonthYear = findChild(
++                eventCardWithEvent, 'eventMonthYear');
++            compare(eventMonthYear.text, 'Sep 2014');
++            var eventDay = findChild(eventCardWithEvent, 'eventDay');
++            compare(eventDay.text, '20');
++
++        }
++
++    }
++
++}