1
=== modified file 'components.api'
2
--- components.api	2014-02-24 19:16:26 +0000
3
+++ components.api	2014-03-04 12:39:24 +0000
4
@@ -582,6 +582,12 @@
5
582
modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml
582
modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml
6
583
Item
583
Item
7
584
    property bool active
584
    property bool active
8
585
modules/Ubuntu/Test/UbuntuTestCase.qml
9
586
TestCase
10
587
    function findChild(obj,objectName)
11
588
    function findInvisibleChild(obj,objectName)
12
589
    function mouseMoveSlowly(item,x,y,dx,dy,steps,stepdelay)
13
590
    function tryCompareFunction(func, expectedResult, timeout)
14
585
plugins.qmltypes
591
plugins.qmltypes
15
586
    name: "InverseMouseAreaType"
592
    name: "InverseMouseAreaType"
16
587
    prototype: "QQuickMouseArea"
593
    prototype: "QQuickMouseArea"
17
@@ -766,6 +772,24 @@
18
766
    Parameter { name: "singular"; type: "string" }
772
    Parameter { name: "singular"; type: "string" }
19
767
    Parameter { name: "plural"; type: "string" }
773
    Parameter { name: "plural"; type: "string" }
20
768
    Parameter { name: "n"; type: "int" }
774
    Parameter { name: "n"; type: "int" }
21
775
    name: "ULConditionalLayout"
22
776
    prototype: "QObject"
23
777
    exports: ["ConditionalLayout 0.1"]
24
778
    Property { name: "name"; type: "string" }
25
779
    Property { name: "when"; type: "QQmlBinding"; isPointer: true }
26
780
    Property { name: "layout"; type: "QQmlComponent"; isPointer: true }
27
781
    name: "ULItemLayout"
28
782
    prototype: "QQuickItem"
29
783
    exports: ["ItemLayout 0.1"]
30
784
    Property { name: "item"; type: "string" }
31
785
    name: "ULLayouts"
32
786
    prototype: "QQuickItem"
33
787
    exports: ["Layouts 0.1"]
34
788
    Property { name: "currentLayout"; type: "string"; isReadonly: true }
35
789
    Property { name: "layouts"; type: "ULConditionalLayout"; isList: true; isReadonly: true }
36
790
    name: "ULLayoutsAttached"
37
791
    prototype: "QObject"
38
792
    Property { name: "item"; type: "string" }
39
769
    name: "UPMCpuUsage"
793
    name: "UPMCpuUsage"
40
770
    prototype: "QQuickItem"
794
    prototype: "QQuickItem"
41
771
    exports: ["CpuUsage 0.1"]
795
    exports: ["CpuUsage 0.1"]
42
772
796
43
=== modified file 'debian/control'
44
--- debian/control	2014-03-01 12:51:13 +0000
45
+++ debian/control	2014-03-04 12:39:24 +0000
46
@@ -6,6 +6,7 @@
47
6
               devscripts,
6
               devscripts,
48
7
               libgles2-mesa-dev,
7
               libgles2-mesa-dev,
49
8
               libglib2.0-dev,
8
               libglib2.0-dev,
50
9
               python3,
51
9
               python,
10
               python,
52
10
               libqt5qml-graphicaleffects | libqt5graphicaleffects5,
11
               libqt5qml-graphicaleffects | libqt5graphicaleffects5,
53
11
               qt5-default,
12
               qt5-default,
54
@@ -22,12 +23,12 @@
55
22
               qtdeclarative5-qtfeedback-plugin,
23
               qtdeclarative5-qtfeedback-plugin,
56
23
               qtdeclarative5-unity-action-plugin (>= 1.1.0),
24
               qtdeclarative5-unity-action-plugin (>= 1.1.0),
57
24
               qtdeclarative5-localstorage-plugin,
25
               qtdeclarative5-localstorage-plugin,
64
25
         qtdeclarative5-doc-html,
26
               qtdeclarative5-doc-html,
65
26
         qtwebkit5-doc-html,
27
               qtwebkit5-doc-html,
66
27
         qtsvg5-doc-html,
28
               qtsvg5-doc-html,
67
28
         qtscript5-doc-html,
29
               qtscript5-doc-html,
68
29
         qtmultimedia5-doc-html,
30
               qtmultimedia5-doc-html,
69
30
         unity-action-doc,
31
               unity-action-doc,
70
31
               devscripts,
32
               devscripts,
71
32
               libqt5organizer5,
33
               libqt5organizer5,
72
33
               qtpim5-dev,
34
               qtpim5-dev,
73
@@ -135,6 +136,8 @@
74
135
         python-autopilot (>= 1.4),
136
         python-autopilot (>= 1.4),
75
136
         python-fixtures,
137
         python-fixtures,
76
137
         python-mock,
138
         python-mock,
77
139
         python3-fixtures,
78
140
         python3-autopilot (>= 1.4),
79
138
         ubuntu-ui-toolkit-examples (>= ${source:Version}),
141
         ubuntu-ui-toolkit-examples (>= ${source:Version}),
80
139
Description: Test package for Ubuntu UI Toolkit
142
Description: Test package for Ubuntu UI Toolkit
81
140
 Autopilot tests for the ubuntu-ui-toolkit package
143
 Autopilot tests for the ubuntu-ui-toolkit package
82
141
144
83
=== modified file 'debian/rules'
84
--- debian/rules	2014-03-01 12:51:13 +0000
85
+++ debian/rules	2014-03-04 12:39:24 +0000
86
@@ -11,6 +11,7 @@
87
11
override_dh_auto_test:
11
override_dh_auto_test:
88
12
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
12
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
89
13
	mkdir -p debian/tmp/home/run
13
	mkdir -p debian/tmp/home/run
90
14
	chmod +x tests/xvfb.sh
91
14
	tests/xvfb.sh dh_auto_test || exit $?
15
	tests/xvfb.sh dh_auto_test || exit $?
