@@ -89,6 +89,8 @@ Item {
8989 { tag: 'progress', type: "com.canonical.indicator.progress", objectName: "progressMenu" },
9090 { tag: 'slider1', type: "com.canonical.indicator.slider", objectName: "sliderMenu" },
9191 { 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" },
9294
9395 { tag: 'messageItem', type: "com.canonical.indicator.messages.messageitem", objectName: "messageItem" },
9496 { tag: 'sourceItem', type: "com.canonical.indicator.messages.sourceitem", objectName: "groupedMessage" },
@@ -115,15 +117,15 @@ Item {
115117 compare(loader.item.objectName, data.objectName, "Created object name does not match intended object (" + loader.item.objectName + " != " + data.objectName + ")");
116118 }
117119
118−// function test_create_checkable() {
119−// var tmpData = menuData;
120−// tmpData.isCheck = true;
120+ function test_create_checkable() {
121+ var tmpData = menuData;
122+ tmpData.isCheck = true;
121123
122−// loader.data = tmpData;
123−// loader.sourceComponent = factory.load(tmpData);
124−// tryCompareFunction(function() { return loader.item != undefined; }, true);
125−// compare(loader.item.objectName, "checkableMenu", "Should have created a checkable menu");
126−// }
124+ loader.data = tmpData;
125+ loader.sourceComponent = factory.load(tmpData);
126+ tryCompareFunction(function() { return loader.item != undefined; }, true);
127+ compare(loader.item.objectName, "checkableMenu", "Should have created a checkable menu");
128+ }
127129
128130 function test_create_radio() {
129131 skip("No radio component");
@@ -173,7 +175,7 @@ Item {
173175 compare(loader.item.maxIcon, "file:///testMaxIcon", "MaxIcon does not match data");
174176 compare(loader.item.minimumValue, data.minValue, "MinValue does not match data");
175177 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");
177179 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
178180 }
179181
@@ -242,7 +244,7 @@ Item {
242244
243245 function test_create_standardMenu_data() {
244246 return [
245− {label: "testLabel1", enabled: true, icon: "file:///testIcon" },
247+ {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },
246248 {label: "testLabel2", enabled: false, icon: "file:///testIcon2"},
247249 ];
248250 }
@@ -280,7 +282,7 @@ Item {
280282 loader.data = menuData;
281283 loader.sourceComponent = factory.load(menuData);
282284 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");
284286
285287 compare(loader.item.text, data.label, "Label does not match data");
286288 compare(loader.item.checked, data.checked, "Checked does not match data");
@@ -289,8 +291,8 @@ Item {
289291
290292 function test_create_switchMenu_data() {
291293 return [
292− {label: "testLabel1", enabled: true, checked: false },
293− {label: "testLabel2", enabled: false, checked: true },
294+ {label: "testLabel1", enabled: true, checked: false, icon: "file:///testIcon1" },
295+ {label: "testLabel2", enabled: false, checked: true, icon: "file:///testIcon2" },
294296 ];
295297 }
296298
@@ -298,20 +300,66 @@ Item {
298300 menuData.type = "com.canonical.indicator.switch";
299301 menuData.label = data.label;
300302 menuData.sensitive = data.enabled;
301− menuData.icon = "file:///testIcon";
303+ menuData.icon = data.icon;
302304 menuData.isToggled = data.checked;
303305
304306 loader.data = menuData;
305307 loader.sourceComponent = factory.load(menuData);
306308 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");
308310
309311 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");
311313 compare(loader.item.checked, data.checked, "Checked does not match data");
312314 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
313315 }
314316
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+
315363 function test_create_wifiSection_data() {
316364 return [
317365 {label: "testLabel1", busy: false },
@@ -375,8 +423,8 @@ Item {
375423
376424 function test_create_groupedMessage_data() {
377425 return [
378− {label: "testLabel1", enabled: true, count: "5", appIcon: "file:///testIcon" },
379− {label: "testLabel2", enabled: false, count: "10", appIcon: "file:///testIcon2" },
426+ {label: "testLabel1", enabled: true, count: "5", icon: "file:///testIcon" },
427+ {label: "testLabel2", enabled: false, count: "10", icon: "file:///testIcon2" },
380428 ];
381429 }
382430
@@ -384,8 +432,8 @@ Item {
384432 menuData.type = "com.canonical.indicator.messages.sourceitem";
385433 menuData.label = data.label;
386434 menuData.sensitive = data.enabled;
387− menuData.icon = data.appIcon;
388− menuData.ext = { 'icon': data.appIcon };
435+ menuData.icon = data.icon;
436+ menuData.ext = { 'icon': data.icon };
389437 menuData.actionState = [data.count];
390438 menuData.isToggled = true;
391439
@@ -396,7 +444,7 @@ Item {
396444
397445 compare(loader.item.text, data.label, "Label does not match data");
398446 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");
400448 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
401449 }
402450