1
=== modified file 'cmake/modules/QmlTest.cmake'
2
--- cmake/modules/QmlTest.cmake	2013-04-17 10:14:28 +0000
3
+++ cmake/modules/QmlTest.cmake	2013-04-19 21:00:36 +0000
4
@@ -12,6 +12,7 @@
5
12
# To change/set a default value for the whole test suite, prior to calling add_qml_test, set:
12
# To change/set a default value for the whole test suite, prior to calling add_qml_test, set:
6
13
# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)
13
# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)
7
14
# qmltest_DEFAULT_TARGETS
14
# qmltest_DEFAULT_TARGETS
8
15
# qmltest_DEFAULT_IMPORT_PATHS
9
15
# qmltest_DEFAULT_PROPERTIES
16
# qmltest_DEFAULT_PROPERTIES
10
16
17
11
17
find_program(qmltestrunner_exe qmltestrunner)
18
find_program(qmltestrunner_exe qmltestrunner)
12
@@ -35,6 +36,11 @@
13
35
            list(APPEND qmltestrunner_imports "-import")
36
            list(APPEND qmltestrunner_imports "-import")
14
36
            list(APPEND qmltestrunner_imports ${IMPORT_PATH})
37
            list(APPEND qmltestrunner_imports ${IMPORT_PATH})
15
37
        endforeach(IMPORT_PATH)
38
        endforeach(IMPORT_PATH)
16
39
    elseif(NOT "${qmltest_DEFAULT_IMPORT_PATHS}" STREQUAL "")
17
40
        foreach(IMPORT_PATH ${qmltest_DEFAULT_IMPORT_PATHS})
18
41
            list(APPEND qmltestrunner_imports "-import")
19
42
            list(APPEND qmltestrunner_imports ${IMPORT_PATH})
20
43
        endforeach(IMPORT_PATH)
21
38
    endif()
44
    endif()
