Merge lp:~ken-vandine/ubuntu-system-settings/rtm-1378812 into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

[cellular] split "Cellular Data" and "Connection type" into two separate pieces in the UI for both single and multi SIM

[cellular] split "Cellular Data" and "Connection type" into two separate pieces in the UI for both single and multi SIM

[Jonas G. Drange (jonas-drange)]

WFM, thanks!

Ran through test plan as well as functional testing on desktop.

review: Approve

=== modified file 'plugins/cellular/Components/CMakeLists.txt'
--- plugins/cellular/Components/CMakeLists.txt	2014-08-29 14:32:28 +0000
+++ plugins/cellular/Components/CMakeLists.txt	2014-11-18 20:15:26 +0000
@@ -1,12 +1,12 @@
 set(QML_SOURCES
+    DataMultiSim.qml
+    DefaultSim.qml
+    MultiSim.qml
     NoSim.qml
-    SingleSim.qml
-    MultiSim.qml
-    CellularSingleSim.qml
-    CellularMultiSim.qml
-    DefaultSim.qml
+    RadioSingleSim.qml
     Sim.qml
     SimEditor.qml
+    SingleSim.qml
 )
 install(FILES ${QML_SOURCES} DESTINATION ${PLUGIN_QML_DIR}/cellular/Components)
 
 
