@@ -594,9 +594,7 @@ Item {
594 // ModemInfoItem gets all it's data through the actions.
594 // ModemInfoItem gets all it's data through the actions.
598 enabled: true,
597 enabled: true,
600 statusLabelAction: "action::statusLabel",
598 statusLabelAction: "action::statusLabel",
601 statusIconAction: "action::statusIcon",
599 statusIconAction: "action::statusIcon",
602 connectivityIconAction: "action::connectivityIcon",
600 connectivityIconAction: "action::connectivityIcon",
@@ -609,9 +607,7 @@ Item {
610 function test_create_modemInfoItem(data) {
608 function test_create_modemInfoItem(data) {
611 menuData.type = "com.canonical.indicator.network.modeminfoitem";
609 menuData.type = "com.canonical.indicator.network.modeminfoitem";
612− menuData.label = data.label;
613 menuData.sensitive = data.enabled;
610 menuData.sensitive = data.enabled;
614− menuData.isToggled = data.checked;
615 menuData.ext = {
611 menuData.ext = {
616 'xCanonicalModemStatusLabelAction': data.statusLabelAction,
612 'xCanonicalModemStatusLabelAction': data.statusLabelAction,
617 'xCanonicalModemStatusIconAction': data.statusIconAction,
613 'xCanonicalModemStatusIconAction': data.statusIconAction,
@@ -625,7 +621,6 @@ Item {
625 loader.sourceComponent = factory.load(menuData);
621 loader.sourceComponent = factory.load(menuData);
626 tryCompareFunction(function() { return loader.item != undefined; }, true);
622 tryCompareFunction(function() { return loader.item != undefined; }, true);
627 compare(loader.item.objectName, "modemInfoItem", "Should have created a modem info item.");
623 compare(loader.item.objectName, "modemInfoItem", "Should have created a modem info item.");
628− compare(loader.item.text, data.label, "Label does not match data");
630 compare(loader.item.statusLabelAction.name, data.statusLabelAction, "StatusLabel action incorrect");
625 compare(loader.item.statusLabelAction.name, data.statusLabelAction, "StatusLabel action incorrect");
631 compare(loader.item.statusIconAction.name, data.statusIconAction, "StatusIcon action incorrect");
626 compare(loader.item.statusIconAction.name, data.statusIconAction, "StatusIcon action incorrect");