git.iko.soy/unity8
on xenial help sign in
Added alarm/event tests. Fixed TimeFormatter
c54542cNick Dedekind
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+69−21
compare with xenial
unifiedsplit
@@ -89,6 +89,8 @@ Item {
89 { tag: 'progress', type: "com.canonical.indicator.progress", objectName: "progressMenu" },
89 { tag: 'progress', type: "com.canonical.indicator.progress", objectName: "progressMenu" },
90 { tag: 'slider1', type: "com.canonical.indicator.slider", objectName: "sliderMenu" },
90 { tag: 'slider1', type: "com.canonical.indicator.slider", objectName: "sliderMenu" },
91 { tag: 'switch2', type: "com.canonical.indicator.switch", objectName: "switchMenu" },
91 { tag: 'switch2', type: "com.canonical.indicator.switch", objectName: "switchMenu" },
92+ { tag: 'alarm', type: "com.canonical.indicator.alarm", objectName: "alarmMenu" },
93+ { tag: 'appointment', type: "com.canonical.indicator.appointment", objectName: "appointmentMenu" },
92
94
93 { tag: 'messageItem', type: "com.canonical.indicator.messages.messageitem", objectName: "messageItem" },
95 { tag: 'messageItem', type: "com.canonical.indicator.messages.messageitem", objectName: "messageItem" },
94 { tag: 'sourceItem', type: "com.canonical.indicator.messages.sourceitem", objectName: "groupedMessage" },
96 { tag: 'sourceItem', type: "com.canonical.indicator.messages.sourceitem", objectName: "groupedMessage" },
@@ -115,15 +117,15 @@ Item {
115 compare(loader.item.objectName, data.objectName, "Created object name does not match intended object (" + loader.item.objectName + " != " + data.objectName + ")");
117 compare(loader.item.objectName, data.objectName, "Created object name does not match intended object (" + loader.item.objectName + " != " + data.objectName + ")");
116 }
118 }
117
119
118−// function test_create_checkable() {
120+ function test_create_checkable() {
119−// var tmpData = menuData;
121+ var tmpData = menuData;
120−// tmpData.isCheck = true;
122+ tmpData.isCheck = true;
121
123
122−// loader.data = tmpData;
124+ loader.data = tmpData;
123−// loader.sourceComponent = factory.load(tmpData);
125+ loader.sourceComponent = factory.load(tmpData);
124−// tryCompareFunction(function() { return loader.item != undefined; }, true);
126+ tryCompareFunction(function() { return loader.item != undefined; }, true);
125−// compare(loader.item.objectName, "checkableMenu", "Should have created a checkable menu");
127+ compare(loader.item.objectName, "checkableMenu", "Should have created a checkable menu");
126−// }
128+ }
127
129
128 function test_create_radio() {
130 function test_create_radio() {
129 skip("No radio component");
131 skip("No radio component");
@@ -173,7 +175,7 @@ Item {
173 compare(loader.item.maxIcon, "file:///testMaxIcon", "MaxIcon does not match data");
175 compare(loader.item.maxIcon, "file:///testMaxIcon", "MaxIcon does not match data");
174 compare(loader.item.minimumValue, data.minValue, "MinValue does not match data");
176 compare(loader.item.minimumValue, data.minValue, "MinValue does not match data");
175 compare(loader.item.maximumValue, data.maxValue, "MaxValue does not match data");
177 compare(loader.item.maximumValue, data.maxValue, "MaxValue does not match data");
176− compare(loader.item.value, data.value, "Calue does not match data");
178+ compare(loader.item.value, data.value, "Value does not match data");
177 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
179 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
178 }
180 }
179
181
@@ -242,7 +244,7 @@ Item {
242
244
243 function test_create_standardMenu_data() {
245 function test_create_standardMenu_data() {
244 return [
246 return [
245− {label: "testLabel1", enabled: true, icon: "file:///testIcon" },
247+ {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },
246 {label: "testLabel2", enabled: false, icon: "file:///testIcon2"},
248 {label: "testLabel2", enabled: false, icon: "file:///testIcon2"},
247 ];
249 ];
248 }
250 }
@@ -280,7 +282,7 @@ Item {
280 loader.data = menuData;
282 loader.data = menuData;
281 loader.sourceComponent = factory.load(menuData);
283 loader.sourceComponent = factory.load(menuData);
282 tryCompareFunction(function() { return loader.item != undefined; }, true);
284 tryCompareFunction(function() { return loader.item != undefined; }, true);
283− compare(loader.item.objectName, "checkableMenu", "Should have created a standard menu");
285+ compare(loader.item.objectName, "checkableMenu", "Should have created a checkable menu");
284
286
285 compare(loader.item.text, data.label, "Label does not match data");
287 compare(loader.item.text, data.label, "Label does not match data");
286 compare(loader.item.checked, data.checked, "Checked does not match data");
288 compare(loader.item.checked, data.checked, "Checked does not match data");
@@ -289,8 +291,8 @@ Item {
289
291
290 function test_create_switchMenu_data() {
292 function test_create_switchMenu_data() {
291 return [
293 return [
292− {label: "testLabel1", enabled: true, checked: false },
294+ {label: "testLabel1", enabled: true, checked: false, icon: "file:///testIcon1" },
293− {label: "testLabel2", enabled: false, checked: true },
295+ {label: "testLabel2", enabled: false, checked: true, icon: "file:///testIcon2" },
294 ];
296 ];
295 }
297 }
296
298
@@ -298,20 +300,66 @@ Item {
298 menuData.type = "com.canonical.indicator.switch";
300 menuData.type = "com.canonical.indicator.switch";
299 menuData.label = data.label;
301 menuData.label = data.label;
300 menuData.sensitive = data.enabled;
302 menuData.sensitive = data.enabled;
301− menuData.icon = "file:///testIcon";
303+ menuData.icon = data.icon;
302 menuData.isToggled = data.checked;
304 menuData.isToggled = data.checked;
303
305
304 loader.data = menuData;
306 loader.data = menuData;
305 loader.sourceComponent = factory.load(menuData);
307 loader.sourceComponent = factory.load(menuData);
306 tryCompareFunction(function() { return loader.item != undefined; }, true);
308 tryCompareFunction(function() { return loader.item != undefined; }, true);
307− compare(loader.item.objectName, "switchMenu", "Should have created a standard menu");
309+ compare(loader.item.objectName, "switchMenu", "Should have created a switch menu");
308
310
309 compare(loader.item.text, data.label, "Label does not match data");
311 compare(loader.item.text, data.label, "Label does not match data");
310− compare(loader.item.icon, "file:///testIcon", "MaxIcon does not match data");
312+ compare(loader.item.iconSource, data.icon, "Icon does not match data");
311 compare(loader.item.checked, data.checked, "Checked does not match data");
313 compare(loader.item.checked, data.checked, "Checked does not match data");
312 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
314 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
313 }
315 }
314
316
317+ function test_create_alarmMenu_data() {
318+ return [
319+ {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },
320+ {label: "testLabel2", enabled: false, icon: "file:///testIcon2" },
321+ ];
322+ }
323+
324+ function test_create_alarmMenu(data) {
325+ menuData.type = "com.canonical.indicator.alarm";
326+ menuData.label = data.label;
327+ menuData.sensitive = data.enabled;
328+ menuData.icon = data.icon;
329+
330+ loader.data = menuData;
331+ loader.sourceComponent = factory.load(menuData);
332+ tryCompareFunction(function() { return loader.item != undefined; }, true);
333+ compare(loader.item.objectName, "alarmMenu", "Should have created a alarm menu");
334+
335+ compare(loader.item.text, data.label, "Label does not match data");
336+ compare(loader.item.iconSource, data.icon, "Icon does not match data");
337+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");
338+ }
339+
340+ function test_create_appointmentMenu_data() {
341+ return [
342+ {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },
343+ {label: "testLabel2", enabled: false, icon: "file:///testIcon2" },
344+ ];
345+ }
346+
347+ function test_create_appointmentMenu(data) {
348+ menuData.type = "com.canonical.indicator.appointment";
349+ menuData.label = data.label;
350+ menuData.sensitive = data.enabled;
351+ menuData.icon = data.icon;
352+
353+ loader.data = menuData;
354+ loader.sourceComponent = factory.load(menuData);
355+ tryCompareFunction(function() { return loader.item != undefined; }, true);
356+ compare(loader.item.objectName, "appointmentMenu", "Should have created a appointment menu");
357+
358+ compare(loader.item.text, data.label, "Label does not match data");
359+ compare(loader.item.iconSource, data.icon, "Icon does not match data");
360+ compare(loader.item.enabled, data.enabled, "Enabled does not match data");
361+ }
362+
315 function test_create_wifiSection_data() {
363 function test_create_wifiSection_data() {
316 return [
364 return [
317 {label: "testLabel1", busy: false },
365 {label: "testLabel1", busy: false },
@@ -375,8 +423,8 @@ Item {
375
423
376 function test_create_groupedMessage_data() {
424 function test_create_groupedMessage_data() {
377 return [
425 return [
378− {label: "testLabel1", enabled: true, count: "5", appIcon: "file:///testIcon" },
426+ {label: "testLabel1", enabled: true, count: "5", icon: "file:///testIcon" },
379− {label: "testLabel2", enabled: false, count: "10", appIcon: "file:///testIcon2" },
427+ {label: "testLabel2", enabled: false, count: "10", icon: "file:///testIcon2" },
380 ];
428 ];
381 }
429 }
382
430
@@ -384,8 +432,8 @@ Item {
384 menuData.type = "com.canonical.indicator.messages.sourceitem";
432 menuData.type = "com.canonical.indicator.messages.sourceitem";
385 menuData.label = data.label;
433 menuData.label = data.label;
386 menuData.sensitive = data.enabled;
434 menuData.sensitive = data.enabled;
387− menuData.icon = data.appIcon;
435+ menuData.icon = data.icon;
388− menuData.ext = { 'icon': data.appIcon };
436+ menuData.ext = { 'icon': data.icon };
389 menuData.actionState = [data.count];
437 menuData.actionState = [data.count];
390 menuData.isToggled = true;
438 menuData.isToggled = true;
391
439
@@ -396,7 +444,7 @@ Item {
396
444
397 compare(loader.item.text, data.label, "Label does not match data");
445 compare(loader.item.text, data.label, "Label does not match data");
398 compare(loader.item.count, data.count, "Count does not match data");
446 compare(loader.item.count, data.count, "Count does not match data");
399− compare(loader.item.icon, data.appIcon, "App Icon does not match data");
447+ compare(loader.item.iconSource, data.icon, "Icon does not match data");
400 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
448 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
401 }
449 }
402
450
tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+2−1
@@ -19,6 +19,7 @@ import QtTest 1.0
19import Unity.Test 0.1 as UT
19import Unity.Test 0.1 as UT
20import QMenuModel 0.1
20import QMenuModel 0.1
21import Unity.Indicators 0.1 as Indicators
21import Unity.Indicators 0.1 as Indicators
22+import Utils 0.1 as Utils
22
23
23Item {
24Item {
24 id: testView
25 id: testView
@@ -31,7 +32,7 @@ Item {
31 menuIndex: 0
32 menuIndex: 0
32 }
33 }
33
34
34− Indicators.TimeFormatter {
35+ Utils.TimeFormatter {
35 id: timeFormatter
36 id: timeFormatter
36 format: "hh:mm - MMM dd"
37 format: "hh:mm - MMM dd"
37 }
38 }