1
=== modified file 'Dash/Apps/AppPreview.qml'
2
--- Dash/Apps/AppPreview.qml	2013-09-05 10:02:00 +0000
3
+++ Dash/Apps/AppPreview.qml	2013-09-25 19:59:58 +0000
4
@@ -110,6 +110,10 @@
5
110
                onFinished: {
110
                onFinished: {
6
111
                    root.previewData.execute(progressBar.model[0].id, { })
111
                    root.previewData.execute(progressBar.model[0].id, { })
7
112
                }
112
                }
8
113
9
114
                onError: {
10
115
                    root.previewData.execute(progressBar.model[1].id, { "error": error });
11
116
                }
12
113
            }
117
            }
13
114
118
14
115
        }
119
        }
15
116
120
16
=== modified file 'tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp'
17
--- tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp	2013-08-13 08:50:50 +0000
18
+++ tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp	2013-09-25 19:59:58 +0000
19
@@ -63,5 +63,10 @@
20
63
    if(!m_service.isEmpty() && !m_dbusPath.isEmpty()) {
63
    if(!m_service.isEmpty() && !m_dbusPath.isEmpty()) {
21
64
        m_active = true;
64
        m_active = true;
22
65
        Q_EMIT serviceReadyChanged(m_active);
65
        Q_EMIT serviceReadyChanged(m_active);
23
66
        if(m_dbusPath == "finish") {
24
67
            Q_EMIT finished("downloadComplete");
25
68
        }else if(m_dbusPath == "error") {
26
69
            Q_EMIT error("DOWNLOAD ERROR");
27
70
        }
28
66
    }
71
    }
29
67
}
72
}
30
68
73
31
=== modified file 'tests/qmltests/Dash/Apps/tst_AppPreview.qml'
32
--- tests/qmltests/Dash/Apps/tst_AppPreview.qml	2013-08-19 16:55:28 +0000
33
+++ tests/qmltests/Dash/Apps/tst_AppPreview.qml	2013-09-25 19:59:58 +0000
34
@@ -45,6 +45,8 @@
35
45
            ["Unity User", 10, "10/02/2013", root.commentary],
45
            ["Unity User", 10, "10/02/2013", root.commentary],
36
46
        ]
46
        ]
37
47
    }
47
    }
38
48
    QtObject { id: showProgress; property bool value: true }
39
49
    QtObject { id: progressSource; property string value: "service" }
40
48
50
41
49
    QtObject {
51
    QtObject {
42
50
        id: data
52
        id: data
43
@@ -66,8 +68,30 @@
44
66
        ]
68
        ]
45
67
    }
69
    }
46
68
70
47
71
    QtObject {
48
72
        id: dataProgress
49
73
        property string title: "Unity App"
50
74
        property string appIcon: "fake_image.png"
51
75
        property string description: "This is an Application description"
52
76
        property real rating: rating.value
53
77
        property int numRatings: reviews.value
54
78
        property var execute: root.fake_call
55
79
        property var infoMap: {
56
80
            "show_progressbar": showProgress,
57
81
            "more-screenshots": screenshots,
58
82
            "rated": rated,
59
83
            "comments": comments,
60
84
            "progressbar_source": progressSource
61
85
        }
62
86
        property var actions: [
63
87
            { "id": 123, "displayName": "action1" },
64
88
            { "id": 456, "displayName": "action2" },
65
89
            { "id": 789, "displayName": "action3" },
66
90
        ]
67
91
    }
68
92
69
69
    function fake_call(id, data){
93
    function fake_call(id, data){
71
70
        root.calls[root.calls.length] = id;
94
        root.calls[root.calls.length] = [id, data];
72
71
    }
95
    }
73
72
96
74
73
    // The component under test
97
    // The component under test
75
@@ -89,6 +113,7 @@
76
89
            reviewField.focus = false;
113
            reviewField.focus = false;
77
90
            reviewField.text = "";
114
            reviewField.text = "";
78
91
            data.rating = rating.value;
115
            data.rating = rating.value;
79
116
            dataProgress.infoMap["progressbar_source"].value = "service";
