Unity 8

Merge lp:~unity-team/unity8/autopkgtests into lp:unity8

  1. autopkgtests
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Superseded
Proposed branch: lp:~unity-team/unity8/autopkgtests
Merge into: lp:unity8
Prerequisite: lp:~unity-team/unity8/refactor-qmltests
Diff against target: 588 lines (+101/-55)
36 files modified
CMakeLists.txt (+2/-1)
cmake/modules/QmlTest.cmake (+1/-0)
debian/control (+1/-0)
debian/tests/control (+4/-0)
debian/tests/qmluitests.sh (+17/-0)
plugins/Wizard/System.cpp (+11/-3)
plugins/Wizard/System.h (+3/-0)
tests/CMakeLists.txt (+9/-3)
tests/mocks/Ubuntu/CMakeLists.txt (+1/-0)
tests/mocks/Ubuntu/Web/CMakeLists.txt (+1/-0)
tests/mocks/Ubuntu/Web/WebView.qml (+25/-0)
tests/mocks/Ubuntu/Web/qmldir (+4/-0)
tests/mocks/Unity/Application/CMakeLists.txt (+1/-0)
tests/mocks/Unity/Application/MirSurfaceItem.cpp (+2/-10)
tests/mocks/Unity/Application/MirSurfaceItem.h (+1/-1)
tests/mocks/Unity/Application/VirtualKeyboard.cpp (+2/-4)
tests/mocks/Unity/Application/resources/surfaces.qrc (+7/-0)
tests/plugins/Dash/CMakeLists.txt (+0/-1)
tests/plugins/Dash/cardcreatortest.cpp (+0/-1)
tests/plugins/Dash/horizontaljournaltest.cpp (+0/-1)
tests/plugins/Dash/horizontaljournaltry.cpp (+0/-1)
tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp (+0/-1)
tests/plugins/Dash/listviewwithpageheadersectiontest.cpp (+0/-1)
tests/plugins/Dash/listviewwithpageheadertest.cpp (+0/-1)
tests/plugins/Dash/organicgridtest.cpp (+0/-1)
tests/plugins/Dash/organicgridtry.cpp (+0/-1)
tests/plugins/Dash/verticaljournaltest.cpp (+0/-1)
tests/plugins/Dash/verticaljournaltry.cpp (+0/-1)
tests/plugins/LightDM/CMakeLists.txt (+1/-1)
tests/plugins/Ubuntu/Gestures/CMakeLists.txt (+3/-7)
tests/plugins/Ubuntu/Gestures/GestureTest.cpp (+0/-2)
tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp (+0/-1)
tests/qmltests/Components/CMakeLists.txt (+1/-4)
tests/qmltests/Components/tst_DragHandle.cpp (+0/-2)
tests/qmltests/Components/tst_EdgeDragEvaluator.cpp (+0/-1)
tests/qmltests/Stages/tst_ApplicationWindow.qml (+4/-4)
To merge this branch: bzr merge lp:~unity-team/unity8/autopkgtests
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michael Zanetti (community) Needs Information
Albert Astals Cid (community) now there's code of mine Abstain
Martin Pitt Pending
Ubuntu Unity PS integration team Pending
Review via email: mp+258027@code.launchpad.net

This proposal has been superseded by a proposal from 2015-07-09.

Commit message

Add DEP-8 test for all our UI and unit tests

Some refactoring was needed:
- added a basic Ubuntu.Web mock
- made plugin path an environment, not a compiled-in bit
- moved Unity.Application resources into .qrc

Description of the change

This will conflict with
https://code.launchpad.net/~canonical-platform-qa/unity8/1421009-hangs-on-boot/+merge/257408

I verified this with:
$ DEB_BUILD_OPTIONS="parallel=5 nocheck" adt-run --unbuilt-tree . \
  -o output -s --- schroot vivid-amd64

This assumes that you have a vivid-amd64 schroot.

* Are there any related MPs required for this MP to build/function as expected? Please list.
prereq
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * Did you make sure that your branch does not contain spurious tags?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Y
 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
lp:~unity-team/unity8/autopkgtests updated
1775. By Michał Sawicz

Only monitor wizard file if exists

1776. By Michał Sawicz

Merge qmltest-refactor

1777. By Michał Sawicz

Add copyright

1778. By Michał Sawicz

Don't redirect stderr after all

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1773
http://jenkins.qa.ubuntu.com/job/unity8-ci/5663/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2596/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/828/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/828/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/828/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2594/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5663/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1778
http://jenkins.qa.ubuntu.com/job/unity8-ci/5666/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2599/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/831
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/831
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/831
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2253/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2597
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2597/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20138

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5666/rebuild

review: Needs Fixing (continuous-integration)
lp:~unity-team/unity8/autopkgtests updated
1779. By Michał Sawicz

Output on failure

1780. By Michał Sawicz