92
15
endif
16
endif
93
16
17
94
17
18
95
=== modified file 'debian/ubuntu-ui-toolkit-autopilot.install'
96
--- debian/ubuntu-ui-toolkit-autopilot.install	2013-10-30 11:35:57 +0000
97
+++ debian/ubuntu-ui-toolkit-autopilot.install	2014-03-04 12:39:24 +0000
98
@@ -1,1 +1,2 @@
100
1
usr/lib/python2.7/dist-packages/ubuntuuitoolkit
1
usr/lib/python3
101
2
usr/lib/python2.7
102
2
3
103
=== modified file 'run_tests.sh'
104
--- run_tests.sh	2013-09-26 13:12:49 +0000
105
+++ run_tests.sh	2014-03-04 12:39:24 +0000
106
@@ -21,9 +21,9 @@
107
21
21
108
22
UBUNTU_UI_TOOLKIT_AUTOPILOT_FROM_SOURCE=1
22
UBUNTU_UI_TOOLKIT_AUTOPILOT_FROM_SOURCE=1
109
23
if [ "$1" == "" ]; then
23
if [ "$1" == "" ]; then
111
24
	autopilot run ubuntuuitoolkit
24
	python3 -m autopilot.run run ubuntuuitoolkit
112
25
else
25
else
114
26
	autopilot run -o ../../$1 -f xml -r -rd ../../ ubuntuuitoolkit
26
	python3 -m autopilot.run run -o ../../$1 -f xml -r -rd ../../ ubuntuuitoolkit
115
27
fi
27
fi
116
28
28
117
29
exit 0
29
exit 0
118
30
30
119
=== modified file 'tests/autopilot/ubuntuuitoolkit/base.py'
120
--- tests/autopilot/ubuntuuitoolkit/base.py	2013-11-15 05:11:10 +0000
121
+++ tests/autopilot/ubuntuuitoolkit/base.py	2014-03-04 12:39:24 +0000
122
@@ -31,8 +31,9 @@
123
31
    # configuration on devices and it seems the environment variable
31
    # configuration on devices and it seems the environment variable
124
32
    # QT_SELECT=qt5 doesn't work for autopilot tests. --Mirv - 2013-10-03
32
    # QT_SELECT=qt5 doesn't work for autopilot tests. --Mirv - 2013-10-03
