@@ -115,16 +115,6 @@ Item {
115115 compare(loader.item.objectName, data.objectName, "Created object name does not match intended object (" + loader.item.objectName + " != " + data.objectName + ")");
116116 }
117117
118−// function test_create_checkable() {
119−// var tmpData = menuData;
120−// tmpData.isCheck = true;
121−
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−// }
127−
128118 function test_create_radio() {
129119 skip("No radio component");
130120 menuData.isRadio = true;
@@ -263,38 +253,6 @@ Item {
263253 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
264254 }
265255
266−// function test_create_checkableMenu_data() {
267−// return [
268−// {label: "testLabel1", enabled: true, checked: false },
269−// {label: "testLabel2", enabled: false, checked: true },
270−// ];
271−// }
272−
273−// function test_create_checkableMenu(data) {
274−// var menuData = {
275−// 'label': data.label,
276−// 'sensitive': data.enabled,
277−// 'isSeparator': false,
278−// 'icon': "",
279−// 'type': undefined,
280−// 'ext': {},
281−// 'action': "",
282−// 'actionState': undefined,
283−// 'isCheck': true,
284−// 'isRadio': false,
285−// 'isToggled': data.checked,
286−// };
287−
288−// loader.data = menuData;
289−// loader.sourceComponent = factory.load(menuData);
290−// tryCompareFunction(function() { return loader.item != undefined; }, true);
291−// compare(loader.item.objectName, "checkableMenu", "Should have created a standard menu");
292−
293−// compare(loader.item.text, data.label, "Label does not match data");
294−// compare(loader.item.checked, data.checked, "Checked does not match data");
295−// compare(loader.item.enabled, data.enabled, "Enabled does not match data");
296−// }
297−
298256 function test_create_switchMenu_data() {
299257 return [
300258 {label: "testLabel1", enabled: true, checked: false },
@@ -407,117 +365,5 @@ Item {
407365 compare(loader.item.appIcon, data.appIcon, "App Icon does not match data");
408366 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
409367 }
410−
411−// function test_create_mediaPayerMenu_data() {
412−// return [{
413−// label: "player1",
414−// icon: "file:://icon1",
415−// albumArt: "file:://art1",
416−// song: "song1",
417−// artist: "artist1",
418−// album: "album1",
419−// running: true,
420−// state: "Playing",
421−// enabled: true
422−// },{
423−// label: "player2",
424−// icon: "file:://icon2",
425−// albumArt: "file:://art2",
426−// song: "song2",
427−// artist: "artist2",
428−// album: "album2",
429−// running: false,
430−// state: "Paused",
431−// enabled: false
432−// }
433−// ];
434−// }
435−
436−// function test_create_mediaPayerMenu(data) {
437−// var menuData = {
438−// 'label': data.label,
439−// 'sensitive': data.enabled,
440−// 'isSeparator': false,
441−// 'icon': data.icon,
442−// 'type': "com.canonical.unity.media-player",
443−// 'ext': {},
444−// 'action': "",
445−// 'actionState': {
446−// 'art-url': data.albumArt,
447−// 'title': data.song,
448−// 'artist': data.artist,
449−// 'album': data.album,
450−// 'running': data.running,
451−// 'state': data.state,
452−// },
453−// 'isCheck': false,
454−// 'isRadio': false,
455−// 'isToggled': false,
456−// };
457−
458−// loader.data = menuData;
459−// loader.sourceComponent = factory.load(menuData);
460−// tryCompareFunction(function() { return loader.item != undefined; }, true);
461−// compare(loader.item.objectName, "mediaPayerMenu", "Should have created a media player menu");
462−
463−// compare(loader.item.playerIcon, data.icon, "Album art does not match data");
464−// compare(loader.item.playerName, data.label, "Album art does not match data");
465−// compare(loader.item.albumArt, data.albumArt, "Album art does not match data");
466−// compare(loader.item.song, data.song, "Song does not match data");
467−// compare(loader.item.artist, data.artist, "Artist does not match data");
468−// compare(loader.item.album, data.album, "Album does not match data");
469−// compare(loader.item.running, data.running, "Running does not match data");
470−// compare(loader.item.state, data.state, "State does not match data");
471−// compare(loader.item.enabled, data.enabled, "Enabled does not match data");
472−// }
473−
474−// function test_create_playbackItemMenu_data() {
475−// return [{
476−// playAction: "action::play",
477−// nextAction: "action::next",
478−// previousAction: "action::previous",
479−// enabled: true
480−// },{
481−// playAction: "action::play2",
482−// nextAction: "action::next2",
483−// previousAction: "action::previous2",
484−// enabled: false
485−// }
486−// ];
487−// }
488−
489−// function test_create_playbackItemMenu(data) {
490−// var menuData = {
491−// 'label': "",
492−// 'sensitive': data.enabled,
493−// 'isSeparator': false,
494−// 'icon': "",
495−// 'type': "com.canonical.unity.playback-item",
496−// 'ext': {
497−// 'xCanonicalPlayAction': data.playAction,
498−// 'xCanonicalNextAction': data.nextAction,
499−// 'xCanonicalPreviousAction': data.previousAction
500−// },
501−// 'action': "",
502−// 'actionState': {},
503−// 'isCheck': false,
504−// 'isRadio': false,
505−// 'isToggled': false,
506−// };
507−
508−// loader.data = menuData;
509−// loader.sourceComponent = factory.load(menuData);
510−// tryCompareFunction(function() { return loader.item != undefined; }, true);
511−// compare(loader.item.objectName, "playbackItemMenu", "Should have created a playback menu");
512−
513−// compare(loader.item.playing, false, "Playing does not match data");
514−// compare(loader.item.playAction.name, data.playAction, "Play action incorrect");
515−// compare(loader.item.nextAction.name, data.nextAction, "Next action incorrect");
516−// compare(loader.item.previousAction.name, data.previousAction, "Previous action incorrect");
517−// compare(loader.item.canPlay, false, "CanPlay should be false");
518−// compare(loader.item.canGoNext, false, "CanGoNext should be false");
519−// compare(loader.item.canGoPrevious, false, "CanGoPrevious should be false");
520−// compare(loader.item.enabled, data.enabled, "Enabled does not match data");
521−// }
522368 }
523369}