Only run specially declared tests

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1780
http://jenkins.qa.ubuntu.com/job/unity8-ci/5669/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2608
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/834
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/834
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/834
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2606
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2606/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20144

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5669/rebuild

review: Needs Fixing (continuous-integration)
lp:~unity-team/unity8/autopkgtests updated
1781. By Michał Sawicz

No ctest here after all

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1781
http://jenkins.qa.ubuntu.com/job/unity8-ci/5670/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2617
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/835
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/835
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/835
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2615
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2615/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20153

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5670/rebuild

review: Needs Fixing (continuous-integration)
lp:~unity-team/unity8/autopkgtests updated
1782. By Michał Sawicz

Merge qmltest-refactor

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1782
http://jenkins.qa.ubuntu.com/job/unity8-ci/5684/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2666
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/849
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/849
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/849
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2307
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2664
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2664/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20269

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5684/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Text conflict in runtests.sh
Text conflict in tests/plugins/Ubuntu/Gestures/CMakeLists.txt
Text conflict in tests/plugins/Ubuntu/Gestures/GestureTest.cpp
Text conflict in tests/qmltests/Components/CMakeLists.txt
4 conflicts encountered.

review: Needs Fixing
lp:~unity-team/unity8/autopkgtests updated
1783. By Albert Astals Cid

Merge refactor-qmltests

1784. By Albert Astals Cid

This should not be changed

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1784
http://jenkins.qa.ubuntu.com/job/unity8-ci/5744/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/22
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/23
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20631

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5744/rebuild

review: Needs Fixing (continuous-integration)
lp:~unity-team/unity8/autopkgtests updated
1785. By Albert Astals Cid

Merge refactor-qmltests

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1785
http://jenkins.qa.ubuntu.com/job/unity8-ci/5755/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/33
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/34
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20698

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5755/rebuild

review: Needs Fixing (continuous-integration)
lp:~unity-team/unity8/autopkgtests updated
1786. By Albert Astals Cid

Make test pass under chroot+adt-run

1787. By Albert Astals Cid

Make sure ${CMAKE_CURRENT_BINARY_DIR} exists

1788. By Albert Astals Cid

use installed path and not builddir