=== removed file 'plugins/cellular/Components/CellularSingleSim.qml'
--- plugins/cellular/Components/CellularSingleSim.qml	2014-11-12 16:17:17 +0000
+++ plugins/cellular/Components/CellularSingleSim.qml	1970-01-01 00:00:00 +0000
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Jonas G. Drange <[e-mail]>
- *
-*/
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-
-Column {
-    height: childrenRect.height
-
-    property var selector: selector
-
-    ListItem.ItemSelector {
-        id: selector
-        objectName: "technologyPreferenceSelector"
-        text: i18n.tr("Cellular data:")
-        expanded: true
-
-        // an empty string is not a valid preference, which means
-        // we disregard the interace and disable the selector
-        enabled: sim.radioSettings.technologyPreference !== ""
-
-        // model for this selector is modemTechnologies, with
-        // 'off' prepended
-        model: {
-            var m = sim.radioSettings.modemTechnologies.slice(0);
-            m.unshift("off");
-            return m;
-        }
-
-        delegate: OptionSelectorDelegate {
-            text: {
-                return {
-                    'off': i18n.tr("Off"),
-                    'gsm': i18n.tr("2G only (saves battery)"),
-                    'umts': i18n.tr("2G/3G (faster)"),
-                    'lte': i18n.tr("2G/3G/4G (faster)")
-                }[modelData]
-            }
-        }
-        selectedIndex: {
-            if (sim.connMan.powered) {
-                // will return -1 if empty, which will select nothing.
-                // Makes sense, since the SIM is online, but the
-                // radioSettings interface is not ready yet (sim locked?)
-                return model.indexOf(sim.radioSettings.technologyPreference);
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    ListItem.Standard {
-        id: dataRoamingItem
-        objectName: "dataRoamingSwitch"
-        text: i18n.tr("Data roaming")
-        enabled: sim.connMan.powered
-        control: Switch {
-            id: dataRoamingControl
-               property bool serverChecked: sim.connMan.roamingAllowed
-               onServerCheckedChanged: checked = serverChecked
-               Component.onCompleted: checked = serverChecked
-               onTriggered: sim.connMan.roamingAllowed = checked
-        }
-    }
-
-    Connections {
-        target: sim.connMan
-        onPoweredChanged: {
-            if (powered) {
-                // restore the tech preference
-                selector.selectedIndex = selector
-                    .model.indexOf(sim.radioSettings.technologyPreference)
-            } else {
-                selector.selectedIndex = 0;
-            }
-        }
-    }
-
-    // binds the SIM online state to the UI
-    Binding {
-        target: sim.connMan
-        property: "powered"
-        value: selector.selectedIndex !== 0
-    }
-
-    // binds the tech preference to the UI
-    Binding {
-        target: sim.radioSettings
-        property: "technologyPreference"
-        value: {
-            var i = selector.selectedIndex;
-            if (i > 0) {
-                return selector.model[i]
-            } else {
-                // if the modem is off, disregard the selector
-                return sim.radioSettings.technologyPreference;
-            }
-        }
-    }
-}
 
=== renamed file 'plugins/cellular/Components/CellularMultiSim.qml' => 'plugins/cellular/Components/DataMultiSim.qml'
--- plugins/cellular/Components/CellularMultiSim.qml	2014-11-12 16:17:17 +0000
+++ plugins/cellular/Components/DataMultiSim.qml	2014-11-18 20:15:26 +0000
@@ -22,8 +22,6 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 Column {
-    id: root
-    property var selector: selector
 
     function getNameFromIndex (index) {
         if (index === 0) {
@@ -33,49 +31,11 @@
         }
     }
 
-    function getOnlineSim () {
-        if (state === "sim1Online") {
-            return sims[0];
-        } else if (state === "sim2Online") {
-            return sims[1];
-        } else {
-            return null;
-        }
-    }
-
     height: childrenRect.height
 
-    states: [
-        State {
-            name: "sim1Online"
-            when: sims[0].connMan.powered && !sims[1].connMan.powered
-            StateChangeScript { script: {
-                selector.selectedIndex =
-                    selector.model.indexOf(
-                        sims[0].radioSettings.technologyPreference)
-            }}
-        },
-        State {
-            name: "sim2Online"
-            when: sims[1].connMan.powered && !sims[0].connMan.powered
-            StateChangeScript { script: {
-                selector.selectedIndex =
-                    selector.model.indexOf(
-                        sims[1].radioSettings.technologyPreference)
-            }}
-        },
-        State {
-            name: "bothOnline"
-            when: sims[0].connMan.powered && sims[1].connMan.powered
-            StateChangeScript { script: {
-                sims[1].connMan.powered = false;
-            }}
-        }
-    ]
-
     ListItem.ItemSelector {
         id: use
-        objectName: "use"
+        objectName: "data"
         text: i18n.tr("Cellular data:")
         expanded: true
         model: {
@@ -92,6 +52,7 @@
         }
         selectedIndex: [true, sims[0].connMan.powered, sims[1].connMan.powered]
             .lastIndexOf(true)
+
         onDelegateClicked: {
             // power all sims on or off
             sims.forEach(function (sim) {
@@ -100,95 +61,23 @@
         }
     }
 
-    Connections {
-        target: sims[0].connMan
-        onPoweredChanged: {
-            if (powered) {
-                use.selectedIndex = 1;
-            }
-        }
-    }
-
-    Connections {
-        target: sims[1].connMan
-        onPoweredChanged: {
-            if (powered) {
-                use.selectedIndex = 2;
-            }
-        }
-    }
-
-    ListItem.ItemSelector {
-        id: selector
-        objectName: "technologyPreferenceSelector"
-        expanded: true
-        model: {
-            var sim = getOnlineSim();
-            if (sim) {
-                return sim.radioSettings.modemTechnologies;
-            } else {
-                return [];
-            }
-        }
-        delegate: OptionSelectorDelegate {
-            text: {
-                return {
-                    'gsm': i18n.tr("2G only (saves battery)"),
-                    'umts': i18n.tr("2G/3G (faster)"),
-                    'lte': i18n.tr("2G/3G/4G (faster)")
-                }[modelData]
-            }
-        }
-        visible: use.selectedIndex !== 0
-        onDelegateClicked: {
-            var sim = getOnlineSim();
-            if (sim) {
-                sim.radioSettings.technologyPreference = model[index];
-            }
-        }
-    }
-
-    Binding {
-        target: selector
-        property: "enabled"
-        value: getOnlineSim() &&
-            (getOnlineSim().radioSettings.technologyPreference !== "")
-        when: getOnlineSim()
-    }
-
-    Connections {
-        target: sims[0].radioSettings
-        onTechnologyPreferenceChanged: {
-            if (sims[0].connMan.powered) {
-                selector.selectedIndex = selector.model.indexOf(preference);
-            }
-        }
-    }
-
-    Connections {
-        target: sims[1].radioSettings
-        onTechnologyPreferenceChanged: {
-            if (sims[1].connMan.powered) {
-                selector.selectedIndex = selector.model.indexOf(preference);
-            }
-        }
-    }
-
     ListItem.Standard {
         id: dataRoamingItem
-        objectName: "dataRoamingSwitch"
         text: i18n.tr("Data roaming")
         enabled: use.selectedIndex !== 0
         control: Switch {
             id: dataRoamingControl
-            property bool serverChecked: getOnlineSim() && getOnlineSim().connMan.roamingAllowed
+            objectName: "roaming"
+
+            property bool serverChecked: poweredSim && poweredSim.connMan.roamingAllowed
             onServerCheckedChanged: checked = serverChecked
             Component.onCompleted: checked = serverChecked
             onTriggered: {
-                if (getOnlineSim()) {
-                    getOnlineSim().connMan.roamingAllowed = checked;
+                if (poweredSim) {
+                    poweredSim.connMan.roamingAllowed = checked;
                 }
             }
         }
+        showDivider: false
     }
 }
 
=== modified file 'plugins/cellular/Components/MultiSim.qml'
--- plugins/cellular/Components/MultiSim.qml	2014-10-06 19:38:06 +0000
+++ plugins/cellular/Components/MultiSim.qml	2014-11-18 20:15:26 +0000
@@ -23,21 +23,26 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 Column {
-
     objectName: "multiSim"
 
     property var sims
+    property var poweredSim: {
+        var s = null;
+        sims.forEach(function (sim) {
+            if (sim.connMan.powered === true) {
+                s = sim;
+            }
+        });
+        return s;
+    }
     property var modems
-
     // make settings available to all children of root
     property var settings: phoneSettings
 
-    CellularMultiSim {
-        anchors { left: parent.left; right: parent.right }
+    DataMultiSim {
+        anchors { left: parent.left; right: parent.right }
     }
 
-    ListItem.Divider {}
-
     ListItem.SingleValue {
         text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
         visible: showAllUI && !hotspotItem.visible
@@ -60,15 +65,14 @@
         visible: showAllUI
     }
 
-    ListItem.Divider {
-        visible: hotspotItem.visible || dataUsage.visible
-    }
+    ListItem.Divider {}
 
     ListItem.SingleValue {
         text: i18n.tr("Carriers")
         id: chooseCarrier
-        objectName: "chooseCarrier"
+        objectName: "carriers"
         progression: enabled
+        showDivider: false
         onClicked: {
             pageStack.push(Qt.resolvedUrl("../PageChooseCarriers.qml"), {
                 sims: sims
@@ -88,6 +92,44 @@
         anchors { left: parent.left; right: parent.right }
     }
 
+    ListItem.Divider {}
+
+    function techToString (tech) {
+        return {
+            'gsm': i18n.tr("2G only (saves battery)"),
+            'umts': i18n.tr("2G/3G (faster)"),
+            'lte': i18n.tr("2G/3G/4G (faster)")
+        }[tech]
+    }
+
+    ListItem.ItemSelector {
+        id: radio
+        expanded: true
+        text: i18n.tr("Connection type:")
+        model: poweredSim ? poweredSim.radioSettings.modemTechnologies : []
+        delegate: OptionSelectorDelegate {
+            objectName: poweredSim.path + "_radio_" + modelData
+            text: techToString(modelData)
+        }
+        enabled: poweredSim ?
+            (poweredSim.radioSettings.technologyPreference !== "") : false
+        visible: poweredSim
+        selectedIndex: poweredSim ?
+            model.indexOf(poweredSim.radioSettings.technologyPreference) : -1
+        onDelegateClicked: {
+            poweredSim.radioSettings.technologyPreference = model[index];
+        }
+    }
+
+    Connections {
+        target: poweredSim ? poweredSim.radioSettings : null
+        onTechnologyPreferenceChanged: {
+            radio.selectedIndex =
+                poweredSim.radioSettings.modemTechnologies.indexOf(preference)
+        }
+        ignoreUnknownSignals: true
+    }
+
     GSettings {
         id: phoneSettings
         schema.id: "com.ubuntu.phone"
 
=== modified file 'plugins/cellular/Components/NoSim.qml'
--- plugins/cellular/Components/NoSim.qml	2014-08-19 10:58:01 +0000
+++ plugins/cellular/Components/NoSim.qml	2014-11-18 20:15:26 +0000
@@ -25,27 +25,20 @@
 
     objectName: "noSim"
 
-    ListItem.ItemSelector {
+    ListItem.Standard {
         text: i18n.tr("Cellular data:")
-        expanded: true
         enabled: false
-        model: [i18n.tr("Off"), i18n.tr("2G only (saves battery)"), i18n.tr("2G/3G/4G (faster)")]
-        selectedIndex: -1
+        control: Switch {
+            checked: false
+        }
     }
 
     ListItem.Standard {
         text: i18n.tr("Data roaming")
         enabled: false
+        showDivider: false
         control: Switch {
             checked: false
         }
     }
-
-    ListItem.Divider {}
-
-    ListItem.SingleValue {
-        text: i18n.tr("Carrier");
-        value: i18n.tr("N/A")
-        enabled: false
-    }
 }
 
=== added file 'plugins/cellular/Components/RadioSingleSim.qml'
--- plugins/cellular/Components/RadioSingleSim.qml	1970-01-01 00:00:00 +0000
+++ plugins/cellular/Components/RadioSingleSim.qml	2014-11-18 20:15:26 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Column {
+    height: childrenRect.height
+
+    property alias selector: selector
+
+    ListItem.ItemSelector {
+        id: selector
+        text: i18n.tr("Connection type:")
+        showDivider: false
+        expanded: true
+
+        // an empty string is not a valid preference, which means
+        // we disregard the interace and disable the selector
+        enabled: sim.radioSettings.technologyPreference !== ""
+        model: sim.radioSettings.modemTechnologies
+
+        delegate: OptionSelectorDelegate {
+            objectName: sim.path + "_radio_" + modelData
+            text: {
+                return {
+                    'gsm': i18n.tr("2G only (saves battery)"),
+                    'umts': i18n.tr("2G/3G (faster)"),
+                    'lte': i18n.tr("2G/3G/4G (faster)")
+                }[modelData]
+            }
+            showDivider: false
+        }
+        selectedIndex: model.indexOf(sim.radioSettings.technologyPreference)
+        onDelegateClicked: {
+            sim.radioSettings.technologyPreference = model[index];
+        }
+    }
+
+}
 
=== modified file 'plugins/cellular/Components/SimEditor.qml'
--- plugins/cellular/Components/SimEditor.qml	2014-08-20 13:48:58 +0000
+++ plugins/cellular/Components/SimEditor.qml	2014-11-18 20:15:26 +0000
@@ -22,15 +22,9 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 Column {
-
     id: simList
     objectName: "simEditor"
 
-    anchors {
-        left: parent.left
-        right: parent.right
-    }
-
     states: [
         State {
             name: "editing"
@@ -73,7 +67,25 @@
         }
     ]
 
+    NumberAnimation {
+        id: scrollerAnimation
+        duration: UbuntuAnimation.SnapDuration
+        easing: UbuntuAnimation.StandardEasing
+        target: root.flickable
+        property: "contentY"
+    }
+
+    function openedEditor () {
+        var flickable = scrollerAnimation.target;
+        var maxFlick = Math.max(0, flickable.contentHeight - root.height);
+        scrollerAnimation.from = flickable.contentY;
+        scrollerAnimation.to = Math.min(y, maxFlick) - units.gu(9); // header
+        scrollerAnimation.start();
+        nameField.forceActiveFocus();
+    }
+
     ListItem.Standard {
+        id: std
         text: i18n.tr("Edit SIM Name")
     }
 
@@ -83,12 +95,14 @@
             right: parent.right
         }
         height: expandedItem ?
-            childrenRect.height + editor.height : childrenRect.height
+            expandedItem.expandedHeight : childrenRect.height
+
+        boundsBehavior: Flickable.StopAtBounds
 
         ListItem.Expandable {
             id: sim1Exp
             expandedHeight: sim1Col.height
-            objectName: "editSim1"
+            objectName: "edit_name_" + sims[0].path
             Column {
                 id: sim1Col
                 anchors {
@@ -102,7 +116,7 @@
                     }
                     height: sim1Exp.collapsedHeight
                     Label {
-                        objectName: "simLabel1"
+                        objectName: "label_" + sims[0].path
                         anchors {
                             left: parent.left
                             right: parent.right
@@ -117,14 +131,15 @@
             }
             onClicked: {
                 simList.state = "editingSim1";
-                nameField.forceActiveFocus();
+                simList.openedEditor();
             }
         }
 
         ListItem.Expandable {
             id: sim2Exp
             expandedHeight: sim2Col.height
-            objectName: "editSim2"
+            objectName: "edit_name_" + sims[1].path
+            showDivider: false
             Column {
                 id: sim2Col
                 anchors {
@@ -138,7 +153,7 @@
                     }
                     height: sim2Exp.collapsedHeight
                     Label {
-                        objectName: "simLabel2"
+                        objectName: "label_" + sims[1].path
                         anchors {
                             left: parent.left
                             right: parent.right
@@ -153,7 +168,7 @@
             }
             onClicked: {
                 simList.state = "editingSim2";
-                nameField.forceActiveFocus();
+                simList.openedEditor();
             }
         }
     }
@@ -182,6 +197,8 @@
 
             spacing: units.gu(2)
 
+            height: cancel.height + rename.height
+
             Button {
                 id: cancel
                 objectName: "cancelRename"
@@ -204,7 +221,7 @@
         }
 
         Item {
-            height: units.gu(1)
+            height: units.gu(2)
             width: parent.width
         }
 
 
=== modified file 'plugins/cellular/Components/SingleSim.qml'
--- plugins/cellular/Components/SingleSim.qml	2014-10-02 09:50:11 +0000
+++ plugins/cellular/Components/SingleSim.qml	2014-11-18 20:15:26 +0000
@@ -27,11 +27,29 @@
 
     property var sim
 
-    CellularSingleSim {
-        anchors { left: parent.left; right: parent.right }
+    ListItem.Standard {
+        id: selector
+        text: i18n.tr("Cellular data:")
+        control: Switch {
+            id: dataControl
+            objectName: 'data'
+            checked: sim.connMan.powered
+            onClicked: sim.connMan.powered = checked
+        }
     }
 
-    ListItem.Divider {}
+    ListItem.Standard {
+        id: dataRoamingItem
+        text: i18n.tr("Data roaming")
+        enabled: sim.connMan.powered
+        showDivider: false
+        control: Switch {
+            id: dataRoamingControl
+            objectName: "roaming"
+            checked: sim.connMan.roamingAllowed
+            onClicked: sim.connMan.roamingAllowed = checked
+        }
+    }
 
     ListItem.SingleValue {
         text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
@@ -54,10 +72,22 @@
         visible: showAllUI
     }
 
+    ListItem.Divider {
+        visible: radio.selector.model.length
+    }
+
+    RadioSingleSim {
+        id: radio
+        anchors { left: parent.left; right: parent.right }
+        visible: radio.selector.model.length
+    }
+
+    ListItem.Divider {}
+
     ListItem.SingleValue {
         text: i18n.tr("Carrier");
         id: chooseCarrier
-        objectName: "chooseCarrier"
+        objectName: "carrier"
         progression: enabled
         value: sim.netReg.name || i18n.tr("N/A")
         enabled: sim.netReg.status !== ""
 
=== modified file 'plugins/cellular/PageChooseCarrier.qml'
--- plugins/cellular/PageChooseCarrier.qml	2014-10-06 12:56:18 +0000
+++ plugins/cellular/PageChooseCarrier.qml	2014-11-18 20:15:26 +0000
@@ -149,7 +149,7 @@
 
             ListItem.ItemSelector {
                 id: chooseCarrier
-                objectName: "autoChooseCarrierSelector"
+                objectName: "mode"
                 expanded: true
                 enabled: sim.netReg.mode !== "auto-only"
                 text: i18n.tr("Choose carrier:")
@@ -171,6 +171,7 @@
                     }
                 }
             }
+
             ListItem.SingleControl {
                 enabled: chooseCarrier.selectedIndex === 1
                 anchors {
@@ -198,7 +199,7 @@
                     }
                     ListItem.ItemSelector {
                         id: carrierSelector
-                        objectName: "carrierSelector"
+                        objectName: "carriers"
                         expanded: true
                         enabled: sim.netReg.status !== "searching" && chooseCarrier.selectedIndex === 1
                         // work around ItemSelector not having a visual change depending on being disabled
 
=== modified file 'plugins/cellular/PageChooseCarriers.qml'
--- plugins/cellular/PageChooseCarriers.qml	2014-10-06 19:38:06 +0000
+++ plugins/cellular/PageChooseCarriers.qml	2014-11-18 20:15:26 +0000
@@ -44,7 +44,7 @@
             }
 
             ListItem.SingleValue {
-                objectName: "chooseCarrierSim1"
+                objectName: sims[0].path + "_carriers"
                 value: sims[0].netReg.name ? sims[0].netReg.name : i18n.tr("N/A")
                 enabled: sims[0].netReg.status !== ""
                 progression: true
@@ -61,7 +61,7 @@
             }
 
             ListItem.SingleValue {
-                objectName: "chooseCarrierSim2"
+                objectName: sims[1].path + "_carriers"
                 value: sims[1].netReg.name ? sims[1].netReg.name : i18n.tr("N/A")
                 enabled: sims[1].netReg.status !== ""
                 progression: true
 
=== modified file 'plugins/cellular/PageComponent.qml'
--- plugins/cellular/PageComponent.qml	2014-10-17 14:57:17 +0000
+++ plugins/cellular/PageComponent.qml	2014-11-18 20:15:26 +0000
@@ -94,15 +94,15 @@
             start()
         }
     }
+
     Flickable {
+        id: flick
         anchors.fill: parent
         contentWidth: parent.width
         contentHeight: contentItem.childrenRect.height
         boundsBehavior: (contentHeight > root.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
-
         Column {
             anchors { left: parent.left; right: parent.right }
-
             Loader {
                 id: loader
                 anchors { left: parent.left; right: parent.right }
 
=== modified file 'plugins/cellular/sims.js'
--- plugins/cellular/sims.js	2014-10-03 14:08:08 +0000
+++ plugins/cellular/sims.js	2014-11-18 20:15:26 +0000
@@ -17,6 +17,16 @@
     return getPresent()[0];
 }
 
+function getFirstOnline () {
+    var online = null;
+    getPresent().forEach(function (sim) {
+        if (sim.connMan.powered === true) {
+            online = sim;
+        }
+    });
+    return online;
+}
+
 function getCount () {
     return getAll().length;
 }
 
=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2014-09-26 12:52:31 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2014-11-18 20:15:26 +0000
@@ -1,3 +1,4 @@
+
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Copyright (C) 2014 Canonical Ltd.
@@ -114,6 +115,10 @@
     def go_to_wifi_page(self):
         return self._go_to_page('entryComponent-wifi', 'wifiPage')
 
+    @autopilot.logging.log_action(logger.debug)
+    def go_to_cellular_page(self):
+        return self._go_to_page('entryComponent-cellular', 'cellularPage')
+
     def _go_to_page(self, item_object_name, page_object_name):
         self.click_item(item_object_name)
         page = self.wait_select_single(objectName=page_object_name)
@@ -202,7 +207,7 @@
         self._orientation_lock_switch.uncheck()
 
 
-class CelullarPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+class CellularPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopilot helper for the Sound page."""
 
@@ -214,6 +219,164 @@
                 return True
         return False
 
+    @autopilot.logging.log_action(logger.debug)
+    def enable_data(self):
+        self._set_data(True)
+
+    @autopilot.logging.log_action(logger.debug)
+    def disable_data(self):
+        self._set_data(False)
+
+    def disable_datas(self):
+        self.select_sim_for_data('off')
+
+    @autopilot.logging.log_action(logger.debug)
+    def _set_data(self, data):
+        chk = self.select_single(objectName='data')
+        if data:
+            chk.check()
+        else:
+            chk.uncheck()
+
+    @autopilot.logging.log_action(logger.debug)
+    def get_data(self):
+        return self.select_single(objectName='data').checked
+
+    @autopilot.logging.log_action(logger.debug)
+    def enable_roaming(self, timeout=10):
+        self._set_roaming(True, timeout=timeout)
+
+    @autopilot.logging.log_action(logger.debug)
+    def disable_roaming(self, timeout=10):
+        self._set_roaming(False, timeout=timeout)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _set_roaming(self, roaming, timeout):
+        chk = self.select_single(objectName='roaming')
+        if roaming:
+            chk.check(timeout=timeout)
+        else:
+            chk.uncheck(timeout=timeout)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_connection_type(self, radio_type, sim='/ril_0',
+                            scroll_to_and_click=None):
+        self._set_connection_type(radio_type, sim, scroll_to_and_click)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _set_connection_type(self, radio_type, sim, scroll_to_and_click):
+        t = self.wait_select_single(
+            'OptionSelectorDelegate',
+            objectName='%s_radio_%s' % (sim, radio_type))
+        if scroll_to_and_click:
+            scroll_to_and_click(t)
+        else:
+            t.swipe_into_view()
+
+        self.pointing_device.click_object(t)
+
+    @autopilot.logging.log_action(logger.debug)
+    def change_carrier(self, carrier, sim=None):
+        if sim:
+            carriersPage = self._click_carriers()
+            carrierPage = carriersPage.select_sim(sim)
+        else:
+            carrierPage = self._click_carrier()
+
+        carrierPage.set_manual()
+        carrierPage.set_carrier(carrier)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _click_carrier(self):
+        item = self.select_single(objectName='carrier')
+        self.pointing_device.click_object(item)
+        return self.get_root_instance().wait_select_single(
+            objectName='chooseCarrierPage')
+
+    @autopilot.logging.log_action(logger.debug)
+    def _click_carriers(self):
+        item = self.select_single(objectName='carriers')
+        self.pointing_device.click_object(item)
+        return self.get_root_instance().wait_select_single(
+            objectName='chooseCarriersPage')
+
+    @autopilot.logging.log_action(logger.debug)
+    def select_sim_for_data(self, sim):
+        self._select_sim_for_data(sim)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _select_sim_for_data(self, sim):
+        item = self.select_single(objectName='use%s' % sim)
+        self.pointing_device.click_object(item)
+
+    @autopilot.logging.log_action(logger.debug)
+    def select_sim_for_calls(self, sim):
+        pass
+
+    @autopilot.logging.log_action(logger.debug)
+    def select_sim_for_messages(self):
+        pass
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_name(self, sim, name):
+        self._set_name(sim, name)
+
+    def get_name(self, sim):
+        obj = self.select_single(
+            objectName="label_%s" % sim)
+        return obj.text
+
+    def _set_name(self, sim, name):
+        obj = self.select_single(
+            objectName="edit_name_%s" % sim)
+        self.pointing_device.click_object(obj)
+
+        # wait for animation
+        sleep(1)
+        ok = self.select_single('Button', objectName="doRename")
+
+        field = self.select_single('TextField', objectName="nameField")
+        field.write(name)
+        self.pointing_device.click_object(ok)
+
+
+class PageChooseCarriers(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for carrier selection page (multisim)."""
+
+    @autopilot.logging.log_action(logger.debug)
+    def select_sim(self, sim):
+        return self._select_sim(sim)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _select_sim(self, sim):
+        item = self.select_single(objectName='%s_carriers' % sim)
+        self.pointing_device.click_object(item)
+        return self.get_root_instance().wait_select_single(
+            objectName='chooseCarrierPage')
+
+
+class PageChooseCarrier(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for carrier selection page (singlesim)."""
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_manual(self):
+        item = self.select_single(text='Manually')
+        self.pointing_device.click_object(item)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_automatic(self):
+        item = self.select_single(text='Automatically')
+        self.pointing_device.click_object(item)
+
+    def set_carrier(self, carrier):
+        # wait for animation, since page.animationRunning.wait_for(False)
+        # does not work?
+        sleep(0.5)
+        item = self.select_single(text=carrier)
+        self.pointing_device.click_object(item)
+
 
 class TimeAndDatePage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-10-22 21:34:08 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-11-18 20:15:26 +0000
@@ -33,6 +33,7 @@
 RDO_IFACE = 'org.ofono.RadioSettings'
 SIM_IFACE = 'org.ofono.SimManager'
 NETREG_IFACE = 'org.ofono.NetworkRegistration'
+NETOP_IFACE = 'org.ofono.NetworkOperator'
 CALL_FWD_IFACE = 'org.ofono.CallForwarding'
 CALL_SETTINGS_IFACE = 'org.ofono.CallSettings'
 SYSTEM_IFACE = 'com.canonical.SystemImage'
@@ -150,7 +151,7 @@
     def mock_carriers(self, name):
         self.dbusmock.AddObject(
             '/%s/operator/op2' % name,
-            'org.ofono.NetworkOperator',
+            NETOP_IFACE,
             {
                 'Name': 'my.cool.telco',
                 'Status': 'available',
@@ -167,7 +168,7 @@
         # Add a forbidden carrier
         self.dbusmock.AddObject(
             '/%s/operator/op3' % name,
-            'org.ofono.NetworkOperator',
+            NETOP_IFACE,
             {
                 'Name': 'my.bad.telco',
                 'Status': 'forbidden',
@@ -311,9 +312,12 @@
 
 
 class CellularBaseTestCase(UbuntuSystemSettingsOfonoTestCase):
+
     def setUp(self):
         """ Go to Cellular page """
-        super(CellularBaseTestCase, self).setUp('cellular')
+        super(CellularBaseTestCase, self).setUp()
+        self.cellular_page = self.system_settings.\
+            main_view.go_to_cellular_page()
 
 
 class PhoneOfonoBaseTestCase(UbuntuSystemSettingsOfonoTestCase):
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_cellular.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-10-09 14:09:38 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-11-18 20:15:26 +0000
@@ -5,537 +5,217 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
-import dbus
 from gi.repository import Gio, GLib
 from time import sleep
 
 from autopilot.introspection.dbus import StateNotFoundError
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, NotEquals, raises
-from unittest import skip
+from testtools.matchers import Equals, raises, StartsWith
 
 from ubuntu_system_settings.tests import (
-    CellularBaseTestCase, CONNMAN_IFACE, RDO_IFACE, SIM_IFACE)
-from ubuntu_system_settings.utils.i18n import ugettext as _
-
-from ubuntuuitoolkit import emulators as toolkit_emulators
-
-
-PREFERENCE_2G = '2G only (saves battery)'
-PREFERENCE_UMTS = '2G/3G (faster)'
-PREFERENCE_LTE = '2G/3G/4G (faster)'
-PREFERENCE_OFF = 'Off'
-USE_OFF = "useoff"
-USE_SIM_1 = "use/ril_0"
-USE_SIM_2 = "use/ril_1"
+    CellularBaseTestCase, CONNMAN_IFACE, RDO_IFACE, NETREG_IFACE)
 
 
 class CellularTestCase(CellularBaseTestCase):
-    """ Tests for cellular Page """
-
-    """Caches the technology preference selector"""
-    _pref_selector = None
-
-    @property
-    def data_preference_selector(self):
-        """Return data_preference_selector"""
-        try:
-            self._pref_selector.get_properties()
-        except:
-            self._pref_selector = \
-                self.system_settings.main_view.cellular_page.select_single(
-                    toolkit_emulators.ItemSelector,
-                    objectName="technologyPreferenceSelector"
-                )
-        return self._pref_selector
-
-    def select_preference(self, label):
-        """Helper method to click a preference which matches provided label"""
-        pref = self.data_preference_selector.select_single('Label', text=label)
-        self.system_settings.main_view.pointing_device.click_object(pref)
-
-    def assert_selected_preference(self, index):
-        """Helper method asserting that the selected data technology preference
-        is that of index"""
-        self.assertThat(self.data_preference_selector.selectedIndex,
-                        Eventually(Equals(index)))
-
-    def navigate_to_carrier_page(self):
-        selector = self.system_settings.main_view.cellular_page.select_single(
-            objectName="chooseCarrier"
-        )
-        self.system_settings.main_view.scroll_to_and_click(selector)
-
-    def navigate_to_manual(self):
-        selector = self.choose_carrier_page.select_single(
-            toolkit_emulators.ItemSelector,
-            objectName="autoChooseCarrierSelector"
-        )
-        manual = selector.select_single('Label', text=_("Manually"))
-        self.system_settings.main_view.pointing_device.click_object(manual)
-        choosecarrier = self.system_settings.main_view.cellular_page.\
-            select_single(objectName="chooseCarrier")
-        self.system_settings.main_view.pointing_device.click_object(
-            choosecarrier)
-        self.assertThat(
-            self.system_settings.main_view.choose_page.title,
-            Equals(_("Carrier"))
-        )
-
-    def test_cellular_page(self):
-        """ Checks whether Cellular page is available """
-        self.assertThat(
-            self.system_settings.main_view.cellular_page,
-            NotEquals(None)
-        )
-        self.assertThat(
-            self.system_settings.main_view.cellular_page.title,
-            Equals(_('Cellular'))
-        )
-
-    def test_single_sim_layout(self):
-        self.system_settings.main_view.cellular_page.\
-            select_single(objectName="singleSim")
-        self.assertThat(lambda: self.system_settings.main_view.select_single(
-            objectName='multiSim'), raises(StateNotFoundError))
-        self.assertThat(lambda: self.system_settings.main_view.select_single(
-            objectName='noSim'), raises(StateNotFoundError))
-
-    def test_current_network(self):
-        """ Tests whether the current network is visible and selected """
-        self.navigate_to_carrier_page()
-        self.navigate_to_manual()
-        carriers = self.system_settings.main_view.choose_page.select_single(
-            toolkit_emulators.ItemSelector,
-            objectName="carrierSelector"
-        )
-        # TODO: Once there is a proper ItemSelector emulator, get the items
-        # from it and check 'fake.tel' is the selected one.
-        selected_delegate = carriers.select_single(
-            'OptionSelectorDelegate', selected=True)
-        selected_delegate.select_single('Label', text="fake.tel")
-
-    def test_alt_network(self):
-        """ Tests whether an alternative available network is displayed """
-        self.navigate_to_carrier_page()
-        self.navigate_to_manual()
-        carriers = self.system_settings.main_view.choose_page.select_single(
-            toolkit_emulators.ItemSelector,
-            objectName="carrierSelector"
-        )
-        manual = carriers.select_single('Label', text="my.cool.telco")
-        self.assertThat(manual, NotEquals(None))
+
+    def test_enable_data(self):
+        self.cellular_page.enable_data()
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(True))
+        )
+
+    def test_disable_data(self):
+        self.cellular_page.disable_data()
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(False))
+        )
+
+    def test_remote_manipulation_of_data(self):
+        self.modem_0.EmitSignal(
+            CONNMAN_IFACE,
+            'PropertyChanged',
+            'sv',
+            ['Powered', 'true'])
+
+        self.assertThat(lambda: self.cellular_page.get_data(),
+                        Eventually(Equals(True)))
+
+        self.modem_0.EmitSignal(
+            CONNMAN_IFACE,
+            'PropertyChanged',
+            'sv',
+            ['Powered', 'false'])
+
+        self.assertThat(lambda: self.cellular_page.get_data(),
+                        Eventually(Equals(False)))
+
+    def test_enable_roaming(self):
+        self.cellular_page.enable_roaming()
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'RoamingAllowed'),
+            Eventually(Equals(True))
+        )
+
+    def test_disable_roaming(self):
+        self.cellular_page.disable_roaming()
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'RoamingAllowed'),
+            Eventually(Equals(False))
+        )
+
+    def test_connection_type(self):
+        get_pref = lambda: self.modem_0.Get(RDO_IFACE, 'TechnologyPreference')
+        for pref in ['lte', 'umts', 'gsm']:
+            self.cellular_page.set_connection_type(pref)
+            self.assertThat(get_pref, Eventually(Equals(pref)))
+
+    def test_current_carrier(self):
+        self.assertThat(lambda: self.modem_0.Get(NETREG_IFACE, 'Name'),
+                        Eventually(Equals('fake.tel')))
+
+    def test_change_carrier(self):
+        self.cellular_page.change_carrier('my.cool.telco')
 
     def test_no_forbidden_network(self):
         """ Ensures that a forbidden network is not shown """
-        self.navigate_to_carrier_page()
-        self.navigate_to_manual()
-        carriers = self.system_settings.main_view.choose_page.select_single(
-            toolkit_emulators.ItemSelector,
-            objectName="carrierSelector"
-        )
         self.assertThat(
-            lambda: carriers.select_single('Label', text="my.bad.telco"),
+            lambda: self.cellular_page.change_carrier('my.bad.telco'),
             raises(StateNotFoundError)
         )
 
-    def test_set_sim_offline(self):
-        self.select_preference(PREFERENCE_OFF)
-
-        sleep(0.7)
-
-        self.assertEqual(False, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
-
-    def test_set_sim_online(self):
-        self.select_preference(PREFERENCE_OFF)
-        sleep(0.7)
-        self.assertEqual(False, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
-
-        self.select_preference(PREFERENCE_UMTS)
-        sleep(0.7)
-        self.assertEqual(True, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
-
-    def test_roaming_switch(self):
-        """Test that switching off cellular data disables roaming switch"""
-        roaming_switch = self.system_settings.main_view.select_single(
-            objectName="dataRoamingSwitch"
-        )
-        # select 2G only
-        self.select_preference(PREFERENCE_2G)
-
-        # assert that roaming_switch is enabled
-        self.assertThat(
-            roaming_switch.get_properties()['enabled'],
-            Eventually(Equals(True)))
-
-        # click off
-        self.select_preference(PREFERENCE_OFF)
-        # assert roaming_switch is disabled
-        self.assertThat(
-            roaming_switch.get_properties()['enabled'],
-            Eventually(Equals(False)))
-
-    def test_allow_roaming(self):
-        roaming_switch = self.system_settings.main_view.select_single(
-            objectName="dataRoamingSwitch"
-        )
-        self.system_settings.main_view.scroll_to_and_click(roaming_switch)
-        sleep(1.5)
-        self.assertEqual(
-            True, self.modem_0.Get(CONNMAN_IFACE, 'RoamingAllowed'))
-
-    def test_change_data_preference(self):
-        self.select_preference(PREFERENCE_2G)
-        sleep(0.7)
-        self.assertEqual('gsm', self.modem_0.Get(RDO_IFACE,
-                                                 'TechnologyPreference'))
-        self.select_preference(PREFERENCE_UMTS)
-        sleep(0.7)
-        self.assertEqual('umts', self.modem_0.Get(RDO_IFACE,
-                                                  'TechnologyPreference'))
-
-    def test_sim_online_status_insensitive_to_radio_preference(self):
-        # turn off cellular data
-        self.select_preference(PREFERENCE_OFF)
-
-        # fake dbus signal, changing to umts
-        self.modem_0.EmitSignal(
-            'org.ofono.RadioSettings',
-            'PropertyChanged',
-            'sv',
-            ['TechnologyPreference',  dbus.String('umts', variant_level=1)])
-
-        # assert that "Off" has not changed
-        self.assert_selected_preference(0)
-
-    def test_ui_reacts_to_sim_set_coming_online(self):
-        self.select_preference(PREFERENCE_2G)
-        self.select_preference(PREFERENCE_OFF)
-
-        sleep(0.7)
-
-        self.modem_0.EmitSignal(
-            CONNMAN_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Powered', 'true'])
-
-        # assert that 2G is selected
-        self.assert_selected_preference(1)
-
-    def test_unlocking_sim(self):
-        '''Like it would if the sim was locked, e.g.'''
-        self.modem_0.Set(RDO_IFACE, 'TechnologyPreference',
-                         dbus.String('', variant_level=1))
-
-        self.system_settings.main_view.go_back()
-
-        self.system_settings.main_view.pointing_device.click_object(
-            self.system_settings.main_view.select_single(
-                objectName='entryComponent-cellular'))
-
-        self.assert_selected_preference(-1)
-        self.assertFalse(self.data_preference_selector.enabled)
-
-        self.modem_0.EmitSignal(
-            'org.ofono.RadioSettings',
-            'PropertyChanged',
-            'sv',
-            ['TechnologyPreference',  dbus.String('lte', variant_level=1)])
-
-        self.assert_selected_preference(3)
-
 
 class DualSimCellularTestCase(CellularBaseTestCase):
 
     use_sims = 2
 
-    def navigate_to_carriers_page(self):
-        selector = self.system_settings.main_view.cellular_page.select_single(
-            objectName="chooseCarrier"
-        )
-        self.system_settings.main_view.scroll_to_and_click(selector)
-
-    def navigate_to_carrier_page_for_sim(self, n):
-        selector = self.choose_carriers_page.select_single(
-            objectName="chooseCarrierSim%d" % n
-        )
-        self.system_settings.main_view.scroll_to_and_click(selector)
-
-    def navigate_to_manual(self):
-        selector = self.choose_carrier_page.select_single(
-            toolkit_emulators.ItemSelector,
-            objectName="autoChooseCarrierSelector"
-        )
-        manual = selector.select_single('Label', text=_("Manually"))
-        self.system_settings.main_view.scroll_to_and_click(manual)
-        choosecarrier = self.system_settings.main_view.cellular_page.\
-            select_single(objectName="chooseCarrier")
-        self.system_settings.main_view.scroll_to_and_click(choosecarrier)
-        self.assertThat(
-            self.system_settings.main_view.choose_page.title,
-            Equals(_("Carrier"))
-        )
-
-    @property
-    def data_preference_selector(self):
-        """Return data_preference_selector"""
+    def test_data_off(self):
+        self.cellular_page.disable_datas()
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(False))
+        )
+        self.assertThat(
+            lambda: self.modem_1.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(False))
+        )
+
+    def test_sim1_online(self):
+        self.cellular_page.select_sim_for_data('/ril_0')
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(True))
+        )
+        self.assertThat(
+            lambda: self.modem_1.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(False))
+        )
+
+    def test_sim2_online(self):
+        self.cellular_page.select_sim_for_data('/ril_1')
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(False))
+        )
+        self.assertThat(
+            lambda: self.modem_1.Get(CONNMAN_IFACE, 'Powered'),
+            Eventually(Equals(True))
+        )
+
+    def test_connection_type_on_sim1(self):
+        sim = '/ril_0'
+        stac = self.system_settings.main_view.scroll_to_and_click
+        self.cellular_page.select_sim_for_data(sim)
+        get_pref = lambda: self.modem_0.Get(RDO_IFACE, 'TechnologyPreference')
+        for pref in ['lte', 'umts', 'gsm']:
+            self.cellular_page.set_connection_type(
+                pref, sim=sim, scroll_to_and_click=stac)
+            self.assertThat(get_pref, Eventually(Equals(pref)))
+
+    def test_connection_type_on_sim2(self):
+        sim = '/ril_1'
+        stac = self.system_settings.main_view.scroll_to_and_click
+        self.cellular_page.select_sim_for_data(sim)
+        get_pref = lambda: self.modem_1.Get(RDO_IFACE, 'TechnologyPreference')
+        for pref in ['gsm']:
+            self.cellular_page.set_connection_type(
+                pref, sim=sim, scroll_to_and_click=stac)
+            self.assertThat(get_pref, Eventually(Equals(pref)))
+
+    def test_current_carrier_sim1(self):
+        self.assertThat(lambda: self.modem_0.Get(NETREG_IFACE, 'Name'),
+                        Eventually(Equals('fake.tel')))
+
+    def test_change_carrier_sim1(self):
+        sim = '/ril_0'
+        self.cellular_page.change_carrier('my.cool.telco', sim=sim)
+
+    def test_current_carrier_sim2(self):
+        self.assertThat(lambda: self.modem_1.Get(NETREG_IFACE, 'Name'),
+                        Eventually(Equals('fake.tel')))
+
+    def test_change_carrier_sim2(self):
+        sim = '/ril_1'
+        self.cellular_page.change_carrier('my.cool.telco', sim=sim)
+
+    def test_change_sim1_name(self):
+        gsettings = Gio.Settings.new('com.ubuntu.phone')
+        sim = '/ril_0'
         try:
-            self._pref_selector.get_properties()
+            old_name = gsettings.get_value('sim-names')[sim]
         except:
-            self._pref_selector = \
-                self.system_settings.main_view.cellular_page.select_single(
-                    toolkit_emulators.ItemSelector,
-                    objectName="technologyPreferenceSelector"
-                )
-        return self._pref_selector
-
-    def select_preference(self, label):
-        """Helper method that clicks a preference
-        that matches provided label"""
-        pref = self.data_preference_selector.select_single('Label', text=label)
-        self.system_settings.main_view.scroll_to_and_click(pref)
-
-    def assert_selected_preference(self, index):
-        """Helper method asserting that the selected
-        data technology preference is that of index"""
-        self.assertThat(
-            self.data_preference_selector.selectedIndex,
-            Eventually(Equals(index)))
-
-    def use_selector(self, label):
-        obj = self.system_settings.main_view.cellular_page.select_single(
-            objectName="use"
-        ).select_single(objectName=label)
-        self.system_settings.main_view.scroll_to_and_click(obj)
-
-    def assert_used(self, index):
-        obj = self.system_settings.main_view.cellular_page.select_single(
-            objectName="use"
-        )
-        self.assertThat(
-            obj.selectedIndex, Eventually(Equals(index)))
-
-    def get_sim_name(self, num):
-        obj = self.system_settings.main_view.cellular_page.select_single(
-            objectName="simLabel%d" % num)
-        return obj.get_properties()['text']
-
-    def rename_sim(self, num, new_name):
-        obj = self.system_settings.main_view.cellular_page.select_single(
-            objectName="simEditor"
-        ).select_single(objectName="editSim%d" % num)
-        self.system_settings.main_view.scroll_to_and_click(obj)
-        field = self.system_settings.main_view.cellular_page.select_single(
-            objectName="nameField"
-        )
-        self.system_settings.main_view.scroll_to_and_click(field)
-        self.system_settings.main_view.scroll_to_and_click(
-            field.select_single(objectName="clear_button"))
-        self.keyboard.type(new_name)
-        self.system_settings.main_view.scroll_to_and_click(
-            self.system_settings.main_view.cellular_page.select_single(
-                objectName="doRename"))
-
-    def test_use_sim_1(self):
-        self.use_selector(USE_OFF)
-        self.use_selector(USE_SIM_1)
-        sleep(0.7)
-        self.assertEqual(True, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
-        self.assertEqual(False, self.modem_1.Get(CONNMAN_IFACE, 'Powered'))
-
-    def test_use_sim_2(self):
-        self.use_selector(USE_OFF)
-        self.use_selector(USE_SIM_2)
-        sleep(0.7)
-        self.assertEqual(False, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
-        self.assertEqual(True, self.modem_1.Get(CONNMAN_IFACE, 'Powered'))
-
-    def test_turn_off_both_sims(self):
-        self.use_selector(USE_OFF)
-        sleep(0.7)
-        self.assertEqual(False, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
-        self.assertEqual(False, self.modem_1.Get(CONNMAN_IFACE, 'Powered'))
-
-    def test_use_gsm_for_sim_1(self):
-        self.use_selector(USE_SIM_1)
-        self.select_preference(PREFERENCE_2G)
-        sleep(0.7)
-        self.assertEqual(
-            'gsm', self.modem_0.Get(RDO_IFACE, 'TechnologyPreference'))
-
-    def test_use_umts_for_sim_1(self):
-        self.use_selector(USE_SIM_1)
-        self.select_preference(PREFERENCE_UMTS)
-        sleep(0.7)
-        self.assertEqual(
-            'umts', self.modem_0.Get(RDO_IFACE, 'TechnologyPreference'))
-
-    def test_use_gsm_for_sim_2(self):
-        self.use_selector(USE_SIM_1)
-        self.select_preference(PREFERENCE_2G)
-        sleep(0.7)
-        self.assertEqual(
-            'gsm', self.modem_0.Get(RDO_IFACE, 'TechnologyPreference'))
-
-    def test_when_sim_1_comes_online_ui_is_correct(self):
-        self.use_selector(USE_SIM_1)
-        self.select_preference(PREFERENCE_UMTS)
-        self.use_selector(USE_OFF)
-        sleep(0.7)
-        self.modem_0.Set(CONNMAN_IFACE, 'Powered', True)
-        self.modem_0.EmitSignal(
-            CONNMAN_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Powered', 'true'])
-
-        self.assertEqual(
-            'umts', self.modem_0.Get(RDO_IFACE, 'TechnologyPreference'))
-        self.assert_used(1)
-        self.assert_selected_preference(1)
-
-    def test_when_sim_2_comes_online_ui_is_correct(self):
-        self.use_selector(USE_SIM_2)
-        self.select_preference(PREFERENCE_2G)
-        self.use_selector(USE_OFF)
-        sleep(2)
-        self.modem_1.Set(CONNMAN_IFACE, 'Powered', True)
-        self.modem_1.EmitSignal(
-            CONNMAN_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Powered', 'true'])
-
-        self.assertEqual(
-            'gsm', self.modem_1.Get(RDO_IFACE, 'TechnologyPreference'))
-        self.assert_used(2)
-        self.assert_selected_preference(0)
-
-    def test_roaming_switch(self):
-        roaming_switch = self.system_settings.main_view.select_single(
-            objectName="dataRoamingSwitch"
-        )
-        # assert that roaming_switch is enabled
-        self.assertTrue(roaming_switch.get_properties()['enabled'])
-
-        # click off
-        self.use_selector(USE_OFF)
-
-        # assert roaming_switch is disabled
-        self.assertThat(
-            roaming_switch.get_properties()['enabled'],
-            Eventually(Equals(False)))
-
-    def test_allow_roaming(self):
-        self.use_selector(USE_SIM_1)
-        self.assertEqual(
-            False, self.modem_0.Get(CONNMAN_IFACE, 'RoamingAllowed'))
-        roaming_switch = self.system_settings.main_view.select_single(
-            objectName="dataRoamingSwitch"
-        )
-        self.system_settings.main_view.scroll_to_and_click(roaming_switch)
-        sleep(1.5)
-        self.assertEqual(
-            True, self.modem_0.Get(CONNMAN_IFACE, 'RoamingAllowed'))
-
-    def test_no_radio_preference(self):
-        self.select_preference(PREFERENCE_UMTS)
-        self.use_selector(USE_OFF)
-
-        self.modem_0.Set(RDO_IFACE, 'TechnologyPreference', '')
-        self.modem_0.EmitSignal(
-            CONNMAN_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['TechnologyPreference', ''])
-
-        self.assertThat(
-            self.data_preference_selector.get_properties()['visible'],
-            Eventually(Equals(False)))
-
-    # see
-    # https://gitorious.org/python-dbusmock/python-dbusmock/merge_requests/3
-    @skip('skipped due to bug in dbusmock')
-    def test_change_op_sim_1(self):
-        self.navigate_to_carriers_page()
-        self.navigate_to_carrier_page_for_sim(1)
-        carriers = self.system_settings.main_view.choose_page.select_single(
-            toolkit_emulators.ItemSelector, objectName="carrierSelector")
-        manual = carriers.select_single('Label', text="my.cool.telco")
-        self.assertThat(manual, NotEquals(None))
-
-    # see
-    # https://gitorious.org/python-dbusmock/python-dbusmock/merge_requests/3
-    @skip('skipped due to bug in dbusmock')
-    def test_change_op_sim_2(self):
-        self.navigate_to_carriers_page()
-        self.navigate_to_carrier_page_for_sim(2)
-        carriers = self.system_settings.main_view.choose_page.select_single(
-            toolkit_emulators.ItemSelector, objectName="carrierSelector")
-        manual = carriers.select_single('Label', text="my.cool.telco")
-        self.assertThat(manual, NotEquals(None))
-
-    def test_radio_preference_changes(self):
-        self.use_selector(USE_SIM_1)
-
-        self.modem_0.Set(RDO_IFACE, 'TechnologyPreference', 'umts')
-        self.modem_0.EmitSignal(
-            RDO_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['TechnologyPreference', 'umts'])
-
-        self.assert_selected_preference(1)
-
-    def test_changing_sim1_name(self):
-        gsettings = Gio.Settings.new('com.ubuntu.phone')
-        old_name = gsettings.get_value('sim-names')['/ril_0']
+            old_name = 'SIM 1'
         new_name = 'FOO BAR'
-        self.rename_sim(1, new_name)
+        self.cellular_page.set_name(sim, new_name)
 
-        # wait for gsettings
-        sleep(1)
         try:
-            self.assertEqual(
-                new_name, gsettings.get_value('sim-names')['/ril_0'])
+            self.assertThat(
+                lambda: gsettings.get_value('sim-names')[sim],
+                Eventually(Equals(new_name)))
         except Exception as e:
             raise e
         finally:
-            self.rename_sim(1, old_name)
+            self.cellular_page.set_name(sim, old_name)
+            # wait for gsettings
             sleep(1)
 
-    def test_changing_sim2_name(self):
+    def test_change_sim2_name(self):
         gsettings = Gio.Settings.new('com.ubuntu.phone')
-        old_name = gsettings.get_value('sim-names')['/ril_1']
+        sim = '/ril_1'
+
+        try:
+            old_name = gsettings.get_value('sim-names')[sim]
+        except:
+            old_name = 'SIM 2'
+
         new_name = 'BAR BAZ'
-        self.rename_sim(2, new_name)
+        self.cellular_page.set_name(sim, new_name)
 
-        # wait for gsettings
-        sleep(1)
         try:
-            self.assertEqual(
-                new_name, gsettings.get_value('sim-names')['/ril_1'])
+            self.assertThat(
+                lambda: gsettings.get_value('sim-names')[sim],
+                Eventually(Equals(new_name)))
         except Exception as e:
             raise e
         finally:
-            self.rename_sim(2, old_name)
+            self.cellular_page.set_name(sim, old_name)
             # wait for gsettings
             sleep(1)
 
-    def test_changes_to_sim_names_in_gsettings_are_reflected_in_ui(self):
+    def test_remote_manipulation_of_name(self):
         gsettings = Gio.Settings.new('com.ubuntu.phone')
         old_names = gsettings.get_value('sim-names')
-
+        sim = '/ril_0'
+        name = 'BAS QUX'
         new_names = old_names.unpack()
-        new_names['/ril_0'] = 'BAS QUX'
+        new_names[sim] = name
         new_names = GLib.Variant('a{ss}', new_names)
         gsettings.set_value('sim-names', new_names)
-
-        # wait for gsettings
-        sleep(1)
         try:
-            self.assertIn(new_names['/ril_0'], self.get_sim_name(1))
+            self.assertThat(
+                lambda: self.cellular_page.get_name(sim),
+                Eventually(StartsWith(name)))
         except Exception as e:
             raise e
         finally:
@@ -543,6 +223,36 @@
             # wait for gsettings
             sleep(1)
 
+    def test_roaming_switch(self):
+        self.cellular_page.disable_datas()
+        # assert roaming_switch is disabled
+        self.assertThat(
+            lambda: self.cellular_page.enable_roaming(timeout=1),
+            raises(AssertionError)
+        )
+
+    def test_allow_roaming_sim_1(self):
+        sim = '/ril_0'
+        self.cellular_page.select_sim_for_data(sim)
+
+        self.assertEqual(
+            False, self.modem_0.Get(CONNMAN_IFACE, 'RoamingAllowed'))
+        self.cellular_page.enable_roaming()
+        self.assertThat(
+            lambda: self.modem_0.Get(CONNMAN_IFACE, 'RoamingAllowed'),
+            Eventually(Equals(True)))
+
+    def test_allow_roaming_sim_2(self):
+        sim = '/ril_1'
+        self.cellular_page.select_sim_for_data(sim)
+
+        self.assertEqual(
+            False, self.modem_1.Get(CONNMAN_IFACE, 'RoamingAllowed'))
+        self.cellular_page.enable_roaming()
+        self.assertThat(
+            lambda: self.modem_1.Get(CONNMAN_IFACE, 'RoamingAllowed'),
+            Eventually(Equals(True)))
+
     def test_changing_default_sim_for_calls(self):
         gsettings = Gio.Settings.new('com.ubuntu.phone')
         default = gsettings.get_value('default-sim-for-calls')
@@ -556,11 +266,10 @@
         # click first sim
         self.system_settings.main_view.scroll_to_and_click(
             self.get_default_sim_for_calls_selector('/ril_0'))
-        # wait for gsettings
-        sleep(1)
-        self.assertEqual(
-            gsettings.get_value('default-sim-for-calls').get_string(),
-            '/ril_0')
+
+        self.assertThat(
+            lambda: gsettings.get_value('default-sim-for-calls').get_string(),
+            Eventually(Equals('/ril_0')))
 
     def test_changing_default_sim_for_messages(self):
         gsettings = Gio.Settings.new('com.ubuntu.phone')
@@ -574,108 +283,8 @@
         # click second sim
         self.system_settings.main_view.scroll_to_and_click(
             self.get_default_sim_for_messages_selector('/ril_1'))
-        # wait for gsettings
-        sleep(1)
-        self.assertEqual(
-            gsettings.get_value('default-sim-for-messages').get_string(),
-            '/ril_1')
-
-    def test_multi_sim_layout(self):
-        self.system_settings.main_view.cellular_page.\
-            select_single(objectName="multiSim")
-        self.assertThat(lambda: self.system_settings.main_view.select_single(
-            objectName='singleSim'), raises(StateNotFoundError))
-        self.assertThat(lambda: self.system_settings.main_view.select_single(
-            objectName='noSim'), raises(StateNotFoundError))
-
-    def test_remove_one_sim(self):
-        self.modem_0.EmitSignal(
-            SIM_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Present', 'False'])
-
-        self.system_settings.main_view.cellular_page.\
-            select_single(objectName="singleSim")
-        self.assertThat(lambda: self.system_settings.main_view.select_single(
-            objectName='multiSim'), raises(StateNotFoundError))
-        self.assertThat(lambda: self.system_settings.main_view.select_single(
-            objectName='noSim'), raises(StateNotFoundError))
-
-    def test_remove_two_sims(self):
-        self.modem_0.EmitSignal(
-            SIM_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Present', 'False'])
-
-        self.modem_1.EmitSignal(
-            SIM_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Present', 'False'])
-
-        self.system_settings.main_view.cellular_page.\
-            wait_select_single(objectName="noSim")
-        self.assertThat(
-            lambda: self.system_settings.main_view.select_single(
-                objectName='multiSim'), raises(StateNotFoundError))
-        self.assertThat(
-            lambda: self.system_settings.main_view.select_single(
-                objectName='singleSim'), raises(StateNotFoundError))
-
-    def test_remove_and_insert_sims(self):
-        self.modem_0.EmitSignal(
-            SIM_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Present', 'False'])
-
-        self.modem_1.EmitSignal(
-            SIM_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Present', 'False'])
-
-        self.system_settings.main_view.cellular_page.\
-            wait_select_single(objectName="noSim")
-        self.assertThat(
-            lambda: self.system_settings.main_view.select_single(
-                objectName='multiSim'), raises(StateNotFoundError))
-        self.assertThat(
-            lambda: self.system_settings.main_view.select_single(
-                objectName='singleSim'), raises(StateNotFoundError))
-
-        self.modem_0.EmitSignal(
-            SIM_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Present', 'True'])
-
-        self.modem_1.EmitSignal(
-            SIM_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Present', 'True'])
-
-        self.system_settings.main_view.cellular_page.\
-            wait_select_single(objectName="multiSim")
-        self.assertThat(
-            lambda: self.system_settings.main_view.select_single(
-                objectName='noSim'), raises(StateNotFoundError))
-        self.assertThat(
-            lambda: self.system_settings.main_view.select_single(
-                objectName='singleSim'), raises(StateNotFoundError))
-
-    # regression test for 1375832
-    # tests that the second slot only exposes gsm, which
-    # the testdata indicates
-    def test_slot_two(self):
-        self.modem_0.EmitSignal(
-            SIM_IFACE,
-            'PropertyChanged',
-            'sv',
-            ['Present', 'False'])
-        self.select_preference(PREFERENCE_2G)
-        self.assertRaises(StateNotFoundError,
-                          self.select_preference, PREFERENCE_UMTS)
+
+        self.assertThat(
+            lambda:
+                gsettings.get_value('default-sim-for-messages').get_string(),
+            Eventually(Equals('/ril_1')))