80
92
        }
117
        }
81
93
118
82
94
        function test_actions() {
119
        function test_actions() {
83
@@ -102,7 +127,7 @@
84
102
127
85
103
            var actions = data.actions;
128
            var actions = data.actions;
86
104
            for(var i = 0; i < actions.length; i++) {
129
            for(var i = 0; i < actions.length; i++) {
88
105
                compare(root.calls[i], actions[i].id, "Id of action not found.");
130
                compare(root.calls[i][0], actions[i].id, "Id of action not found.");
89
106
            }
131
            }
90
107
        }
132
        }
91
108
133
92
@@ -162,5 +187,31 @@
93
162
            verify(buttons.visible == true);
187
            verify(buttons.visible == true);
94
163
        }
188
        }
95
164
189
96
190
        function test_progress_show() {
97
191
            appPreview.previewData = dataProgress;
98
192
            var progress = findChild(appPreview, "progressBar");
99
193
            verify(progress.visible == true);
100
194
        }
101
195
102
196
        function test_progress_download_finish() {
103
197
            appPreview.previewData = dataProgress;
104
198
            var progress = findChild(appPreview, "progressBar");
105
199
            dataProgress.infoMap["progressbar_source"].value = "finish";
106
200
107
201
            var actions = dataProgress.actions;
108
202
            compare(root.calls[0][0], actions[0].id, "Id of action not found.");
109
203
            compare(root.calls[0][1], {}, "Data of action not found.");
110
204
        }
111
205
112
206
        function test_progress_download_error() {
113
207
            appPreview.previewData = dataProgress;
114
208
            var progress = findChild(appPreview, "progressBar");
115
209
            dataProgress.infoMap["progressbar_source"].value = "error";
116
210
117
211
            var actions = dataProgress.actions;
118
212
            compare(root.calls[0][0], actions[1].id, "Id of action not found.");
119
213
            compare(root.calls[0][1], {"error": "DOWNLOAD ERROR"}, "Data of action not found.");
120
214
        }
121
215
122
165
    }
216
    }