Revision history for this message
Albert Astals Cid (aacid) :
review: Abstain (now there's code of mine)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1788
http://jenkins.qa.ubuntu.com/job/unity8-ci/5762/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/41
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20721

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5762/rebuild

review: Approve (continuous-integration)
lp:~unity-team/unity8/autopkgtests updated
1789. By Albert Astals Cid

Merge lp:~unity-team/unity8/refactor-qmltests

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1789
http://jenkins.qa.ubuntu.com/job/unity8-ci/5843/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/124
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/138
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/138/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21348

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5843/rebuild

review: Needs Fixing (continuous-integration)
lp:~unity-team/unity8/autopkgtests updated
1790. By Albert Astals Cid

Merge lp:unity8

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1790
http://jenkins.qa.ubuntu.com/job/unity8-ci/5850/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/131
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/150
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/150/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21384

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5850/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

Hmm... I just tried to run it with

DEB_BUILD_OPTIONS="parallel=5 nocheck" adt-run --unbuilt-tree . -o output -s --- schroot vivid-amd64

but it doesn't seem to succeed. Says "SKIP no tests in this package" and then just stops. Am I doing something wrong or is there something broken?

review: Needs Information
Revision history for this message
Albert Astals Cid (aacid) wrote :

Do you have a schroot named vivid-amd64?

Revision history for this message
Albert Astals Cid (aacid) wrote :

Do you get to the building stage?

lp:~unity-team/unity8/autopkgtests updated
1791. By Albert Astals Cid

Merge lp:unity8

1792. By Albert Astals Cid

Merge lp:~aacid/unity8/fix_test_suspendrestartApp

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1792
http://jenkins.qa.ubuntu.com/job/unity8-ci/6008/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/298
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/247
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/298
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/298/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21750

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6008/rebuild

review: Needs Fixing (continuous-integration)
lp:~unity-team/unity8/autopkgtests updated
1793. By Albert Astals Cid

Oriented shell needs lightdm

1794. By Albert Astals Cid

Merge lp:~aacid/unity8/revert_session_screenshotter

1795. By Albert Astals Cid

Don't make it quiet, it's harder to debug failures

1796. By Albert Astals Cid

Merge lp:unity8

1797. By Albert Astals Cid

Merge lp:unity8

1798. By Albert Astals Cid

Merge lp:unity8

1799. By Albert Astals Cid

Merge

1800. By Albert Astals Cid

Use a trully temp dir on test mode

Helps when run under adt-run + schroot

1801. By Albert Astals Cid

Merge lp:unity8

1802. By Albert Astals Cid

Merge lp:unity8/overlay

1803. By Albert Astals Cid

Fix merge

1804. By Albert Astals Cid

Merge lp:~unity-team/unity8/autopkgtests

1805. By Albert Astals Cid

Bring back qrc use

1806. By Albert Astals Cid

Fix testDashShell

1807. By Michał Sawicz

Merge trunk

1808. By Michał Sawicz

Merge test fixes

1809. By Michał Sawicz

Merge more test fixes

1810. By Michał Sawicz

Merge test fixes again

1811. By Michał Sawicz

Refactor paths to support UNITY_ env vars pointing to build/source dirs

1812. By Michał Sawicz

Export UNITY_SOURCE_DIR in qmluitests.sh

1813. By Michał Sawicz

Allow stderr for now

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-06-17 12:14:27 +0000
3+++ CMakeLists.txt 2015-07-09 11:14:02 +0000
4@@ -13,8 +13,9 @@
5
6 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
7
8-# Instruct CMake to run moc automatically when needed.
9+# Instruct CMake to run moc and rcc automatically when needed.
10 set(CMAKE_AUTOMOC ON)
11+set(CMAKE_AUTORCC ON)
12
13 # enable QML debugging
14 string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.
15
16=== modified file 'cmake/modules/QmlTest.cmake'
17--- cmake/modules/QmlTest.cmake 2015-05-07 12:17:57 +0000
18+++ cmake/modules/QmlTest.cmake 2015-07-09 11:14:02 +0000
19@@ -127,6 +127,7 @@
20 file(MAKE_DIRECTORY ${ARTIFACTS_DIR}/${path})
21 set(file_logger -o ${ARTIFACTS_DIR}/${path}/test${COMPONENT_NAME}.xml,xunitxml)
22 else()
23+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
24 set(file_logger -o ${CMAKE_CURRENT_BINARY_DIR}/test${COMPONENT_NAME}.xml,xunitxml)
25 endif()
26
27
28=== modified file 'debian/control'
29--- debian/control 2015-07-02 16:09:27 +0000
30+++ debian/control 2015-07-09 11:14:02 +0000
31@@ -55,6 +55,7 @@
32 qtdeclarative5-ubuntu-web-plugin,
33 ttf-ubuntu-font-family,
34 Standards-Version: 3.9.4
35+XS-Testsuite: autopkgtest
36 Homepage: http://launchpad.net/unity
37 # If you aren't a member of ~unity-team but need to upload
38 # packaging changes, just go ahead. ~unity-team will notice
39
40=== added directory 'debian/tests'
41=== added file 'debian/tests/control'
42--- debian/tests/control 1970-01-01 00:00:00 +0000
43+++ debian/tests/control 2015-07-09 11:14:02 +0000
44@@ -0,0 +1,4 @@
45+Tests: qmluitests.sh
46+Depends: @,
47+ @builddeps@,
48+ xvfb,
49
50=== added file 'debian/tests/qmluitests.sh'
51--- debian/tests/qmluitests.sh 1970-01-01 00:00:00 +0000
52+++ debian/tests/qmluitests.sh 2015-07-09 11:14:02 +0000
53@@ -0,0 +1,17 @@
54+#!/bin/sh
55+
56+SHELL_QML_PATH=$(pkg-config --variable=plugindir unity-shell-api)
57+
58+dh_auto_configure -- -DCMAKE_INSTALL_LOCALSTATEDIR="/var" \
59+ -DARTIFACTS_DIR=${ADT_ARTIFACTS} \
60+ -DUNITY_PLUGINPATH=${SHELL_QML_PATH} \
61+ -DUNITY_MOCKPATH=${SHELL_QML_PATH}/mocks \
62+ -DQUIET_LOGGER=ON
63+dh_auto_build --parallel -- -C tests/mocks
64+dh_auto_build --parallel -- -C tests/plugins
65+dh_auto_build --parallel -- -C tests/qmltests
66+dh_auto_build --parallel -- -C tests/uqmlscene
67+dh_auto_build --parallel -- -C tests/utils
68+
69+# FIXME: --parallel here causes some failures
70+dh_auto_build -- -k unittests xvfbuitests
71
72=== modified file 'plugins/Wizard/System.cpp'
73--- plugins/Wizard/System.cpp 2014-11-19 17:43:09 +0000
74+++ plugins/Wizard/System.cpp 2015-07-09 11:14:02 +0000
75@@ -31,9 +31,11 @@
76 // Register the argument needed for UpdateActivationEnvironment below
77 qDBusRegisterMetaType<QMap<QString,QString>>();
78
79- m_fsWatcher.addPath(wizardEnabledPath());
80+ if(!wizardEnabled()) {
81+ m_fsWatcher.addPath(wizardEnabledPath());
82+ }
83 connect(&m_fsWatcher, SIGNAL(fileChanged(const QString &)),
84- this, SIGNAL(wizardEnabledChanged()));
85+ this, SLOT(watcherFileChanged()));
86 }
87
88 QString System::wizardEnabledPath()
89@@ -58,10 +60,16 @@
90 QDir(wizardEnabledPath()).mkpath("..");
91 QFile(wizardEnabledPath()).open(QIODevice::WriteOnly);
92 m_fsWatcher.addPath(wizardEnabledPath());
93- wizardEnabledChanged();
94+ Q_EMIT wizardEnabledChanged();
95 }
96 }
97
98+void System::watcherFileChanged()
99+{
100+ Q_EMIT wizardEnabledChanged();
101+ m_fsWatcher.removePath(wizardEnabledPath());
102+}
103+
104 void System::setSessionVariable(const QString &variable, const QString &value)
105 {
106 // We need to update both upstart's and DBus's environment
107
108=== modified file 'plugins/Wizard/System.h'
109--- plugins/Wizard/System.h 2014-11-14 17:47:00 +0000
110+++ plugins/Wizard/System.h 2015-07-09 11:14:02 +0000
111@@ -38,6 +38,9 @@
112 Q_SIGNALS:
113 void wizardEnabledChanged();
114
115+private Q_SLOTS:
116+ void watcherFileChanged();
117+
118 private:
119 Q_DISABLE_COPY(System)
120
121
122=== modified file 'tests/CMakeLists.txt'
123--- tests/CMakeLists.txt 2015-06-18 19:23:08 +0000
124+++ tests/CMakeLists.txt 2015-07-09 11:14:02 +0000
125@@ -22,11 +22,17 @@
126 add_executable(qmlscene ALIAS uqmlscene)
127 import_executables(dbus-test-runner)
128
129+set(UNITY_PLUGINPATH "${CMAKE_BINARY_DIR}/plugins" CACHE PATH "Path to pre-built unity8 plugin dir.")
130+set(UNITY_MOCKPATH "${CMAKE_BINARY_DIR}/tests/mocks" CACHE PATH "Path to pre-built unity8 mock dir.")
131+
132+# Pre-built mocks have preference, pre-built plugins replace local build
133 set(UNITY_IMPORT_PATHS
134+ ${UNITY_MOCKPATH}
135 ${CMAKE_BINARY_DIR}/tests/mocks
136 ${CMAKE_BINARY_DIR}/tests/utils/modules
137- ${CMAKE_BINARY_DIR}/plugins
138+ ${UNITY_PLUGINPATH}
139 )
140+list(REMOVE_DUPLICATES UNITY_IMPORT_PATHS)
141 set(UNITY_IMPORT_PATHS ${UNITY_IMPORT_PATHS} CACHE INTERNAL "")
142
143 macro(unity8_parse_arguments)
144@@ -40,8 +46,8 @@
145 set(ld_paths)
146 if(U8TEST_LIGHTDM)
147 list(APPEND ld_paths
148- ${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
149- ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
150+ ${UNITY_MOCKPATH}/libusermetrics
151+ ${UNITY_MOCKPATH}/LightDM/liblightdm
152 )
153 endif()
154
155
156=== modified file 'tests/mocks/Ubuntu/CMakeLists.txt'
157--- tests/mocks/Ubuntu/CMakeLists.txt 2014-11-21 19:28:16 +0000
158+++ tests/mocks/Ubuntu/CMakeLists.txt 2015-07-09 11:14:02 +0000
159@@ -5,3 +5,4 @@
160 add_subdirectory(SystemSettings)
161 add_subdirectory(Telephony)
162 add_subdirectory(Thumbnailer)
163+add_subdirectory(Web)
164
165=== added directory 'tests/mocks/Ubuntu/Web'
166=== added file 'tests/mocks/Ubuntu/Web/CMakeLists.txt'
167--- tests/mocks/Ubuntu/Web/CMakeLists.txt 1970-01-01 00:00:00 +0000
168+++ tests/mocks/Ubuntu/Web/CMakeLists.txt 2015-07-09 11:14:02 +0000
169@@ -0,0 +1,1 @@
170+add_unity8_mock(Ubuntu.Web 0.2 Ubuntu/Web)
171
172=== added file 'tests/mocks/Ubuntu/Web/WebView.qml'
173--- tests/mocks/Ubuntu/Web/WebView.qml 1970-01-01 00:00:00 +0000
174+++ tests/mocks/Ubuntu/Web/WebView.qml 2015-07-09 11:14:02 +0000
175@@ -0,0 +1,25 @@
176+/*
177+ * Copyright (C) 2015 Canonical, Ltd.
178+ *
179+ * This program is free software; you can redistribute it and/or modify
180+ * it under the terms of the GNU General Public License as published by
181+ * the Free Software Foundation; version 3.
182+ *
183+ * This program is distributed in the hope that it will be useful,
184+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
185+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
186+ * GNU General Public License for more details.
187+ *
188+ * You should have received a copy of the GNU General Public License
189+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
190+ *
191+ */
192+
193+import QtQuick 2.0
194+
195+Item {
196+ property url url
197+ property int loadProgress: 0
198+
199+ onUrlChanged: loadProgress = 100
200+}
201
202=== added file 'tests/mocks/Ubuntu/Web/qmldir'
203--- tests/mocks/Ubuntu/Web/qmldir 1970-01-01 00:00:00 +0000
204+++ tests/mocks/Ubuntu/Web/qmldir 2015-07-09 11:14:02 +0000
205@@ -0,0 +1,4 @@
206+module Ubuntu.Web
207+typeinfo Web.qmltypes
208+
209+WebView 0.2 WebView.qml
210
211=== modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
212--- tests/mocks/Unity/Application/CMakeLists.txt 2015-06-12 16:07:43 +0000
213+++ tests/mocks/Unity/Application/CMakeLists.txt 2015-07-09 11:14:02 +0000
214@@ -15,6 +15,7 @@
215 VirtualKeyboard.cpp
216 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
217 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
218+ resources/surfaces.qrc
219 )
220
221 add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
222
223=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
224--- tests/mocks/Unity/Application/MirSurfaceItem.cpp 2015-04-23 16:18:25 +0000
225+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp 2015-07-09 11:14:02 +0000
226@@ -31,7 +31,7 @@
227 MirSurfaceItem::Type type,
228 MirSurfaceItem::State state,
229 const QUrl& screenshot,
230- const QString &qmlFilePath,
231+ const QUrl& qmlFileUrl,
232 QQuickItem *parent)
233 : QQuickItem(parent)
234 , m_session(nullptr)
235@@ -57,15 +57,7 @@
236 QQuickView *quickView =
237 qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
238
239- QString qmlComponentFilePath;
240- if (!qmlFilePath.isEmpty()) {
241- qmlComponentFilePath.append(qmlFilePath);
242- } else {
243- qmlComponentFilePath = QString("%1/Unity/Application/MirSurfaceItem.qml")
244- .arg(mockPluginsDir());
245- }
246-
247- m_qmlContentComponent = new QQmlComponent(quickView->engine(), qmlComponentFilePath);
248+ m_qmlContentComponent = new QQmlComponent(quickView->engine(), qmlFileUrl);
249
250 switch (m_qmlContentComponent->status()) {
251 case QQmlComponent::Ready:
252
253=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
254--- tests/mocks/Unity/Application/MirSurfaceItem.h 2015-04-23 16:18:25 +0000
255+++ tests/mocks/Unity/Application/MirSurfaceItem.h 2015-07-09 11:14:02 +0000
256@@ -111,7 +111,7 @@
257 Type type,
258 State state,
259 const QUrl& screenshot,
260- const QString &qmlFilePath = QString(),
261+ const QUrl& qmlFilePath = QUrl("qrc:///Unity/Application/MirSurfaceItem.qml"),
262 QQuickItem *parent = 0);
263
264 void touchEvent(QTouchEvent * event) override;
265
266=== modified file 'tests/mocks/Unity/Application/VirtualKeyboard.cpp'
267--- tests/mocks/Unity/Application/VirtualKeyboard.cpp 2015-03-04 13:23:34 +0000
268+++ tests/mocks/Unity/Application/VirtualKeyboard.cpp 2015-07-09 11:14:02 +0000
269@@ -26,10 +26,8 @@
270 : MirSurfaceItem("input-method",
271 MirSurfaceItem::InputMethod,
272 MirSurfaceItem::Minimized,
273- QString("file://%1/Dash/graphics/phone/screenshots/vkb_portrait.png")
274- .arg(qmlDirectory()),
275- QString("%1/Unity/Application/VirtualKeyboard.qml")
276- .arg(mockPluginsDir()),
277+ QUrl("qrc:///Unity/Application/vkb_portrait.png"),
278+ QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"),
279 parent)
280 {
281 }
282
283=== added directory 'tests/mocks/Unity/Application/resources'
284=== renamed file 'tests/mocks/Unity/Application/MirSurfaceItem.qml' => 'tests/mocks/Unity/Application/resources/MirSurfaceItem.qml'
285=== renamed file 'tests/mocks/Unity/Application/VirtualKeyboard.qml' => 'tests/mocks/Unity/Application/resources/VirtualKeyboard.qml'
286=== added file 'tests/mocks/Unity/Application/resources/surfaces.qrc'
287--- tests/mocks/Unity/Application/resources/surfaces.qrc 1970-01-01 00:00:00 +0000
288+++ tests/mocks/Unity/Application/resources/surfaces.qrc 2015-07-09 11:14:02 +0000
289@@ -0,0 +1,7 @@
290+<RCC>
291+ <qresource prefix="/Unity/Application">
292+ <file>VirtualKeyboard.qml</file>
293+ <file>MirSurfaceItem.qml</file>
294+ <file>vkb_portrait.png</file>
295+ </qresource>
296+</RCC>
297
298=== added file 'tests/mocks/Unity/Application/resources/vkb_portrait.png'
299Binary files tests/mocks/Unity/Application/resources/vkb_portrait.png 1970-01-01 00:00:00 +0000 and tests/mocks/Unity/Application/resources/vkb_portrait.png 2015-07-09 11:14:02 +0000 differ
300=== modified file 'tests/plugins/Dash/CMakeLists.txt'
301--- tests/plugins/Dash/CMakeLists.txt 2015-04-29 22:05:49 +0000
302+++ tests/plugins/Dash/CMakeLists.txt 2015-07-09 11:14:02 +0000
303@@ -23,7 +23,6 @@
304 remove_definitions(-DQT_NO_KEYWORDS)
305
306 add_definitions(-DDASHVIEWSTEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR}")
307-add_definitions(-DBUILT_PLUGINS_DIR="${CMAKE_BINARY_DIR}/plugins")
308
309 macro(add_lvwph_test FILENAME TESTNAME)
310 add_executable(${TESTNAME}TestExec
311
312=== modified file 'tests/plugins/Dash/cardcreatortest.cpp'
313--- tests/plugins/Dash/cardcreatortest.cpp 2014-07-31 13:52:59 +0000
314+++ tests/plugins/Dash/cardcreatortest.cpp 2015-07-09 11:14:02 +0000
315@@ -35,7 +35,6 @@
316 void init()
317 {
318 view = new QQuickView();
319- view->engine()->addImportPath(BUILT_PLUGINS_DIR);
320 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/cardcreatortest.qml"));
321 view->show();
322 QTest::qWaitForWindowExposed(view);
323
324=== modified file 'tests/plugins/Dash/horizontaljournaltest.cpp'
325--- tests/plugins/Dash/horizontaljournaltest.cpp 2015-04-30 09:31:51 +0000
326+++ tests/plugins/Dash/horizontaljournaltest.cpp 2015-07-09 11:14:02 +0000
327@@ -123,7 +123,6 @@
328 {
329 view = new QQuickView();
330 view->setResizeMode(QQuickView::SizeRootObjectToView);
331- view->engine()->addImportPath(BUILT_PLUGINS_DIR);
332
333 model = new WidthModel();
334 QStringList widthList;
335
336=== modified file 'tests/plugins/Dash/horizontaljournaltry.cpp'
337--- tests/plugins/Dash/horizontaljournaltry.cpp 2015-04-30 09:31:51 +0000
338+++ tests/plugins/Dash/horizontaljournaltry.cpp 2015-07-09 11:14:02 +0000
339@@ -63,7 +63,6 @@
340
341 QQuickView *view = new QQuickView();
342 view->setResizeMode(QQuickView::SizeRootObjectToView);
343- view->engine()->addImportPath(BUILT_PLUGINS_DIR);
344
345 QWidthModela model;
346 QStringList heightList;
347
348=== modified file 'tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp'
349--- tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp 2015-04-30 09:31:51 +0000
350+++ tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp 2015-07-09 11:14:02 +0000
351@@ -168,7 +168,6 @@
352 void init()
353 {
354 view = new QQuickView();
355- view->engine()->addImportPath(BUILT_PLUGINS_DIR);
356 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsectionexternalmodel.qml"));
357 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());
358 QVERIFY(lvwph);
359
360=== modified file 'tests/plugins/Dash/listviewwithpageheadersectiontest.cpp'
361--- tests/plugins/Dash/listviewwithpageheadersectiontest.cpp 2014-07-29 13:33:03 +0000
362+++ tests/plugins/Dash/listviewwithpageheadersectiontest.cpp 2015-07-09 11:14:02 +0000
363@@ -133,7 +133,6 @@
364 void init()
365 {
366 view = new QQuickView();
367- view->engine()->addImportPath(BUILT_PLUGINS_DIR);
368 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsection.qml"));
369 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());
370 model = view->rootObject()->findChild<QQmlListModel*>();
371
372=== modified file 'tests/plugins/Dash/listviewwithpageheadertest.cpp'
373--- tests/plugins/Dash/listviewwithpageheadertest.cpp 2015-04-29 13:12:52 +0000
374+++ tests/plugins/Dash/listviewwithpageheadertest.cpp 2015-07-09 11:14:02 +0000
375@@ -119,7 +119,6 @@
376 void init()
377 {
378 view = new QQuickView();
379- view->engine()->addImportPath(BUILT_PLUGINS_DIR);
380 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertest.qml"));
381 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());
382 model = view->rootObject()->findChild<QQmlListModel*>();
383
384=== modified file 'tests/plugins/Dash/organicgridtest.cpp'
385--- tests/plugins/Dash/organicgridtest.cpp 2015-04-30 09:31:51 +0000
386+++ tests/plugins/Dash/organicgridtest.cpp 2015-07-09 11:14:02 +0000
387@@ -126,7 +126,6 @@
388 {
389 view = new QQuickView();
390 view->setResizeMode(QQuickView::SizeRootObjectToView);
391- view->engine()->addImportPath(BUILT_PLUGINS_DIR);
392
393 model = new DummyModel();
394 model->setCount(21);
395
396=== modified file 'tests/plugins/Dash/organicgridtry.cpp'
397--- tests/plugins/Dash/organicgridtry.cpp 2015-04-30 09:31:51 +0000
398+++ tests/plugins/Dash/organicgridtry.cpp 2015-07-09 11:14:02 +0000
399@@ -73,7 +73,6 @@
400
401 QQuickView *view = new QQuickView();
402 view->setResizeMode(QQuickView::SizeRootObjectToView);
403- view->engine()->addImportPath(BUILT_PLUGINS_DIR);
404
405 DummyModel model;
406 model.setCount(3);
407
408=== modified file 'tests/plugins/Dash/verticaljournaltest.cpp'
409--- tests/plugins/Dash/verticaljournaltest.cpp 2015-04-30 09:31:51 +0000
410+++ tests/plugins/Dash/verticaljournaltest.cpp 2015-07-09 11:14:02 +0000
411@@ -125,7 +125,6 @@
412 {
413 view = new QQuickView();
414 view->setResizeMode(QQuickView::SizeRootObjectToView);
415- view->engine()->addImportPath(BUILT_PLUGINS_DIR);
416
417 model = new HeightModel();
418 QStringList heightList;
419
420=== modified file 'tests/plugins/Dash/verticaljournaltry.cpp'
421--- tests/plugins/Dash/verticaljournaltry.cpp 2015-04-30 09:31:51 +0000
422+++ tests/plugins/Dash/verticaljournaltry.cpp 2015-07-09 11:14:02 +0000
423@@ -63,7 +63,6 @@
424
425 QQuickView *view = new QQuickView();
426 view->setResizeMode(QQuickView::SizeRootObjectToView);
427- view->engine()->addImportPath(BUILT_PLUGINS_DIR);
428
429 QHeightModel model;
430 QStringList heightList;
431
432=== modified file 'tests/plugins/LightDM/CMakeLists.txt'
433--- tests/plugins/LightDM/CMakeLists.txt 2015-06-17 12:14:27 +0000
434+++ tests/plugins/LightDM/CMakeLists.txt 2015-07-09 11:14:02 +0000
435@@ -22,7 +22,7 @@
436 ARG_PREFIX "--parameter"
437 ARGS --task $<TARGET_FILE:GreeterDBusTestExec>
438 DEPENDS MockLightDM
439- IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks
440+ IMPORT_PATHS ${UNITY_MOCKPATH}
441 LIGHTDM
442 )
443
444
445=== modified file 'tests/plugins/Ubuntu/Gestures/CMakeLists.txt'
446--- tests/plugins/Ubuntu/Gestures/CMakeLists.txt 2015-05-21 15:50:16 +0000
447+++ tests/plugins/Ubuntu/Gestures/CMakeLists.txt 2015-07-09 11:14:02 +0000
448@@ -14,9 +14,6 @@
449
450 export_qmlfiles(UbuntuGesturesTest .)
451
452-add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")
453-add_definitions(-DTESTS_UTILS_MODULES_DIR="${CMAKE_BINARY_DIR}/tests/utils/modules")
454-
455 macro(build_gesture_test CLASSNAME)
456 add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp TestItem.cpp)
457 qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)
458@@ -26,7 +23,7 @@
459 macro(add_gesture_unit_test CLASSNAME)
460 build_gesture_test(${CLASSNAME})
461 add_unity8_unittest(${CLASSNAME} ${CLASSNAME}TestExec
462- ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures
463+ ENVIRONMENT LD_LIBRARY_PATH=${UNITY_PLUGINPATH}/Ubuntu/Gestures
464 DEPENDS UbuntuGesturesTest-qmlfiles
465 ${ARGN}
466 )
467@@ -35,12 +32,11 @@
468 macro(add_gesture_ui_test CLASSNAME)
469 build_gesture_test(${CLASSNAME})
470 add_unity8_uitest(${CLASSNAME} ${CLASSNAME}TestExec
471- ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures
472+ ENVIRONMENT LD_LIBRARY_PATH=${UNITY_PLUGINPATH}/Ubuntu/Gestures
473 DEPENDS UbuntuGesturesTest-qmlfiles
474 ${ARGN}
475 )
476- add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins
477- ${CMAKE_BINARY_DIR}/tests/utils/modules)
478+ add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${UNITY_PLUGINPATH})
479 endmacro()
480
481 add_gesture_ui_test(DirectionalDragArea)
482
483=== modified file 'tests/plugins/Ubuntu/Gestures/GestureTest.cpp'
484--- tests/plugins/Ubuntu/Gestures/GestureTest.cpp 2015-04-17 18:31:12 +0000
485+++ tests/plugins/Ubuntu/Gestures/GestureTest.cpp 2015-07-09 11:14:02 +0000
486@@ -44,8 +44,6 @@
487 {
488 m_view = new QQuickView;
489 m_view->setResizeMode(QQuickView::SizeRootObjectToView);
490- m_view->engine()->addImportPath(QStringLiteral(UBUNTU_GESTURES_PLUGIN_DIR));
491- m_view->engine()->addImportPath(QStringLiteral(TESTS_UTILS_MODULES_DIR));
492 m_view->setSource(QUrl::fromLocalFile(m_qmlFilename));
493 m_view->show();
494 QVERIFY(QTest::qWaitForWindowExposed(m_view));
495
496=== modified file 'tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp'
497--- tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp 2015-05-18 23:04:12 +0000
498+++ tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp 2015-07-09 11:14:02 +0000
499@@ -119,7 +119,6 @@
500 QQuickView *window = new QQuickView(0);
501 window->setResizeMode(QQuickView::SizeRootObjectToView);
502 window->resize(720, 720);
503- window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));
504
505 return window;
506 }
507
508=== modified file 'tests/qmltests/Components/CMakeLists.txt'
509--- tests/qmltests/Components/CMakeLists.txt 2015-05-19 19:05:11 +0000
510+++ tests/qmltests/Components/CMakeLists.txt 2015-07-09 11:14:02 +0000
511@@ -1,6 +1,4 @@
512-add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")
513 add_definitions(-DTEST_DIR="${CMAKE_CURRENT_LIST_DIR}")
514-add_definitions(-DTESTS_UTILS_MODULES_DIR="${CMAKE_BINARY_DIR}/tests/utils/modules")
515
516 ########## tst_DragHandle
517
518@@ -17,8 +15,7 @@
519 target_link_libraries(DragHandleTestExec UbuntuGesturesQml UbuntuGestures)
520
521 add_unity8_uitest(DragHandle DragHandleTestExec ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures)
522-add_manual_qml_test(. DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/utils/modules)
523-
524+add_manual_qml_test(. DragHandle IMPORT_PATHS ${UNITY_PLUGINPATH})
525
526 ########## tst_EdgeDragEvaluator
527 add_executable(EdgeDragEvaluatorTestExec tst_EdgeDragEvaluator.cpp)
528
529=== modified file 'tests/qmltests/Components/tst_DragHandle.cpp'
530--- tests/qmltests/Components/tst_DragHandle.cpp 2015-04-17 18:31:12 +0000
531+++ tests/qmltests/Components/tst_DragHandle.cpp 2015-07-09 11:14:02 +0000
532@@ -113,9 +113,7 @@
533 {
534 QQuickView *window = new QQuickView(0);
535 window->setResizeMode(QQuickView::SizeRootObjectToView);
536- window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));
537 window->engine()->addImportPath(QLatin1String(TEST_DIR));
538- window->engine()->addImportPath(QStringLiteral(TESTS_UTILS_MODULES_DIR));
539
540 return window;
541 }
542
543=== modified file 'tests/qmltests/Components/tst_EdgeDragEvaluator.cpp'
544--- tests/qmltests/Components/tst_EdgeDragEvaluator.cpp 2015-04-27 19:03:08 +0000
545+++ tests/qmltests/Components/tst_EdgeDragEvaluator.cpp 2015-07-09 11:14:02 +0000
546@@ -99,7 +99,6 @@
547 {
548 QQuickView *window = new QQuickView(0);
549 window->setResizeMode(QQuickView::SizeRootObjectToView);
550- window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));
551 window->engine()->addImportPath(QLatin1String(TEST_DIR));
552
553 return window;
554
555=== modified file 'tests/qmltests/Stages/tst_ApplicationWindow.qml'
556--- tests/qmltests/Stages/tst_ApplicationWindow.qml 2015-06-22 09:37:50 +0000
557+++ tests/qmltests/Stages/tst_ApplicationWindow.qml 2015-07-09 11:14:02 +0000
558@@ -340,26 +340,26 @@
559 initSession();
560 setApplicationState(appRunning);
561 tryCompare(stateGroup, "state", "surface");
562- waitUntilTransitionsEnd();
563+ waitUntilTransitionsEnd(stateGroup);
564
565 setApplicationState(appSuspended);
566
567 cleanupSession();
568
569 tryCompare(stateGroup, "state", "screenshot");
570- waitUntilTransitionsEnd();
571+ waitUntilTransitionsEnd(stateGroup);
572 tryCompare(fakeApplication, "session", null);
573
574 // and restart it
575 setApplicationState(appStarting);
576
577- waitUntilTransitionsEnd();
578+ waitUntilTransitionsEnd(stateGroup);
579 verify(stateGroup.state === "screenshot");
580 verify(fakeSession === null);
581
582 setApplicationState(appRunning);
583
584- waitUntilTransitionsEnd();
585+ waitUntilTransitionsEnd(stateGroup);
586 verify(stateGroup.state === "screenshot");
587
588 initSession();

Subscribers

People subscribed via source and target branches