22
39
45
23
40
    set(qmltest_command
46
    set(qmltest_command
24
41
47
25
=== modified file 'tests/CMakeLists.txt'
26
--- tests/CMakeLists.txt	2013-04-18 17:20:37 +0000
27
+++ tests/CMakeLists.txt	2013-04-19 21:00:36 +0000
28
@@ -7,3 +7,4 @@
29
7
add_subdirectory(whitespace)
7
add_subdirectory(whitespace)
30
8
add_subdirectory(cleanincludes)
8
add_subdirectory(cleanincludes)
31
9
add_subdirectory(plugins)
9
add_subdirectory(plugins)
32
10
add_subdirectory(utils)
33
10
11
34
=== modified file 'tests/qmltests/CMakeLists.txt'
35
--- tests/qmltests/CMakeLists.txt	2013-04-19 14:51:08 +0000
36
+++ tests/qmltests/CMakeLists.txt	2013-04-19 21:00:36 +0000
37
@@ -9,6 +9,11 @@
38
9
9
39
10
add_subdirectory(plugins)
10
add_subdirectory(plugins)
40
11
11
41
12
set(qmltest_DEFAULT_IMPORT_PATHS
42
13
  ${CMAKE_CURRENT_BINARY_DIR}/plugins
43
14
  ${CMAKE_BINARY_DIR}/tests/utils/modules
44
15
)
45
16
46
12
set(qmltest_DEFAULT_TARGETS qmlunittests qmltests)
17
set(qmltest_DEFAULT_TARGETS qmlunittests qmltests)
47
13
set(qmltest_DEFAULT_NO_ADD_TEST FALSE)
18
set(qmltest_DEFAULT_NO_ADD_TEST FALSE)
48
14
set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
19
set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
49
@@ -21,30 +26,31 @@
50
21
add_qml_test(Components TimeLocal)
26
add_qml_test(Components TimeLocal)
51
22
add_qml_test(Greeter Clock)
27
add_qml_test(Greeter Clock)
52
23
add_qml_test(Panel IndicatorItem)
28
add_qml_test(Panel IndicatorItem)
53
29
add_qml_test(utils/Unity/Test UnityTest)
54
24
30
55
25
set(qmltest_DEFAULT_TARGETS qmluitests qmltests)
31
set(qmltest_DEFAULT_TARGETS qmluitests qmltests)
56
26
set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
32
set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
57
27
set(qmltest_DEFAULT_PROPERTIES "")
33
set(qmltest_DEFAULT_PROPERTIES "")
58
28
add_qml_test(Components DraggingArea)
34
add_qml_test(Components DraggingArea)
60
29
add_qml_test(Components FilterGrid IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
35
add_qml_test(Components FilterGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
61
30
add_qml_test(Components ListViewWithPageHeader)
36
add_qml_test(Components ListViewWithPageHeader)
62
31
add_qml_test(Components ResponsiveFlowView)
37
add_qml_test(Components ResponsiveFlowView)
63
32
add_qml_test(Components ResponsiveGridView)
38
add_qml_test(Components ResponsiveGridView)
64
33
add_qml_test(Components Revealer)
39
add_qml_test(Components Revealer)
65
34
add_qml_test(Components Showable)
40
add_qml_test(Components Showable)
67
35
add_qml_test(Components Stage IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks)
41
add_qml_test(Components Stage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
68
36
add_qml_test(Components Tile)
42
add_qml_test(Components Tile)
69
37
add_qml_test(Components PageHeader)
43
add_qml_test(Components PageHeader)
70
38
add_qml_test(Dash DashPreview)
44
add_qml_test(Dash DashPreview)
71
39
add_qml_test(Dash PeoplePreview)
45
add_qml_test(Dash PeoplePreview)
73
40
add_qml_test(Dash FilterGrids IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins)
46
add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins)
74
41
add_qml_test(Greeter Greeter)
47
add_qml_test(Greeter Greeter)
76
42
add_qml_test(Hud Hud IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins)
48
add_qml_test(Hud Hud)
77
43
add_qml_test(Launcher Launcher)
49
add_qml_test(Launcher Launcher)
81
44
add_qml_test(Panel IndicatorRow IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins)
50
add_qml_test(Panel IndicatorRow)
82
45
add_qml_test(Panel Indicators IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins)
51
add_qml_test(Panel Indicators)
83
46
add_qml_test(Panel MenuContent IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins)
52
add_qml_test(Panel MenuContent)
84
47
add_qml_test(Panel Overview)
53
add_qml_test(Panel Overview)
86
48
add_qml_test(Panel Panel IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins)
54
add_qml_test(Panel Panel)
87
49
add_qml_test(Panel SearchIndicator)
55
add_qml_test(Panel SearchIndicator)
89
50
add_qml_test(SideStage SideStage IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks)
56
add_qml_test(SideStage SideStage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
90
51
57
91
=== modified file 'tests/qmltests/Components/tst_ListViewWithPageHeader.qml'
92
--- tests/qmltests/Components/tst_ListViewWithPageHeader.qml	2013-04-11 15:16:45 +0000
93
+++ tests/qmltests/Components/tst_ListViewWithPageHeader.qml	2013-04-19 21:00:36 +0000
94
@@ -20,6 +20,7 @@
95
20
import "../../../Components"
20
import "../../../Components"
96
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 0.1 as ListItem
97
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 0.1
98
23
import Unity.Test 0.1 as UT
99
23
24
100
24
Item {
25
Item {
101
25
    id: root
26
    id: root
102
@@ -136,7 +137,7 @@
103
136
137
104
137
138
105
138
139
107
139
    UnityTestCase {
140
    UT.UnityTestCase {
108
140
        name: "ListViewWithPageHeader"
141
        name: "ListViewWithPageHeader"
109
141
        when: windowShown
142
        when: windowShown
110
142
143
111
143
144
112
=== modified file 'tests/qmltests/Components/tst_PageHeader.qml'
113
--- tests/qmltests/Components/tst_PageHeader.qml	2013-04-09 12:25:07 +0000
114
+++ tests/qmltests/Components/tst_PageHeader.qml	2013-04-19 21:00:36 +0000
115
@@ -19,12 +19,13 @@
116
19
import ".."
19
import ".."
117
20
import "../../../Components"
20
import "../../../Components"
118
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
119
22
import Unity.Test 0.1 as UT
120
22
23
121
23
Item {
24
Item {
122
24
    width: units.gu(110)
25
    width: units.gu(110)
123
25
    height: units.gu(30)
26
    height: units.gu(30)
124
26
27
126
27
    UnityTestCase {
28
    UT.UnityTestCase {
127
28
        name: "PageHeaderTest"
29
        name: "PageHeaderTest"
128
29
        when: windowShown
30
        when: windowShown
129
30
31
130
31
32
131
=== modified file 'tests/qmltests/Components/tst_ResponsiveFlowView.qml'
132
--- tests/qmltests/Components/tst_ResponsiveFlowView.qml	2013-04-09 09:51:32 +0000
133
+++ tests/qmltests/Components/tst_ResponsiveFlowView.qml	2013-04-19 21:00:36 +0000
134
@@ -20,6 +20,7 @@
135
20
import "../../../Components"
20
import "../../../Components"
136
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 0.1 as ListItem
137
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 0.1
138
23
import Unity.Test 0.1 as UT
139
23
24
140
24
Item {
25
Item {
141
25
    width: flowRect.width + controls.width
26
    width: flowRect.width + controls.width
142
@@ -118,7 +119,7 @@
143
118
        }
119
        }
144
119
    }
120
    }
145
120
121
147
121
    UnityTestCase {
122
    UT.UnityTestCase {
148
122
        name: "ResponsiveFlowView"
123
        name: "ResponsiveFlowView"
149
123
        when: windowShown
124
        when: windowShown
150
124
125
151
125
126
152
=== modified file 'tests/qmltests/Components/tst_ResponsiveGridView.qml'
153
--- tests/qmltests/Components/tst_ResponsiveGridView.qml	2013-04-09 15:52:21 +0000
154
+++ tests/qmltests/Components/tst_ResponsiveGridView.qml	2013-04-19 21:00:36 +0000
155
@@ -20,6 +20,7 @@
156
20
import "../../../Components"
20
import "../../../Components"
157
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 0.1 as ListItem
158
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 0.1
159
23
import Unity.Test 0.1 as UT
160
23
24
161
24
Item {
25
Item {
162
25
    width: gridRect.width + controls.width
26
    width: gridRect.width + controls.width
163
@@ -118,7 +119,7 @@
164
118
        }
119
        }
165
119
    }
120
    }
166
120
121
168
121
    UnityTestCase {
122
    UT.UnityTestCase {
169
122
        name: "ResponsiveGridView"
123
        name: "ResponsiveGridView"
170
123
        when: windowShown
124
        when: windowShown
171
124
125
172
125
126
173
=== modified file 'tests/qmltests/Components/tst_Revealer.qml'
174
--- tests/qmltests/Components/tst_Revealer.qml	2013-04-09 14:49:00 +0000
175
+++ tests/qmltests/Components/tst_Revealer.qml	2013-04-19 21:00:36 +0000
176
@@ -16,6 +16,7 @@
177
16
16
178
17
import QtQuick 2.0
17
import QtQuick 2.0
179
18
import QtTest 1.0
18
import QtTest 1.0
180
19
import Unity.Test 0.1 as UT
181
19
import ".."
20
import ".."
182
20
21
183
21
/*
22
/*
184
@@ -59,7 +60,7 @@
185
59
        direction: Qt.RightToLeft
60
        direction: Qt.RightToLeft
186
60
    }
61
    }
187
61
62
189
62
    UnityTestCase {
63
    UT.UnityTestCase {
190
63
        name: "Revealer"
64
        name: "Revealer"
191
64
        when: windowShown
65
        when: windowShown
192
65
66
193
66
67
194
=== modified file 'tests/qmltests/Components/tst_Showable.qml'
195
--- tests/qmltests/Components/tst_Showable.qml	2013-04-09 14:49:00 +0000
196
+++ tests/qmltests/Components/tst_Showable.qml	2013-04-19 21:00:36 +0000
197
@@ -17,6 +17,7 @@
198
17
import QtQuick 2.0
17
import QtQuick 2.0
199
18
import QtTest 1.0
18
import QtTest 1.0
200
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 0.1
201
20
import Unity.Test 0.1 as UT
202
20
import ".."
21
import ".."
203
21
import "../../../Components"
22
import "../../../Components"
204
22
23
205
@@ -100,7 +101,7 @@
206
100
        }
101
        }
207
101
    }
102
    }
208
102
103
210
103
    UnityTestCase {
104
    UT.UnityTestCase {
211
104
        name: "Showable"
105
        name: "Showable"
212
105
        when: windowShown
106
        when: windowShown
213
106
107
214
107
108
215
=== modified file 'tests/qmltests/Components/tst_Stage.qml'
216
--- tests/qmltests/Components/tst_Stage.qml	2013-04-09 14:49:00 +0000
217
+++ tests/qmltests/Components/tst_Stage.qml	2013-04-19 21:00:36 +0000
218
@@ -19,6 +19,7 @@
219
19
import ".."
19
import ".."
220
20
import "../../../Components"
20
import "../../../Components"
221
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
222
22
import Unity.Test 0.1 as UT
223
22
import "../../../Applications/applications.js" as ApplicationsModel
23
import "../../../Applications/applications.js" as ApplicationsModel
224
23
import "tst_Stage"
24
import "tst_Stage"
225
24
25
226
@@ -190,7 +191,7 @@
227
190
        }
191
        }
228
191
    }
192
    }
229
192
193
231
193
    UnityTestCase {
194
    UT.UnityTestCase {
232
194
        name: "Stage"
195
        name: "Stage"
233
195
        when: windowShown
196
        when: windowShown
234
196
197
235
197
198
236
=== modified file 'tests/qmltests/Components/tst_Tile.qml'
237
--- tests/qmltests/Components/tst_Tile.qml	2013-04-10 09:19:27 +0000
238
+++ tests/qmltests/Components/tst_Tile.qml	2013-04-19 21:00:36 +0000
239
@@ -19,6 +19,7 @@
240
19
import ".."
19
import ".."
241
20
import "../../../Components"
20
import "../../../Components"
242
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
243
22
import Unity.Test 0.1 as UT
244
22
23
245
23
Item {
24
Item {
246
24
    id: root
25
    id: root
247
@@ -36,7 +37,7 @@
248
36
        imageHeight: width
37
        imageHeight: width
249
37
    }
38
    }
250
38
39
252
39
    UnityTestCase {
40
    UT.UnityTestCase {
253
40
        name: "Tile"
41
        name: "Tile"
254
41
        when: windowShown
42
        when: windowShown
255
42
43
256
43
44
257
=== modified file 'tests/qmltests/Dash/tst_DashPreview.qml'
258
--- tests/qmltests/Dash/tst_DashPreview.qml	2013-04-10 09:19:27 +0000
259
+++ tests/qmltests/Dash/tst_DashPreview.qml	2013-04-19 21:00:36 +0000
260
@@ -19,6 +19,7 @@
261
19
import ".."
19
import ".."
262
20
import "../../../Dash"
20
import "../../../Dash"
263
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
264
22
import Unity.Test 0.1 as UT
265
22
23
266
23
Item {
24
Item {
267
24
    id: root
25
    id: root
268
@@ -91,7 +92,7 @@
269
91
        signalName: "previewImageClicked"
92
        signalName: "previewImageClicked"
270
92
    }
93
    }
271
93
94
273
94
    UnityTestCase {
95
    UT.UnityTestCase {
274
95
        name: "DashPreview"
96
        name: "DashPreview"
275
96
        when: windowShown
97
        when: windowShown
276
97
98
277
98
99
278
=== modified file 'tests/qmltests/Dash/tst_FilterGrids.qml'
279
--- tests/qmltests/Dash/tst_FilterGrids.qml	2013-04-18 11:29:52 +0000
280
+++ tests/qmltests/Dash/tst_FilterGrids.qml	2013-04-19 21:00:36 +0000
281
@@ -19,6 +19,7 @@
282
19
import "../../../Dash/Video"
19
import "../../../Dash/Video"
283
20
import Ubuntu.Components.ListItems 0.1 as ListItem
20
import Ubuntu.Components.ListItems 0.1 as ListItem
284
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
285
22
import Unity.Test 0.1 as UT
286
22
import "../"
23
import "../"
287
23
24
288
24
Rectangle {
25
Rectangle {
289
@@ -99,7 +100,7 @@
290
99
        }
100
        }
291
100
    }
101
    }
292
101
102
294
102
    UnityTestCase {
103
    UT.UnityTestCase {
295
103
        id: testCase
104
        id: testCase
296
104
        name: "FilterGrids"
105
        name: "FilterGrids"
297
105
        when: windowShown
106
        when: windowShown
298
106
107
299
=== modified file 'tests/qmltests/Dash/tst_PeoplePreview.qml'
300
--- tests/qmltests/Dash/tst_PeoplePreview.qml	2013-04-11 11:04:15 +0000
301
+++ tests/qmltests/Dash/tst_PeoplePreview.qml	2013-04-19 21:00:36 +0000
302
@@ -19,6 +19,7 @@
303
19
import ".."
19
import ".."
304
20
import "../../../Dash/People"
20
import "../../../Dash/People"
305
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
306
22
import Unity.Test 0.1 as UT
307
22
23
308
23
Item {
24
Item {
309
24
    id: root
25
    id: root
310
@@ -67,7 +68,7 @@
311
67
        signalName: "clicked"
68
        signalName: "clicked"
312
68
    }
69
    }
313
69
70
315
70
    UnityTestCase {
71
    UT.UnityTestCase {
316
71
        id: testCase
72
        id: testCase
317
72
        name: "PeoplePreview"
73
        name: "PeoplePreview"
318
73
        when: windowShown
74
        when: windowShown
319
74
75
320
=== modified file 'tests/qmltests/Greeter/tst_Clock.qml'
321
--- tests/qmltests/Greeter/tst_Clock.qml	2013-04-16 13:31:55 +0000
322
+++ tests/qmltests/Greeter/tst_Clock.qml	2013-04-19 21:00:36 +0000
323
@@ -19,6 +19,7 @@
324
19
import ".."
19
import ".."
325
20
import "../../../Greeter"
20
import "../../../Greeter"
326
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
327
22
import Unity.Test 0.1 as UT
328
22
23
329
23
Rectangle {
24
Rectangle {
330
24
    width: units.gu(60)
25
    width: units.gu(60)
331
@@ -34,7 +35,7 @@
332
34
        }
35
        }
333
35
    }
36
    }
334
36
37
336
37
    UnityTestCase {
38
    UT.UnityTestCase {
337
38
        name: "Clock"
39
        name: "Clock"
338
39
40
339
40
        function test_customDate() {
41
        function test_customDate() {
340
41
42
341
=== modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
342
--- tests/qmltests/Greeter/tst_Greeter.qml	2013-04-10 09:19:27 +0000
343
+++ tests/qmltests/Greeter/tst_Greeter.qml	2013-04-19 21:00:36 +0000
344
@@ -19,6 +19,7 @@
345
19
import ".."
19
import ".."
346
20
import "../../../Greeter"
20
import "../../../Greeter"
347
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
348
22
import Unity.Test 0.1 as UT
349
22
23
350
23
Item {
24
Item {
351
24
    width: units.gu(120)
25
    width: units.gu(120)
352
@@ -41,7 +42,7 @@
353
41
        signalName: "selected"
42
        signalName: "selected"
354
42
    }
43
    }
355
43
44
357
44
    UnityTestCase {
45
    UT.UnityTestCase {
358
45
        name: "Greeter"
46
        name: "Greeter"
359
46
        when: windowShown
47
        when: windowShown
360
47
48
361
48
49
362
=== modified file 'tests/qmltests/Hud/tst_Hud.qml'
363
--- tests/qmltests/Hud/tst_Hud.qml	2013-04-09 14:49:00 +0000
364
+++ tests/qmltests/Hud/tst_Hud.qml	2013-04-19 21:00:36 +0000
365
@@ -19,6 +19,7 @@
366
19
import ".."
19
import ".."
367
20
import "../../../Hud"
20
import "../../../Hud"
368
21
import HudClient 0.1
21
import HudClient 0.1
369
22
import Unity.Test 0.1 as UT
370
22
23
371
23
Hud {
24
Hud {
372
24
    id: hud
25
    id: hud
373
@@ -37,7 +38,7 @@
374
37
        id: hudClientStub
38
        id: hudClientStub
375
38
    }
39
    }
376
39
40
378
40
    UnityTestCase {
41
    UT.UnityTestCase {
379
41
        name: "Hud"
42
        name: "Hud"
380
42
        when: windowShown
43
        when: windowShown
381
43
44
382
44
45
383
=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
384
--- tests/qmltests/Launcher/tst_Launcher.qml	2013-04-09 14:49:00 +0000
385
+++ tests/qmltests/Launcher/tst_Launcher.qml	2013-04-19 21:00:36 +0000
386
@@ -16,6 +16,7 @@
387
16
16
388
17
import QtQuick 2.0
17
import QtQuick 2.0
389
18
import QtTest 1.0
18
import QtTest 1.0
390
19
import Unity.Test 0.1 as UT
391
19
import ".."
20
import ".."
392
20
import "../../../Launcher"
21
import "../../../Launcher"
393
21
import "../../../Applications/applications.js" as ApplicationsModel
22
import "../../../Applications/applications.js" as ApplicationsModel
394
@@ -54,7 +55,7 @@
395
54
        }
55
        }
396
55
    }
56
    }
397
56
57
399
57
    UnityTestCase {
58
    UT.UnityTestCase {
400
58
        id: testCase
59
        id: testCase
401
59
        name: "Launcher"
60
        name: "Launcher"
402
60
        when: windowShown
61
        when: windowShown
403
61
62
404
=== modified file 'tests/qmltests/Panel/tst_IndicatorItem.qml'
405
--- tests/qmltests/Panel/tst_IndicatorItem.qml	2013-04-16 13:31:55 +0000
406
+++ tests/qmltests/Panel/tst_IndicatorItem.qml	2013-04-19 21:00:36 +0000
407
@@ -19,6 +19,7 @@
408
19
import ".."
19
import ".."
409
20
import "../../../Panel"
20
import "../../../Panel"
410
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
411
22
import Unity.Test 0.1 as UT
412
22
23
413
23
Rectangle {
24
Rectangle {
414
24
    width: units.gu(10)
25
    width: units.gu(10)
415
@@ -32,7 +33,7 @@
416
32
        label: "Clock"
33
        label: "Clock"
417
33
    }
34
    }
418
34
35
420
35
    UnityTestCase {
36
    UT.UnityTestCase {
421
36
        name: "IndicatorItem"
37
        name: "IndicatorItem"
422
37
38
423
38
        function init_test() {
39
        function init_test() {
424
39
40
425
=== modified file 'tests/qmltests/Panel/tst_IndicatorRow.qml'
426
--- tests/qmltests/Panel/tst_IndicatorRow.qml	2013-04-12 10:51:20 +0000
427
+++ tests/qmltests/Panel/tst_IndicatorRow.qml	2013-04-19 21:00:36 +0000
428
@@ -16,6 +16,7 @@
429
16
16
430
17
import QtQuick 2.0
17
import QtQuick 2.0
431
18
import QtTest 1.0
18
import QtTest 1.0
432
19
import Unity.Test 0.1 as UT
433
19
import ".."
20
import ".."
434
20
import "../../../Panel"
21
import "../../../Panel"
435
21
import Ubuntu.ChewieUI 0.1 as ChewieUI
22
import Ubuntu.ChewieUI 0.1 as ChewieUI
436
@@ -54,7 +55,7 @@
437
54
        id: indicatorModel
55
        id: indicatorModel
438
55
    }
56
    }
439
56
57
441
57
    UnityTestCase {
58
    UT.UnityTestCase {
442
58
        name: "IndicatorRow"
59
        name: "IndicatorRow"
443
59
        when: windowShown
60
        when: windowShown
444
60
61
445
@@ -71,7 +72,7 @@
446
71
        }
72
        }
447
72
    }
73
    }
448
73
74
450
74
    UnityTestCase {
75
    UT.UnityTestCase {
451
75
        name: "IndicatorRow_IconPosition"
76
        name: "IndicatorRow_IconPosition"
452
76
        when: windowShown
77
        when: windowShown
453
77
78
454
@@ -93,7 +94,7 @@
455
93
        }
94
        }
456
94
    }
95
    }
457
95
96
459
96
    UnityTestCase {
97
    UT.UnityTestCase {
460
97
        name: "IndicatorRow_Highlight"
98
        name: "IndicatorRow_Highlight"
461
98
        when: windowShown
99
        when: windowShown
462
99
100
463
@@ -167,7 +168,7 @@
464
167
        }
168
        }
465
168
    }
169
    }
466
169
170
468
170
    UnityTestCase {
171
    UT.UnityTestCase {
469
171
        name: "IndicatorRow_Dimmed"
172
        name: "IndicatorRow_Dimmed"
470
172
        when: windowShown
173
        when: windowShown
471
173
174
472
174
175
473
=== modified file 'tests/qmltests/Panel/tst_Indicators.qml'
474
--- tests/qmltests/Panel/tst_Indicators.qml	2013-04-10 09:45:49 +0000
475
+++ tests/qmltests/Panel/tst_Indicators.qml	2013-04-19 21:00:36 +0000
476
@@ -16,6 +16,7 @@
477
16
16
478
17
import QtQuick 2.0
17
import QtQuick 2.0
479
18
import QtTest 1.0
18
import QtTest 1.0
480
19
import Unity.Test 0.1 as UT
481
19
import ".."
20
import ".."
482
20
import "../../../Panel"
21
import "../../../Panel"
483
21
import "../../../Components"
22
import "../../../Components"
484
@@ -93,7 +94,7 @@
485
93
        }
94
        }
486
94
    }
95
    }
487
95
96
489
96
    UnityTestCase {
97
    UT.UnityTestCase {
490
97
        name: "Indicators"
98
        name: "Indicators"
491
98
        when: windowShown
99
        when: windowShown
492
99
100
493
100
101
494
=== modified file 'tests/qmltests/Panel/tst_MenuContent.qml'
495
--- tests/qmltests/Panel/tst_MenuContent.qml	2013-04-12 10:51:20 +0000
496
+++ tests/qmltests/Panel/tst_MenuContent.qml	2013-04-19 21:00:36 +0000
497
@@ -16,6 +16,7 @@
498
16
16
499
17
import QtQuick 2.0
17
import QtQuick 2.0
500
18
import QtTest 1.0
18
import QtTest 1.0
501
19
import Unity.Test 0.1 as UT
502
19
import ".."
20
import ".."
503
20
import "../../../Panel"
21
import "../../../Panel"
504
21
import Ubuntu.ChewieUI 0.1 as ChewieUI
22
import Ubuntu.ChewieUI 0.1 as ChewieUI
505
@@ -143,7 +144,7 @@
506
143
        return menu.parent == current_loader;
144
        return menu.parent == current_loader;
507
144
    }
145
    }
508
145
146
510
146
    UnityTestCase {
147
    UT.UnityTestCase {
511
147
        id: menu_content_test
148
        id: menu_content_test
512
148
        name: "MenuContentTest"
149
        name: "MenuContentTest"
513
149
        when: windowShown
150
        when: windowShown
514
150
151
515
=== modified file 'tests/qmltests/Panel/tst_Overview.qml'
516
--- tests/qmltests/Panel/tst_Overview.qml	2013-04-12 20:16:47 +0000
517
+++ tests/qmltests/Panel/tst_Overview.qml	2013-04-19 21:00:36 +0000
518
@@ -19,6 +19,7 @@
519
19
import ".."
19
import ".."
520
20
import "../../../Panel/Menus"
20
import "../../../Panel/Menus"
521
21
import "../../../Components"
21
import "../../../Components"
522
22
import Unity.Test 0.1 as UT
523
22
23
524
23
Rectangle {
24
Rectangle {
525
24
    id: shell
25
    id: shell
526
@@ -61,7 +62,7 @@
527
61
        signalName: "menuSelected"
62
        signalName: "menuSelected"
528
62
    }
63
    }
529
63
64
531
64
    UnityTestCase {
65
    UT.UnityTestCase {
532
65
        name: "Overview"
66
        name: "Overview"
533
66
        when: windowShown
67
        when: windowShown
534
67
68
535
68
69
536
=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
537
--- tests/qmltests/Panel/tst_Panel.qml	2013-04-09 18:02:40 +0000
538
+++ tests/qmltests/Panel/tst_Panel.qml	2013-04-19 21:00:36 +0000
539
@@ -16,6 +16,7 @@
540
16
16
541
17
import QtQuick 2.0
17
import QtQuick 2.0
542
18
import QtTest 1.0
18
import QtTest 1.0
543
19
import Unity.Test 0.1 as UT
544
19
import ".."
20
import ".."
545
20
import "../../../Panel"
21
import "../../../Panel"
546
21
import Ubuntu.ChewieUI 0.1 as ChewieUI
22
import Ubuntu.ChewieUI 0.1 as ChewieUI
547
@@ -42,7 +43,7 @@
548
42
        anchors.fill: parent
43
        anchors.fill: parent
549
43
    }
44
    }
550
44
45
552
45
    UnityTestCase {
46
    UT.UnityTestCase {
553
46
        name: "Panel"
47
        name: "Panel"
554
47
        when: windowShown
48
        when: windowShown
555
48
49
556
49
50
557
=== modified file 'tests/qmltests/Panel/tst_SearchIndicator.qml'
558
--- tests/qmltests/Panel/tst_SearchIndicator.qml	2013-04-09 14:49:00 +0000
559
+++ tests/qmltests/Panel/tst_SearchIndicator.qml	2013-04-19 21:00:36 +0000
560
@@ -19,6 +19,7 @@
561
19
import ".."
19
import ".."
562
20
import "../../../Panel"
20
import "../../../Panel"
563
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
564
22
import Unity.Test 0.1 as UT
565
22
23
566
23
Item {
24
Item {
567
24
    width: units.gu(9)
25
    width: units.gu(9)
568
@@ -35,7 +36,7 @@
569
35
        anchors.fill: parent
36
        anchors.fill: parent
570
36
    }
37
    }
571
37
38
573
38
    UnityTestCase {
39
    UT.UnityTestCase {
574
39
        name: "SearchIndicator"
40
        name: "SearchIndicator"
575
40
        when: windowShown
41
        when: windowShown
576
41
42
577
42
43
578
=== modified file 'tests/qmltests/SideStage/tst_SideStage.qml'
579
--- tests/qmltests/SideStage/tst_SideStage.qml	2013-04-16 13:31:55 +0000
580
+++ tests/qmltests/SideStage/tst_SideStage.qml	2013-04-19 21:00:36 +0000
581
@@ -16,11 +16,12 @@
582
16
16
583
17
import QtQuick 2.0
17
import QtQuick 2.0
584
18
import QtTest 1.0
18
import QtTest 1.0
585
19
import Unity.Test 0.1 as UT
586
19
import ".."
20
import ".."
587
20
import "../../../SideStage"
21
import "../../../SideStage"
588
21
import Ubuntu.Components 0.1
22
import Ubuntu.Components 0.1
589
22
23
591
23
UnityTestCase {
24
UT.UnityTestCase {
592
24
    name: "SideStage"
25
    name: "SideStage"
593
25
26
594
26
    SideStage {
27
    SideStage {
595
27
28
596
=== added directory 'tests/qmltests/utils'
597
=== added directory 'tests/qmltests/utils/Unity'
598
=== added directory 'tests/qmltests/utils/Unity/Test'
599
=== added file 'tests/qmltests/utils/Unity/Test/tst_UnityTest.qml'
600
--- tests/qmltests/utils/Unity/Test/tst_UnityTest.qml	1970-01-01 00:00:00 +0000
601
+++ tests/qmltests/utils/Unity/Test/tst_UnityTest.qml	2013-04-19 21:00:36 +0000
602
@@ -0,0 +1,51 @@
603
1
/*
604
2
 * Copyright (C) 2012, 2013 Canonical, Ltd.
605
3
 *
606
4
 * This program is free software; you can redistribute it and/or modify
607
5
 * it under the terms of the GNU General Public License as published by
608
6
 * the Free Software Foundation; version 3.
609
7
 *
610
8
 * This program is distributed in the hope that it will be useful,
611
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
612
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
613
11
 * GNU General Public License for more details.
614
12
 *
615
13
 * You should have received a copy of the GNU General Public License
616
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
617
15
 */
618
16
619
17
620
18
import QtQuick 2.0
621
19
import QtTest 1.0
622
20
import Unity.Test 0.1
623
21
624
22
TestCase {
625
23
    Rectangle {
626
24
        id: rect
627
25
    }
628
26
629
27
    // Singletons need to be bound to a property and not-named-imported
630
28
    // for them to be able to be properly passed back to C++.
631
29
    // See https://bugreports.qt-project.org/browse/QTBUG-30730
632
30
    property var util: Util
633
31
634
32
    function test_direct() {
635
33
        compare(Util.isInstanceOf(rect, "QQuickRectangle"), true, "rect should be an instance of QQuickRectangle");
636
34
        compare(Util.isInstanceOf(util, "TestUtil"), true, "Util should be an instance of TestUtil");
637
35
    }
638
36
639
37
    function test_inherited() {
640
38
        compare(Util.isInstanceOf(rect, "QQuickItem"), true, "rect should be an instance of QQuickItem");
641
39
        compare(Util.isInstanceOf(rect, "QObject"), true, "rect should be an instance of QObject");
642
40
        compare(Util.isInstanceOf(util, "QObject"), true, "Util should be an instance of QObject");
643
41
    }
644
42
645
43
    function test_negative() {
646
44
        compare(Util.isInstanceOf(rect, "QQuickMouseArea"), false, "rect should not be an instance of MouseArea");
647
45
        compare(Util.isInstanceOf(util, "QQuickItem"), false, "Util should not be an instance of QQuickItem");
648
46
    }
649
47
650
48
    function test_undefined() {
651
49
        compare(Util.isInstanceOf(undefined, "QObject"), false, "passing undefined should fail");
652
50
    }
653
51
}
654
0
52
655
=== added directory 'tests/utils'
656
=== added file 'tests/utils/CMakeLists.txt'
657
--- tests/utils/CMakeLists.txt	1970-01-01 00:00:00 +0000
658
+++ tests/utils/CMakeLists.txt	2013-04-19 21:00:36 +0000
659
@@ -0,0 +1,1 @@
660
1
add_subdirectory(modules)
661
0
2
662
=== added directory 'tests/utils/modules'
663
=== added file 'tests/utils/modules/CMakeLists.txt'
664
--- tests/utils/modules/CMakeLists.txt	1970-01-01 00:00:00 +0000
665
+++ tests/utils/modules/CMakeLists.txt	2013-04-19 21:00:36 +0000
666
@@ -0,0 +1,1 @@
667
1
add_subdirectory(Unity)
668
0
2
669
=== added directory 'tests/utils/modules/Unity'
670
=== added file 'tests/utils/modules/Unity/CMakeLists.txt'
671
--- tests/utils/modules/Unity/CMakeLists.txt	1970-01-01 00:00:00 +0000
672
+++ tests/utils/modules/Unity/CMakeLists.txt	2013-04-19 21:00:36 +0000
673
@@ -0,0 +1,1 @@
674
1
add_subdirectory(Test)
675
0
2
676
=== added directory 'tests/utils/modules/Unity/Test'
677
=== added file 'tests/utils/modules/Unity/Test/CMakeLists.txt'
678
--- tests/utils/modules/Unity/Test/CMakeLists.txt	1970-01-01 00:00:00 +0000
679
+++ tests/utils/modules/Unity/Test/CMakeLists.txt	2013-04-19 21:00:36 +0000
680
@@ -0,0 +1,21 @@
681
1
find_package(Qt5Core REQUIRED)
682
2
find_package(Qt5Quick REQUIRED)
683
3
684
4
set(CMAKE_AUTOMOC ON)
685
5
add_definitions(-DQT_NO_KEYWORDS)
686
6
687
7
set(UnityTestQML_SOURCES
688
8
    testutil.cpp
689
9
    plugin.cpp
690
10
)
691
11
692
12
add_library(UnityTestQml MODULE ${UnityTestQML_SOURCES})
693
13
694
14
qt5_use_modules(UnityTestQml Core Quick)
695
15
696
16
# copy qmldir file into build directory for shadow builds
697
17
file(GLOB QML_JS_FILES *.js *.qml)
698
18
699
19
file(COPY qmldir ${QML_JS_FILES}
700
20
    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
701
21
    )
702
0
22
703
=== renamed file 'tests/qmltests/UnityTestCase.qml' => 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
704
=== added file 'tests/utils/modules/Unity/Test/plugin.cpp'
705
--- tests/utils/modules/Unity/Test/plugin.cpp	1970-01-01 00:00:00 +0000
706
+++ tests/utils/modules/Unity/Test/plugin.cpp	2013-04-19 21:00:36 +0000
707
@@ -0,0 +1,33 @@
708
1
/*
709
2
 * Copyright (C) 2012, 2013 Canonical, Ltd.
710
3
 *
711
4
 * This program is free software; you can redistribute it and/or modify
712
5
 * it under the terms of the GNU General Public License as published by
713
6
 * the Free Software Foundation; version 3.
714
7
 *
715
8
 * This program is distributed in the hope that it will be useful,
716
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
717
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
718
11
 * GNU General Public License for more details.
719
12
 *
720
13
 * You should have received a copy of the GNU General Public License
721
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
722
15
 */
723
16
724
17
725
18
#include "plugin.h"
726
19
#include "testutil.h"
727
20
728
21
#include <qqml.h>
729
22
730
23
static QObject *testutil_provider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
731
24
{
732
25
    return new TestUtil();
733
26
}
734
27
735
28
void UnityTestPlugin::registerTypes(const char *uri)
736
29
{
737
30
    Q_ASSERT(QLatin1String(uri) == QLatin1String("Unity.Test"));
738
31
    // @uri Unity.Test
739
32
    qmlRegisterSingletonType<TestUtil>(uri, 0, 1, "Util", testutil_provider);
740
33
}
741
0
34
742
=== added file 'tests/utils/modules/Unity/Test/plugin.h'
743
--- tests/utils/modules/Unity/Test/plugin.h	1970-01-01 00:00:00 +0000
744
+++ tests/utils/modules/Unity/Test/plugin.h	2013-04-19 21:00:36 +0000
745
@@ -0,0 +1,32 @@
746
1
/*
747
2
 * Copyright (C) 2012, 2013 Canonical, Ltd.
748
3
 *
749
4
 * This program is free software; you can redistribute it and/or modify
750
5
 * it under the terms of the GNU General Public License as published by
751
6
 * the Free Software Foundation; version 3.
752
7
 *
753
8
 * This program is distributed in the hope that it will be useful,
754
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
755
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
756
11
 * GNU General Public License for more details.
757
12
 *
758
13
 * You should have received a copy of the GNU General Public License
759
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
760
15
 */
761
16
762
17
763
18
#ifndef UNITY_TEST_PLUGIN_H
764
19
#define UNITY_TEST_PLUGIN_H
765
20
766
21
#include <QQmlExtensionPlugin>
767
22
768
23
class UnityTestPlugin : public QQmlExtensionPlugin
769
24
{
770
25
    Q_OBJECT
771
26
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
772
27
773
28
public:
774
29
    void registerTypes(const char *uri);
775
30
};
776
31
777
32
#endif // UNITY_TEST_PLUGIN_H
778
0
33
779
=== added file 'tests/utils/modules/Unity/Test/qmldir'
780
--- tests/utils/modules/Unity/Test/qmldir	1970-01-01 00:00:00 +0000
781
+++ tests/utils/modules/Unity/Test/qmldir	2013-04-19 21:00:36 +0000
782
@@ -0,0 +1,3 @@
783
1
module Unity.Test
784
2
plugin UnityTestQml
785
3
UnityTestCase 0.1 UnityTestCase.qml
786
0
4
787
=== added file 'tests/utils/modules/Unity/Test/testutil.cpp'
788
--- tests/utils/modules/Unity/Test/testutil.cpp	1970-01-01 00:00:00 +0000
789
+++ tests/utils/modules/Unity/Test/testutil.cpp	2013-04-19 21:00:36 +0000
790
@@ -0,0 +1,36 @@
791
1
/*
792
2
 * Copyright (C) 2012, 2013 Canonical, Ltd.
793
3
 *
794
4
 * This program is free software; you can redistribute it and/or modify
795
5
 * it under the terms of the GNU General Public License as published by
796
6
 * the Free Software Foundation; version 3.
797
7
 *
798
8
 * This program is distributed in the hope that it will be useful,
799
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
800
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
801
11
 * GNU General Public License for more details.
802
12
 *
803
13
 * You should have received a copy of the GNU General Public License
804
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
805
15
 */
806
16
807
17
808
18
#include "testutil.h"
809
19
810
20
#include <QDebug>
811
21
812
22
TestUtil::TestUtil(QObject *parent)
813
23
:   QObject(parent)
814
24
{
815
25
}
816
26
817
27
TestUtil::~TestUtil()
818
28
{
819
29
}
820
30
821
31
bool
822
32
TestUtil::isInstanceOf(QObject *obj, QString name)
823
33
{
824
34
    if (!obj) return false;
825
35
    return obj->metaObject()->className() == name || obj->inherits(name.toUtf8());
826
36
}
827
0
37
828
=== added file 'tests/utils/modules/Unity/Test/testutil.h'
829
--- tests/utils/modules/Unity/Test/testutil.h	1970-01-01 00:00:00 +0000
830
+++ tests/utils/modules/Unity/Test/testutil.h	2013-04-19 21:00:36 +0000
831
@@ -0,0 +1,38 @@
832
1
/*
833
2
 * Copyright (C) 2012, 2013 Canonical, Ltd.
834
3
 *
835
4
 * This program is free software; you can redistribute it and/or modify
836
5
 * it under the terms of the GNU General Public License as published by
837
6
 * the Free Software Foundation; version 3.
838
7
 *
839
8
 * This program is distributed in the hope that it will be useful,
840
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
841
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
842
11
 * GNU General Public License for more details.
843
12
 *
844
13
 * You should have received a copy of the GNU General Public License
845
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
846
15
 */
847
16
848
17
849
18
#ifndef TESTUTIL_H
850
19
#define TESTUTIL_H
851
20
852
21
#include <QtQuick/QQuickItem>
853
22
854
23
class TestUtil : public QObject
855
24
{
856
25
    Q_OBJECT
857
26
    Q_DISABLE_COPY(TestUtil)
858
27
859
28
public:
860
29
    TestUtil(QObject *parent = 0);
861
30
    ~TestUtil();
862
31
863
32
    Q_INVOKABLE bool isInstanceOf(QObject*, QString);
864
33
};
865
34
866
35
QML_DECLARE_TYPE(TestUtil)
867
36
868
37
#endif // TESTUTIL_H
869
38
870
0
39
871
=== modified file 'unity.qmlproject'
872
--- unity.qmlproject	2013-03-22 12:01:20 +0000
873
+++ unity.qmlproject	2013-04-19 21:00:36 +0000
874
@@ -16,5 +16,9 @@
875
16
        directory: "."
16
        directory: "."
876
17
    }
17
    }
877
18
    /* List of plugin directories passed to QML runtime */
18
    /* List of plugin directories passed to QML runtime */
879
19
    importPaths: [ "plugins" ]
19
    importPaths: [
880
20
        "builddir/plugins",
881
21
        "builddir/tests/plugins",
882
22
        "builddir/tests/utils/modules"
883
23
    ]
884
20
}
24
}
Status:	Merged
Approved by:	Albert Astals Cid on 2013-04-22
Approved revision:	no longer in the source branch.
Merged at revision:	614
Proposed branch:	lp:~saviq/unity/phablet.unity-test-module
Merge into:	lp:unity/phablet
Diff against target:	884 lines (+293/-36) 37 files modified cmake/modules/QmlTest.cmake (+6/-0) tests/CMakeLists.txt (+1/-0) tests/qmltests/CMakeLists.txt (+15/-9) tests/qmltests/Components/tst_ListViewWithPageHeader.qml (+2/-1) tests/qmltests/Components/tst_PageHeader.qml (+2/-1) tests/qmltests/Components/tst_ResponsiveFlowView.qml (+2/-1) tests/qmltests/Components/tst_ResponsiveGridView.qml (+2/-1) tests/qmltests/Components/tst_Revealer.qml (+2/-1) tests/qmltests/Components/tst_Showable.qml (+2/-1) tests/qmltests/Components/tst_Stage.qml (+2/-1) tests/qmltests/Components/tst_Tile.qml (+2/-1) tests/qmltests/Dash/tst_DashPreview.qml (+2/-1) tests/qmltests/Dash/tst_FilterGrids.qml (+2/-1) tests/qmltests/Dash/tst_PeoplePreview.qml (+2/-1) tests/qmltests/Greeter/tst_Clock.qml (+2/-1) tests/qmltests/Greeter/tst_Greeter.qml (+2/-1) tests/qmltests/Hud/tst_Hud.qml (+2/-1) tests/qmltests/Launcher/tst_Launcher.qml (+2/-1) tests/qmltests/Panel/tst_IndicatorItem.qml (+2/-1) tests/qmltests/Panel/tst_IndicatorRow.qml (+5/-4) tests/qmltests/Panel/tst_Indicators.qml (+2/-1) tests/qmltests/Panel/tst_MenuContent.qml (+2/-1) tests/qmltests/Panel/tst_Overview.qml (+2/-1) tests/qmltests/Panel/tst_Panel.qml (+2/-1) tests/qmltests/Panel/tst_SearchIndicator.qml (+2/-1) tests/qmltests/SideStage/tst_SideStage.qml (+2/-1) tests/qmltests/utils/Unity/Test/tst_UnityTest.qml (+51/-0) tests/utils/CMakeLists.txt (+1/-0) tests/utils/modules/CMakeLists.txt (+1/-0) tests/utils/modules/Unity/CMakeLists.txt (+1/-0) tests/utils/modules/Unity/Test/CMakeLists.txt (+21/-0) tests/utils/modules/Unity/Test/plugin.cpp (+33/-0) tests/utils/modules/Unity/Test/plugin.h (+32/-0) tests/utils/modules/Unity/Test/qmldir (+3/-0) tests/utils/modules/Unity/Test/testutil.cpp (+36/-0) tests/utils/modules/Unity/Test/testutil.h (+38/-0) unity.qmlproject (+5/-1)
To merge this branch:	bzr merge lp:~saviq/unity/phablet.unity-test-module
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2013-04-17	Approve on 2013-04-22
PS Jenkins bot (community)	continuous-integration		Approve on 2013-04-22
Review via email: mp+159410@code.launchpad.net