123
166
}
217
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-09-26
Michał Sawicz			Approve on 2013-09-26
Roberto Alsina (community)		2013-09-24	Approve on 2013-09-26
Review via email: mp+187240@code.launchpad.net
1	=== modified file 'Dash/Apps/AppPreview.qml'
2	--- Dash/Apps/AppPreview.qml 2013-09-05 10:02:00 +0000
3	+++ Dash/Apps/AppPreview.qml 2013-09-25 19:59:58 +0000
4	@@ -110,6 +110,10 @@
5	110	onFinished: {	110	onFinished: {
6	111	root.previewData.execute(progressBar.model[0].id, { })	111	root.previewData.execute(progressBar.model[0].id, { })
7	112	}	112	}
8			113
9			114	onError: {
10			115	root.previewData.execute(progressBar.model[1].id, { "error": error });
11			116	}
12	113	}	117	}
13	114		118
14	115	}	119	}
15	116		120
16	=== modified file 'tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp'
17	--- tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp 2013-08-13 08:50:50 +0000
18	+++ tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp 2013-09-25 19:59:58 +0000
19	@@ -63,5 +63,10 @@
20	63	if(!m_service.isEmpty() && !m_dbusPath.isEmpty()) {	63	if(!m_service.isEmpty() && !m_dbusPath.isEmpty()) {
21	64	m_active = true;	64	m_active = true;
22	65	Q_EMIT serviceReadyChanged(m_active);	65	Q_EMIT serviceReadyChanged(m_active);
23			66	if(m_dbusPath == "finish") {
24			67	Q_EMIT finished("downloadComplete");
25			68	}else if(m_dbusPath == "error") {
26			69	Q_EMIT error("DOWNLOAD ERROR");
27			70	}
28	66	}	71	}
29	67	}	72	}
30	68		73
31	=== modified file 'tests/qmltests/Dash/Apps/tst_AppPreview.qml'
32	--- tests/qmltests/Dash/Apps/tst_AppPreview.qml 2013-08-19 16:55:28 +0000
33	+++ tests/qmltests/Dash/Apps/tst_AppPreview.qml 2013-09-25 19:59:58 +0000
34	@@ -45,6 +45,8 @@
35	45	["Unity User", 10, "10/02/2013", root.commentary],	45	["Unity User", 10, "10/02/2013", root.commentary],
36	46	]	46	]
37	47	}	47	}
38			48	QtObject { id: showProgress; property bool value: true }
39			49	QtObject { id: progressSource; property string value: "service" }
40	48		50
41	49	QtObject {	51	QtObject {
42	50	id: data	52	id: data
43	@@ -66,8 +68,30 @@
44	66	]	68	]
45	67	}	69	}
46	68		70
47			71	QtObject {
48			72	id: dataProgress
49			73	property string title: "Unity App"
50			74	property string appIcon: "fake_image.png"
51			75	property string description: "This is an Application description"
52			76	property real rating: rating.value
53			77	property int numRatings: reviews.value
54			78	property var execute: root.fake_call
55			79	property var infoMap: {
56			80	"show_progressbar": showProgress,
57			81	"more-screenshots": screenshots,
58			82	"rated": rated,
59			83	"comments": comments,
60			84	"progressbar_source": progressSource
61			85	}
62			86	property var actions: [
63			87	{ "id": 123, "displayName": "action1" },
64			88	{ "id": 456, "displayName": "action2" },
65			89	{ "id": 789, "displayName": "action3" },
66			90	]
67			91	}
68			92
69	69	function fake_call(id, data){	93	function fake_call(id, data){
71	70	root.calls[root.calls.length] = id;	94	root.calls[root.calls.length] = [id, data];
72	71	}	95	}
73	72		96
74	73	// The component under test	97	// The component under test
75	@@ -89,6 +113,7 @@
76	89	reviewField.focus = false;	113	reviewField.focus = false;
77	90	reviewField.text = "";	114	reviewField.text = "";
78	91	data.rating = rating.value;	115	data.rating = rating.value;
79			116	dataProgress.infoMap["progressbar_source"].value = "service";
80	92	}	117	}
81	93		118
82	94	function test_actions() {	119	function test_actions() {
83	@@ -102,7 +127,7 @@
84	102		127
85	103	var actions = data.actions;	128	var actions = data.actions;
86	104	for(var i = 0; i < actions.length; i++) {	129	for(var i = 0; i < actions.length; i++) {
88	105	compare(root.calls[i], actions[i].id, "Id of action not found.");	130	compare(root.calls[i][0], actions[i].id, "Id of action not found.");
89	106	}	131	}
90	107	}	132	}
91	108		133
92	@@ -162,5 +187,31 @@
93	162	verify(buttons.visible == true);	187	verify(buttons.visible == true);
94	163	}	188	}
95	164		189
96			190	function test_progress_show() {
97			191	appPreview.previewData = dataProgress;
98			192	var progress = findChild(appPreview, "progressBar");
99			193	verify(progress.visible == true);
100			194	}
101			195
102			196	function test_progress_download_finish() {
103			197	appPreview.previewData = dataProgress;
104			198	var progress = findChild(appPreview, "progressBar");
105			199	dataProgress.infoMap["progressbar_source"].value = "finish";
106			200
107			201	var actions = dataProgress.actions;
108			202	compare(root.calls[0][0], actions[0].id, "Id of action not found.");
109			203	compare(root.calls[0][1], {}, "Data of action not found.");
110			204	}
111			205
112			206	function test_progress_download_error() {
113			207	appPreview.previewData = dataProgress;
114			208	var progress = findChild(appPreview, "progressBar");
115			209	dataProgress.infoMap["progressbar_source"].value = "error";
116			210
117			211	var actions = dataProgress.actions;
118			212	compare(root.calls[0][0], actions[1].id, "Id of action not found.");
119			213	compare(root.calls[0][1], {"error": "DOWNLOAD ERROR"}, "Data of action not found.");
120			214	}
121			215
122	165	}	216	}
123	166	}	217	}