125
33
    arch = subprocess.check_output(
33
    arch = subprocess.check_output(
128
34
        ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip()
34
        ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"],
129
35
    return '/usr/lib/{}/qt5/bin/qmlscene'.format(arch.decode())
35
        universal_newlines=True).strip()
130
36
    return '/usr/lib/{}/qt5/bin/qmlscene'.format(arch)
131
36
37
132
37
38
133
38
class UbuntuUIToolkitAppTestCase(testcase.AutopilotTestCase):
39
class UbuntuUIToolkitAppTestCase(testcase.AutopilotTestCase):
134
39
40
135
=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
136
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2014-03-01 12:52:42 +0000
137
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2014-03-04 12:39:24 +0000
138
@@ -582,7 +582,7 @@
139
582
582
140
583
    def _show_more_elements(self, direction):
583
    def _show_more_elements(self, direction):
141
584
        x, y, width, height = self.globalRect
584
        x, y, width, height = self.globalRect
143
585
        start_x = stop_x = x + (width / 2)
585
        start_x = stop_x = x + (width // 2)
144
586
        # Start and stop just a little under the top of the list.
586
        # Start and stop just a little under the top of the list.
145
587
        top = y + 5
587
        top = y + 5
146
588
        bottom = y + height - 5
588
        bottom = y + height - 5
147
@@ -607,7 +607,7 @@
148
607
    def _is_element_clickable(self, objectName):
607
    def _is_element_clickable(self, objectName):
149
608
        """Return True if the center of the element is visible."""
608
        """Return True if the center of the element is visible."""
150
609
        element = self.select_single(objectName=objectName)
609
        element = self.select_single(objectName=objectName)
152
610
        element_center = element.globalRect.y + element.globalRect.height / 2
610
        element_center = element.globalRect.y + element.globalRect.height // 2
153
611
        return (element_center >= self.globalRect.y and
611
        return (element_center >= self.globalRect.y and
154
612
                element_center <= self.globalRect.y + self.globalRect.height)
612
                element_center <= self.globalRect.y + self.globalRect.height)
155
613
613
156
@@ -628,7 +628,7 @@
157
628
    @autopilot_logging.log_action(logger.info)
628
    @autopilot_logging.log_action(logger.info)
158
629
    def swipe_to_delete(self, direction='right'):
629
    def swipe_to_delete(self, direction='right'):
159
630
        """Swipe the item in a specific direction."""
630
        """Swipe the item in a specific direction."""
161
631
        if (self.removable):
631
        if self.removable:
162
632
            self._drag_pointing_device_to_delete(direction)
632
            self._drag_pointing_device_to_delete(direction)
163
633
            if self.confirmRemoval:
633
            if self.confirmRemoval:
164
634
                self.waitingConfirmationForRemoval.wait_for(True)
634
                self.waitingConfirmationForRemoval.wait_for(True)
165
@@ -640,12 +640,12 @@
166
640
640
167
641
    def _drag_pointing_device_to_delete(self, direction):
641
    def _drag_pointing_device_to_delete(self, direction):
168
642
        x, y, w, h = self.globalRect
642
        x, y, w, h = self.globalRect
171
643
        tx = x + (w / 8)
643
        tx = x + (w // 8)
172
644
        ty = y + (h / 2)
644
        ty = y + (h // 2)
173
645
645
175
646
        if (direction == 'right'):
646
        if direction == 'right':
176
647
            self.pointing_device.drag(tx, ty, w, ty)
647
            self.pointing_device.drag(tx, ty, w, ty)
178
648
        elif (direction == 'left'):
648
        elif direction == 'left':
179
649
            self.pointing_device.drag(w - (w*0.1), ty, x, ty)
649
            self.pointing_device.drag(w - (w*0.1), ty, x, ty)
180
650
        else:
650
        else:
181
651
            raise ToolkitEmulatorException(
651
            raise ToolkitEmulatorException(
182
@@ -663,7 +663,7 @@
183
663
    @autopilot_logging.log_action(logger.info)
663
    @autopilot_logging.log_action(logger.info)
184
664
    def confirm_removal(self):
664
    def confirm_removal(self):
185
665
        """Comfirm item removal if this was already swiped."""
665
        """Comfirm item removal if this was already swiped."""
187
666
        if (self.waitingConfirmationForRemoval):
666
        if self.waitingConfirmationForRemoval:
188
667
            deleteButton = self._get_confirm_button()
667
            deleteButton = self._get_confirm_button()
189
668
            self.pointing_device.click_object(deleteButton)
668
            self.pointing_device.click_object(deleteButton)
190
669
            self._wait_until_deleted()
669
            self._wait_until_deleted()
191
670
670
192
=== modified file 'tests/autopilot/ubuntuuitoolkit/fixture_setup.py'
193
--- tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-02-12 09:20:43 +0000
194
+++ tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-03-04 12:39:24 +0000
195
@@ -87,7 +87,7 @@
196
87
                qmlscene=base.get_qmlscene_launch_command(),
87
                qmlscene=base.get_qmlscene_launch_command(),
197
88
                qml_file_path=qml_file_path))
88
                qml_file_path=qml_file_path))
198
89
        desktop_file.write('[Desktop Entry]\n')
89
        desktop_file.write('[Desktop Entry]\n')
200
90
        for key, value in self._desktop_file_dict.iteritems():
90
        for key, value in self._desktop_file_dict.items():
201
91
            desktop_file.write('{key}={value}\n'.format(key=key, value=value))
91
            desktop_file.write('{key}={value}\n'.format(key=key, value=value))
202
92
        desktop_file.close()
92
        desktop_file.close()
203
93
        return desktop_file.name
93
        return desktop_file.name
204
94
94
205
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
206
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-03-01 12:52:15 +0000
207
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-03-04 12:39:24 +0000
208
@@ -14,7 +14,6 @@
209
14
# You should have received a copy of the GNU Lesser General Public License
14
# You should have received a copy of the GNU Lesser General Public License
210
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
211
16
16
212
17
import mock
213
18
import time
17
import time
214
19
import unittest
18
import unittest
215
20
19
216
@@ -22,6 +21,10 @@
217
22
from autopilot import input, platform
21
from autopilot import input, platform
218
23
from autopilot.introspection import dbus
22
from autopilot.introspection import dbus
219
24
from testtools.matchers import GreaterThan, LessThan
23
from testtools.matchers import GreaterThan, LessThan
220
24
try:
221
25
    from unittest import mock
222
26
except ImportError:
223
27
    import mock
224
25
28
225
26
from ubuntuuitoolkit import emulators, tests
29
from ubuntuuitoolkit import emulators, tests
226
27
30
227
28
31
228
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py'
229
--- tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2014-02-12 18:41:20 +0000
230
+++ tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2014-03-04 12:39:24 +0000
231
@@ -16,7 +16,12 @@
232
16
16
233
17
import os
17
import os
234
18
18
236
19
import mock
19
try:
237
20
    # Python 3.
238
21
    from unittest import mock
239
22
except ImportError:
240
23
    # Python 2 add-on: python-mock.
241
24
    import mock
242
20
import testtools
25
import testtools
243
21
from autopilot import testcase as autopilot_testcase
26
from autopilot import testcase as autopilot_testcase
244
22
from testtools.matchers import Contains, Not, FileExists
27
from testtools.matchers import Contains, Not, FileExists
245
23
28
246
=== modified file 'tests/qmlapicheck.py'
247
--- tests/qmlapicheck.py	2013-12-11 11:28:29 +0000
248
+++ tests/qmlapicheck.py	2014-03-04 12:39:24 +0000
249
@@ -1,4 +1,4 @@
251
1
#!/usr/bin/env python
1
#!/usr/bin/env python3
252
2
# -*- coding: utf-8 -*-
2
# -*- coding: utf-8 -*-
253
3
#
3
#
254
4
# Copyright 2013 Canonical Ltd.
4
# Copyright 2013 Canonical Ltd.
255
@@ -65,7 +65,9 @@
256
65
        fileinput.nextfile()
65
        fileinput.nextfile()
257
66
66
258
67
inputfiles.sort()
67
inputfiles.sort()
260
68
for line in fileinput.input(inputfiles):
68
261
69
hook = fileinput.hook_encoded('utf-8')
262
70
for line in fileinput.input(inputfiles, openhook=hook):
263
69
    # New file
71
    # New file
264
70
    if fileinput.isfirstline():
72
    if fileinput.isfirstline():
265
71
        in_block = 0
73
        in_block = 0
266
72
74
267
=== added file 'tests/qmlapicheck.sh'
268
--- tests/qmlapicheck.sh	1970-01-01 00:00:00 +0000
269
+++ tests/qmlapicheck.sh	2014-03-04 12:39:24 +0000
270
@@ -0,0 +1,52 @@
271
1
#!/usr/bin/env sh
272
2
#
273
3
# Copyright 2013 Canonical Ltd.
274
4
#
275
5
# This program is free software; you can redistribute it and/or modify
276
6
# it under the terms of the GNU Lesser General Public License as published by
277
7
# the Free Software Foundation; version 3.
278
8
#
279
9
# This program is distributed in the hope that it will be useful,
280
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
281
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
282
12
# GNU Lesser General Public License for more details.
283
13
#
284
14
# You should have received a copy of the GNU Lesser General Public License
285
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
286
16
#
287
17
################################################################################
288
18
QML="modules/Ubuntu/*/qmldir modules/Ubuntu/Components/Colors/UbuntuColors.qml modules/Ubuntu/Components/*/qmldir modules/Ubuntu/Components/Pickers/PickerPanel.qml"
289
19
CPP="Ubuntu.Components Ubuntu.Layouts Ubuntu.PerformanceMetrics"
290
20
291
21
echo Dumping QML API of C++ components
292
22
echo '' > plugins.qmltypes
293
23
for i in $CPP; do
294
24
    # Silence spam on stderr due to fonts
295
25
    # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
296
26
    # https://bugreports.qt-project.org/browse/QTBUG-36243
297
27
    qmlplugindump $i 0.1 modules 2>/dev/null >> plugins.qmltypes
298
28
done
299
29
STATUS=$?
300
30
test $STATUS = 0 || ERRORS=1
301
31
test $STATUS = 0 || echo Error: qmldump failed
302
32
303
33
echo Running QML API check for $QML
304
34
# Palette gets included in Qt 5.2 qmlplugindump even though it's qml
305
35
BUILTINS=QQuick,QQml,U1db::,Palette python3 tests/qmlapicheck.py $QML plugins.qmltypes > components.api.new
306
36
STATUS=$?
307
37
test $STATUS = 0 || ERRORS=1
308
38
test $STATUS = 0 || echo Error: qmlapicheck.py failed
309
39
310
40
echo Verifying the diff between existing and generated API
311
41
diff -Fqml -u components.api components.api.new
312
42
STATUS=$?
313
43
test $STATUS = 0 || ERRORS=1
314
44
test $STATUS = 0 || echo Error: diff mismatched
315
45
316
46
if [ "x$ERRORS" != "x1" ]; then
317
47
    echo API is all fine.
318
48
    exit 0
319
49
else
320
50
    echo API test failed with errors. Did you forget to update components.api?
321
51
    exit 1
322
52
fi
323
0
53
324
=== modified file 'tests/tests.pro'
325
--- tests/tests.pro	2013-10-30 11:35:57 +0000
326
+++ tests/tests.pro	2014-03-04 12:39:24 +0000
327
@@ -1,7 +1,10 @@
328
1
TEMPLATE = subdirs
1
TEMPLATE = subdirs
329
2
SUBDIRS += unit unit_x11
2
SUBDIRS += unit unit_x11
330
3
3
332
4
autopilot_module.path = /usr/lib/python2.7/dist-packages/ubuntuuitoolkit
4
autopilot_module.path = /usr/lib/python3/dist-packages/ubuntuuitoolkit
333
5
autopilot_module.files = autopilot/ubuntuuitoolkit/*
5
autopilot_module.files = autopilot/ubuntuuitoolkit/*
334
6
6
336
7
INSTALLS += autopilot_module
7
autopilot2_module.path = /usr/lib/python2.7/dist-packages/ubuntuuitoolkit
337
8
autopilot2_module.files = autopilot/ubuntuuitoolkit/*
338
9
339
10
INSTALLS += autopilot_module autopilot2_module
340
8
11
341
=== modified file 'tests/unit/add_qmlmakecheck.pri'
342
--- tests/unit/add_qmlmakecheck.pri	2014-02-11 12:42:55 +0000
343
+++ tests/unit/add_qmlmakecheck.pri	2014-03-04 12:39:24 +0000
344
@@ -8,11 +8,5 @@
345
8
  check.commands += ../../unit/runtest.sh $${TARGET} $${TEST} minimal;
8
  check.commands += ../../unit/runtest.sh $${TARGET} $${TEST} minimal;
346
9
}
9
}
347
10
check.commands += cd ../../..;
10
check.commands += cd ../../..;
356
11
# Silence spam on stderr due to fonts
11
check.commands += sh tests/qmlapicheck.sh || exit 1;
357
12
# https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
12
check.commands += cd tests/unit
350
13
# https://bugreports.qt-project.org/browse/QTBUG-36243
351
14
check.commands += qmlplugindump Ubuntu.Components 0.1 modules 2>/dev/null > plugins.qmltypes;
352
15
check.commands += qmlplugindump Ubuntu.PerformanceMetrics 0.1 modules 2>/dev/null >> plugins.qmltypes;
353
16
# Palette gets included in Qt 5.2 qmlplugindump even though it's qml
354
17
check.commands += BUILTINS=QQuick,QQml,U1db::,Palette python tests/qmlapicheck.py modules/Ubuntu/Components/qmldir modules/Ubuntu/Components/Colors/UbuntuColors.qml modules/Ubuntu/Components/Pickers/PickerPanel.qml modules/Ubuntu/Components/*/qmldir modules/Ubuntu/PerformanceMetrics/qmldir plugins.qmltypes > components.api.new;
355
18
check.commands += diff -Fqml -u components.api components.api.new || exit 1; cd tests/unit
358
19
13
359
=== modified file 'ubuntu-sdk.pro'
360
--- ubuntu-sdk.pro	2013-12-12 13:01:56 +0000
361
+++ ubuntu-sdk.pro	2014-03-04 12:39:24 +0000
362
@@ -22,10 +22,15 @@
363
22
QMAKE_EXTRA_TARGETS += test_api
22
QMAKE_EXTRA_TARGETS += test_api
364
23
23
365
24
test_components.target = test-components
24
test_components.target = test-components
367
25
test_components.commands = cd tests/autopilot; autopilot run ubuntuuitoolkit
25
test_components.commands = cd tests/autopilot; python3 -m autopilot.run run ubuntuuitoolkit
368
26
test_components.depends = modules/ubuntu-ui-toolkit.pro
26
test_components.depends = modules/ubuntu-ui-toolkit.pro
369
27
QMAKE_EXTRA_TARGETS += test_components
27
QMAKE_EXTRA_TARGETS += test_components
370
28
28
371
29
test_components2.target = test-components2
372
30
test_components2.commands = cd tests/autopilot; python2 -m autopilot.run run ubuntuuitoolkit
373
31
test_components2.depends = modules/ubuntu-ui-toolkit.pro
374
32
QMAKE_EXTRA_TARGETS += test_components2
375
33
376
29
qmluitests.target = qmluitests
34
qmluitests.target = qmluitests
377
30
qmluitests.commands = cd tests/unit_x11; make check
35
qmluitests.commands = cd tests/unit_x11; make check
378
31
qmluitests.depends = modules/ubuntu-ui-toolkit.pro
36
qmluitests.depends = modules/ubuntu-ui-toolkit.pro
Status:	Superseded
Proposed branch:	lp:~kalikiana/ubuntu-ui-toolkit/qmlapicheckverbose
Merge into:	lp:ubuntu-ui-toolkit
Diff against target:	378 lines (+129/-35) 15 files modified components.api (+24/-0) debian/control (+9/-6) debian/rules (+1/-0) debian/ubuntu-ui-toolkit-autopilot.install (+2/-1) run_tests.sh (+2/-2) tests/autopilot/ubuntuuitoolkit/base.py (+3/-2) tests/autopilot/ubuntuuitoolkit/emulators.py (+8/-8) tests/autopilot/ubuntuuitoolkit/fixture_setup.py (+1/-1) tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py (+4/-1) tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py (+6/-1) tests/qmlapicheck.py (+4/-2) tests/qmlapicheck.sh (+52/-0) tests/tests.pro (+5/-2) tests/unit/add_qmlmakecheck.pri (+2/-8) ubuntu-sdk.pro (+6/-1)
To merge this branch:	bzr merge lp:~kalikiana/ubuntu-ui-toolkit/qmlapicheckverbose
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-02-24
Zsombor Egri		2013-09-24	Approve on 2013-12-13
Review via email: mp+187243@code.launchpad.net
1	=== modified file 'components.api'
2	--- components.api 2014-02-24 19:16:26 +0000
3	+++ components.api 2014-03-04 12:39:24 +0000
4	@@ -582,6 +582,12 @@
5	582	modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml	582	modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml
6	583	Item	583	Item
7	584	property bool active	584	property bool active
8			585	modules/Ubuntu/Test/UbuntuTestCase.qml
9			586	TestCase
10			587	function findChild(obj,objectName)
11			588	function findInvisibleChild(obj,objectName)
12			589	function mouseMoveSlowly(item,x,y,dx,dy,steps,stepdelay)
13			590	function tryCompareFunction(func, expectedResult, timeout)
14	585	plugins.qmltypes	591	plugins.qmltypes
15	586	name: "InverseMouseAreaType"	592	name: "InverseMouseAreaType"
16	587	prototype: "QQuickMouseArea"	593	prototype: "QQuickMouseArea"
17	@@ -766,6 +772,24 @@
18	766	Parameter { name: "singular"; type: "string" }	772	Parameter { name: "singular"; type: "string" }
19	767	Parameter { name: "plural"; type: "string" }	773	Parameter { name: "plural"; type: "string" }
20	768	Parameter { name: "n"; type: "int" }	774	Parameter { name: "n"; type: "int" }
21			775	name: "ULConditionalLayout"
22			776	prototype: "QObject"
23			777	exports: ["ConditionalLayout 0.1"]
24			778	Property { name: "name"; type: "string" }
25			779	Property { name: "when"; type: "QQmlBinding"; isPointer: true }
26			780	Property { name: "layout"; type: "QQmlComponent"; isPointer: true }
27			781	name: "ULItemLayout"
28			782	prototype: "QQuickItem"
29			783	exports: ["ItemLayout 0.1"]
30			784	Property { name: "item"; type: "string" }
31			785	name: "ULLayouts"
32			786	prototype: "QQuickItem"
33			787	exports: ["Layouts 0.1"]
34			788	Property { name: "currentLayout"; type: "string"; isReadonly: true }
35			789	Property { name: "layouts"; type: "ULConditionalLayout"; isList: true; isReadonly: true }
36			790	name: "ULLayoutsAttached"
37			791	prototype: "QObject"
38			792	Property { name: "item"; type: "string" }
39	769	name: "UPMCpuUsage"	793	name: "UPMCpuUsage"
40	770	prototype: "QQuickItem"	794	prototype: "QQuickItem"
41	771	exports: ["CpuUsage 0.1"]	795	exports: ["CpuUsage 0.1"]
42	772		796
43	=== modified file 'debian/control'
44	--- debian/control 2014-03-01 12:51:13 +0000
45	+++ debian/control 2014-03-04 12:39:24 +0000
46	@@ -6,6 +6,7 @@
47	6	devscripts,	6	devscripts,
48	7	libgles2-mesa-dev,	7	libgles2-mesa-dev,
49	8	libglib2.0-dev,	8	libglib2.0-dev,
50			9	python3,
51	9	python,	10	python,
52	10	libqt5qml-graphicaleffects \| libqt5graphicaleffects5,	11	libqt5qml-graphicaleffects \| libqt5graphicaleffects5,
53	11	qt5-default,	12	qt5-default,
54	@@ -22,12 +23,12 @@
55	22	qtdeclarative5-qtfeedback-plugin,	23	qtdeclarative5-qtfeedback-plugin,
56	23	qtdeclarative5-unity-action-plugin (>= 1.1.0),	24	qtdeclarative5-unity-action-plugin (>= 1.1.0),
57	24	qtdeclarative5-localstorage-plugin,	25	qtdeclarative5-localstorage-plugin,
64	25	qtdeclarative5-doc-html,	26	qtdeclarative5-doc-html,
65	26	qtwebkit5-doc-html,	27	qtwebkit5-doc-html,
66	27	qtsvg5-doc-html,	28	qtsvg5-doc-html,
67	28	qtscript5-doc-html,	29	qtscript5-doc-html,
68	29	qtmultimedia5-doc-html,	30	qtmultimedia5-doc-html,
69	30	unity-action-doc,	31	unity-action-doc,
70	31	devscripts,	32	devscripts,
71	32	libqt5organizer5,	33	libqt5organizer5,
72	33	qtpim5-dev,	34	qtpim5-dev,
73	@@ -135,6 +136,8 @@
74	135	python-autopilot (>= 1.4),	136	python-autopilot (>= 1.4),
75	136	python-fixtures,	137	python-fixtures,
76	137	python-mock,	138	python-mock,
77			139	python3-fixtures,
78			140	python3-autopilot (>= 1.4),
79	138	ubuntu-ui-toolkit-examples (>= ${source:Version}),	141	ubuntu-ui-toolkit-examples (>= ${source:Version}),
80	139	Description: Test package for Ubuntu UI Toolkit	142	Description: Test package for Ubuntu UI Toolkit
81	140	Autopilot tests for the ubuntu-ui-toolkit package	143	Autopilot tests for the ubuntu-ui-toolkit package
82	141		144
83	=== modified file 'debian/rules'
84	--- debian/rules 2014-03-01 12:51:13 +0000
85	+++ debian/rules 2014-03-04 12:39:24 +0000
86	@@ -11,6 +11,7 @@
87	11	override_dh_auto_test:	11	override_dh_auto_test:
88	12	ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))	12	ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
89	13	mkdir -p debian/tmp/home/run	13	mkdir -p debian/tmp/home/run
90			14	chmod +x tests/xvfb.sh
91	14	tests/xvfb.sh dh_auto_test \|\| exit $?	15	tests/xvfb.sh dh_auto_test \|\| exit $?
92	15	endif	16	endif
93	16		17
94	17		18
95	=== modified file 'debian/ubuntu-ui-toolkit-autopilot.install'
96	--- debian/ubuntu-ui-toolkit-autopilot.install 2013-10-30 11:35:57 +0000
97	+++ debian/ubuntu-ui-toolkit-autopilot.install 2014-03-04 12:39:24 +0000
98	@@ -1,1 +1,2 @@
100	1	usr/lib/python2.7/dist-packages/ubuntuuitoolkit	1	usr/lib/python3
101			2	usr/lib/python2.7
102	2		3
103	=== modified file 'run_tests.sh'
104	--- run_tests.sh 2013-09-26 13:12:49 +0000
105	+++ run_tests.sh 2014-03-04 12:39:24 +0000
106	@@ -21,9 +21,9 @@
107	21		21
108	22	UBUNTU_UI_TOOLKIT_AUTOPILOT_FROM_SOURCE=1	22	UBUNTU_UI_TOOLKIT_AUTOPILOT_FROM_SOURCE=1
109	23	if [ "$1" == "" ]; then	23	if [ "$1" == "" ]; then
111	24	autopilot run ubuntuuitoolkit	24	python3 -m autopilot.run run ubuntuuitoolkit
112	25	else	25	else
114	26	autopilot run -o ../../$1 -f xml -r -rd ../../ ubuntuuitoolkit	26	python3 -m autopilot.run run -o ../../$1 -f xml -r -rd ../../ ubuntuuitoolkit
115	27	fi	27	fi
116	28		28
117	29	exit 0	29	exit 0
118	30		30
119	=== modified file 'tests/autopilot/ubuntuuitoolkit/base.py'
120	--- tests/autopilot/ubuntuuitoolkit/base.py 2013-11-15 05:11:10 +0000
121	+++ tests/autopilot/ubuntuuitoolkit/base.py 2014-03-04 12:39:24 +0000
122	@@ -31,8 +31,9 @@
123	31	# configuration on devices and it seems the environment variable	31	# configuration on devices and it seems the environment variable
124	32	# QT_SELECT=qt5 doesn't work for autopilot tests. --Mirv - 2013-10-03	32	# QT_SELECT=qt5 doesn't work for autopilot tests. --Mirv - 2013-10-03
125	33	arch = subprocess.check_output(	33	arch = subprocess.check_output(
128	34	["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip()	34	["dpkg-architecture", "-qDEB_HOST_MULTIARCH"],
129	35	return '/usr/lib/{}/qt5/bin/qmlscene'.format(arch.decode())	35	universal_newlines=True).strip()
130			36	return '/usr/lib/{}/qt5/bin/qmlscene'.format(arch)
131	36		37
132	37		38
133	38	class UbuntuUIToolkitAppTestCase(testcase.AutopilotTestCase):	39	class UbuntuUIToolkitAppTestCase(testcase.AutopilotTestCase):
134	39		40
135	=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
136	--- tests/autopilot/ubuntuuitoolkit/emulators.py 2014-03-01 12:52:42 +0000
137	+++ tests/autopilot/ubuntuuitoolkit/emulators.py 2014-03-04 12:39:24 +0000
138	@@ -582,7 +582,7 @@
139	582		582
140	583	def _show_more_elements(self, direction):	583	def _show_more_elements(self, direction):
141	584	x, y, width, height = self.globalRect	584	x, y, width, height = self.globalRect
143	585	start_x = stop_x = x + (width / 2)	585	start_x = stop_x = x + (width // 2)
144	586	# Start and stop just a little under the top of the list.	586	# Start and stop just a little under the top of the list.
145	587	top = y + 5	587	top = y + 5
146	588	bottom = y + height - 5	588	bottom = y + height - 5
147	@@ -607,7 +607,7 @@
148	607	def _is_element_clickable(self, objectName):	607	def _is_element_clickable(self, objectName):
149	608	"""Return True if the center of the element is visible."""	608	"""Return True if the center of the element is visible."""
150	609	element = self.select_single(objectName=objectName)	609	element = self.select_single(objectName=objectName)
152	610	element_center = element.globalRect.y + element.globalRect.height / 2	610	element_center = element.globalRect.y + element.globalRect.height // 2
153	611	return (element_center >= self.globalRect.y and	611	return (element_center >= self.globalRect.y and
154	612	element_center <= self.globalRect.y + self.globalRect.height)	612	element_center <= self.globalRect.y + self.globalRect.height)
155	613		613
156	@@ -628,7 +628,7 @@
157	628	@autopilot_logging.log_action(logger.info)	628	@autopilot_logging.log_action(logger.info)
158	629	def swipe_to_delete(self, direction='right'):	629	def swipe_to_delete(self, direction='right'):
159	630	"""Swipe the item in a specific direction."""	630	"""Swipe the item in a specific direction."""
161	631	if (self.removable):	631	if self.removable:
162	632	self._drag_pointing_device_to_delete(direction)	632	self._drag_pointing_device_to_delete(direction)
163	633	if self.confirmRemoval:	633	if self.confirmRemoval:
164	634	self.waitingConfirmationForRemoval.wait_for(True)	634	self.waitingConfirmationForRemoval.wait_for(True)
165	@@ -640,12 +640,12 @@
166	640		640
167	641	def _drag_pointing_device_to_delete(self, direction):	641	def _drag_pointing_device_to_delete(self, direction):
168	642	x, y, w, h = self.globalRect	642	x, y, w, h = self.globalRect
171	643	tx = x + (w / 8)	643	tx = x + (w // 8)
172	644	ty = y + (h / 2)	644	ty = y + (h // 2)
173	645		645
175	646	if (direction == 'right'):	646	if direction == 'right':
176	647	self.pointing_device.drag(tx, ty, w, ty)	647	self.pointing_device.drag(tx, ty, w, ty)
178	648	elif (direction == 'left'):	648	elif direction == 'left':
179	649	self.pointing_device.drag(w - (w*0.1), ty, x, ty)	649	self.pointing_device.drag(w - (w*0.1), ty, x, ty)
180	650	else:	650	else:
181	651	raise ToolkitEmulatorException(	651	raise ToolkitEmulatorException(
182	@@ -663,7 +663,7 @@
183	663	@autopilot_logging.log_action(logger.info)	663	@autopilot_logging.log_action(logger.info)
184	664	def confirm_removal(self):	664	def confirm_removal(self):
185	665	"""Comfirm item removal if this was already swiped."""	665	"""Comfirm item removal if this was already swiped."""
187	666	if (self.waitingConfirmationForRemoval):	666	if self.waitingConfirmationForRemoval:
188	667	deleteButton = self._get_confirm_button()	667	deleteButton = self._get_confirm_button()
189	668	self.pointing_device.click_object(deleteButton)	668	self.pointing_device.click_object(deleteButton)
190	669	self._wait_until_deleted()	669	self._wait_until_deleted()
191	670		670
192	=== modified file 'tests/autopilot/ubuntuuitoolkit/fixture_setup.py'
193	--- tests/autopilot/ubuntuuitoolkit/fixture_setup.py 2014-02-12 09:20:43 +0000
194	+++ tests/autopilot/ubuntuuitoolkit/fixture_setup.py 2014-03-04 12:39:24 +0000
195	@@ -87,7 +87,7 @@
196	87	qmlscene=base.get_qmlscene_launch_command(),	87	qmlscene=base.get_qmlscene_launch_command(),
197	88	qml_file_path=qml_file_path))	88	qml_file_path=qml_file_path))
198	89	desktop_file.write('[Desktop Entry]\n')	89	desktop_file.write('[Desktop Entry]\n')
200	90	for key, value in self._desktop_file_dict.iteritems():	90	for key, value in self._desktop_file_dict.items():
201	91	desktop_file.write('{key}={value}\n'.format(key=key, value=value))	91	desktop_file.write('{key}={value}\n'.format(key=key, value=value))
202	92	desktop_file.close()	92	desktop_file.close()
203	93	return desktop_file.name	93	return desktop_file.name
204	94		94
205	=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
206	--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py 2014-03-01 12:52:15 +0000
207	+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py 2014-03-04 12:39:24 +0000
208	@@ -14,7 +14,6 @@
209	14	# You should have received a copy of the GNU Lesser General Public License	14	# You should have received a copy of the GNU Lesser General Public License
210	15	# along with this program. If not, see <http://www.gnu.org/licenses/>.	15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
211	16		16
212	17	import mock
213	18	import time	17	import time
214	19	import unittest	18	import unittest
215	20		19
216	@@ -22,6 +21,10 @@
217	22	from autopilot import input, platform	21	from autopilot import input, platform
218	23	from autopilot.introspection import dbus	22	from autopilot.introspection import dbus
219	24	from testtools.matchers import GreaterThan, LessThan	23	from testtools.matchers import GreaterThan, LessThan
220			24	try:
221			25	from unittest import mock
222			26	except ImportError:
223			27	import mock
224	25		28
225	26	from ubuntuuitoolkit import emulators, tests	29	from ubuntuuitoolkit import emulators, tests
226	27		30
227	28		31
228	=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py'
229	--- tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py 2014-02-12 18:41:20 +0000
230	+++ tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py 2014-03-04 12:39:24 +0000
231	@@ -16,7 +16,12 @@
232	16		16
233	17	import os	17	import os
234	18		18
236	19	import mock	19	try:
237			20	# Python 3.
238			21	from unittest import mock
239			22	except ImportError:
240			23	# Python 2 add-on: python-mock.
241			24	import mock
242	20	import testtools	25	import testtools
243	21	from autopilot import testcase as autopilot_testcase	26	from autopilot import testcase as autopilot_testcase
244	22	from testtools.matchers import Contains, Not, FileExists	27	from testtools.matchers import Contains, Not, FileExists
245	23		28
246	=== modified file 'tests/qmlapicheck.py'
247	--- tests/qmlapicheck.py 2013-12-11 11:28:29 +0000
248	+++ tests/qmlapicheck.py 2014-03-04 12:39:24 +0000
249	@@ -1,4 +1,4 @@
251	1	#!/usr/bin/env python	1	#!/usr/bin/env python3
252	2	# -- coding: utf-8 --	2	# -- coding: utf-8 --
253	3	#	3	#
254	4	# Copyright 2013 Canonical Ltd.	4	# Copyright 2013 Canonical Ltd.
255	@@ -65,7 +65,9 @@
256	65	fileinput.nextfile()	65	fileinput.nextfile()
257	66		66
258	67	inputfiles.sort()	67	inputfiles.sort()
260	68	for line in fileinput.input(inputfiles):	68
261			69	hook = fileinput.hook_encoded('utf-8')
262			70	for line in fileinput.input(inputfiles, openhook=hook):
263	69	# New file	71	# New file
264	70	if fileinput.isfirstline():	72	if fileinput.isfirstline():
265	71	in_block = 0	73	in_block = 0
266	72		74
267	=== added file 'tests/qmlapicheck.sh'
268	--- tests/qmlapicheck.sh 1970-01-01 00:00:00 +0000
269	+++ tests/qmlapicheck.sh 2014-03-04 12:39:24 +0000
270	@@ -0,0 +1,52 @@
271			1	#!/usr/bin/env sh
272			2	#
273			3	# Copyright 2013 Canonical Ltd.
274			4	#
275			5	# This program is free software; you can redistribute it and/or modify
276			6	# it under the terms of the GNU Lesser General Public License as published by
277			7	# the Free Software Foundation; version 3.
278			8	#
279			9	# This program is distributed in the hope that it will be useful,
280			10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
281			11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
282			12	# GNU Lesser General Public License for more details.
283			13	#
284			14	# You should have received a copy of the GNU Lesser General Public License
285			15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
286			16	#
287			17	################################################################################
288			18	QML="modules/Ubuntu//qmldir modules/Ubuntu/Components/Colors/UbuntuColors.qml modules/Ubuntu/Components//qmldir modules/Ubuntu/Components/Pickers/PickerPanel.qml"
289			19	CPP="Ubuntu.Components Ubuntu.Layouts Ubuntu.PerformanceMetrics"
290			20
291			21	echo Dumping QML API of C++ components
292			22	echo '' > plugins.qmltypes
293			23	for i in $CPP; do
294			24	# Silence spam on stderr due to fonts
295			25	# https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
296			26	# https://bugreports.qt-project.org/browse/QTBUG-36243
297			27	qmlplugindump $i 0.1 modules 2>/dev/null >> plugins.qmltypes
298			28	done
299			29	STATUS=$?
300			30	test $STATUS = 0 \|\| ERRORS=1
301			31	test $STATUS = 0 \|\| echo Error: qmldump failed
302			32
303			33	echo Running QML API check for $QML
304			34	# Palette gets included in Qt 5.2 qmlplugindump even though it's qml
305			35	BUILTINS=QQuick,QQml,U1db::,Palette python3 tests/qmlapicheck.py $QML plugins.qmltypes > components.api.new
306			36	STATUS=$?
307			37	test $STATUS = 0 \|\| ERRORS=1
308			38	test $STATUS = 0 \|\| echo Error: qmlapicheck.py failed
309			39
310			40	echo Verifying the diff between existing and generated API
311			41	diff -Fqml -u components.api components.api.new
312			42	STATUS=$?
313			43	test $STATUS = 0 \|\| ERRORS=1
314			44	test $STATUS = 0 \|\| echo Error: diff mismatched
315			45
316			46	if [ "x$ERRORS" != "x1" ]; then
317			47	echo API is all fine.
318			48	exit 0
319			49	else
320			50	echo API test failed with errors. Did you forget to update components.api?
321			51	exit 1
322			52	fi
323	0		53
324	=== modified file 'tests/tests.pro'
325	--- tests/tests.pro 2013-10-30 11:35:57 +0000
326	+++ tests/tests.pro 2014-03-04 12:39:24 +0000
327	@@ -1,7 +1,10 @@
328	1	TEMPLATE = subdirs	1	TEMPLATE = subdirs
329	2	SUBDIRS += unit unit_x11	2	SUBDIRS += unit unit_x11
330	3		3
332	4	autopilot_module.path = /usr/lib/python2.7/dist-packages/ubuntuuitoolkit	4	autopilot_module.path = /usr/lib/python3/dist-packages/ubuntuuitoolkit
333	5	autopilot_module.files = autopilot/ubuntuuitoolkit/*	5	autopilot_module.files = autopilot/ubuntuuitoolkit/*
334	6		6
336	7	INSTALLS += autopilot_module	7	autopilot2_module.path = /usr/lib/python2.7/dist-packages/ubuntuuitoolkit
337			8	autopilot2_module.files = autopilot/ubuntuuitoolkit/*
338			9
339			10	INSTALLS += autopilot_module autopilot2_module
340	8		11
341	=== modified file 'tests/unit/add_qmlmakecheck.pri'
342	--- tests/unit/add_qmlmakecheck.pri 2014-02-11 12:42:55 +0000
343	+++ tests/unit/add_qmlmakecheck.pri 2014-03-04 12:39:24 +0000
344	@@ -8,11 +8,5 @@
345	8	check.commands += ../../unit/runtest.sh $${TARGET} $${TEST} minimal;	8	check.commands += ../../unit/runtest.sh $${TARGET} $${TEST} minimal;
346	9	}	9	}
347	10	check.commands += cd ../../..;	10	check.commands += cd ../../..;
356	11	# Silence spam on stderr due to fonts	11	check.commands += sh tests/qmlapicheck.sh \|\| exit 1;
357	12	# https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999	12	check.commands += cd tests/unit
350	13	# https://bugreports.qt-project.org/browse/QTBUG-36243
351	14	check.commands += qmlplugindump Ubuntu.Components 0.1 modules 2>/dev/null > plugins.qmltypes;
352	15	check.commands += qmlplugindump Ubuntu.PerformanceMetrics 0.1 modules 2>/dev/null >> plugins.qmltypes;
353	16	# Palette gets included in Qt 5.2 qmlplugindump even though it's qml
354	17	check.commands += BUILTINS=QQuick,QQml,U1db::,Palette python tests/qmlapicheck.py modules/Ubuntu/Components/qmldir modules/Ubuntu/Components/Colors/UbuntuColors.qml modules/Ubuntu/Components/Pickers/PickerPanel.qml modules/Ubuntu/Components/*/qmldir modules/Ubuntu/PerformanceMetrics/qmldir plugins.qmltypes > components.api.new;
355	18	check.commands += diff -Fqml -u components.api components.api.new \|\| exit 1; cd tests/unit
358	19		13
359	=== modified file 'ubuntu-sdk.pro'
360	--- ubuntu-sdk.pro 2013-12-12 13:01:56 +0000
361	+++ ubuntu-sdk.pro 2014-03-04 12:39:24 +0000
362	@@ -22,10 +22,15 @@
363	22	QMAKE_EXTRA_TARGETS += test_api	22	QMAKE_EXTRA_TARGETS += test_api
364	23		23
365	24	test_components.target = test-components	24	test_components.target = test-components
367	25	test_components.commands = cd tests/autopilot; autopilot run ubuntuuitoolkit	25	test_components.commands = cd tests/autopilot; python3 -m autopilot.run run ubuntuuitoolkit
368	26	test_components.depends = modules/ubuntu-ui-toolkit.pro	26	test_components.depends = modules/ubuntu-ui-toolkit.pro
369	27	QMAKE_EXTRA_TARGETS += test_components	27	QMAKE_EXTRA_TARGETS += test_components
370	28		28
371			29	test_components2.target = test-components2
372			30	test_components2.commands = cd tests/autopilot; python2 -m autopilot.run run ubuntuuitoolkit
373			31	test_components2.depends = modules/ubuntu-ui-toolkit.pro
374			32	QMAKE_EXTRA_TARGETS += test_components2
375			33
376	29	qmluitests.target = qmluitests	34	qmluitests.target = qmluitests
377	30	qmluitests.commands = cd tests/unit_x11; make check	35	qmluitests.commands = cd tests/unit_x11; make check
378	31	qmluitests.depends = modules/ubuntu-ui-toolkit.pro	36	qmluitests.depends = modules/ubuntu-ui-toolkit.pro