Merge lp:~jonas-drange/ubuntu-system-settings/1211804-allow-technology-preference into lp:ubuntu-system-settings

[Jonas G. Drange]

use libqofono bindings to allow for technology preference changes

Hi,

this uses new libqofono bindings to allow a user to change 1) modem online/offline and 2) the Radio Technology Preference.

These two settings is combined in one ListItems.ItemSelector, which adds a bit of complexity (dealt with in RSHelpers script).

Tests are also added for happy paths, but also for some edge cases that could potentially break the UX.

Thanks.

[Brendan Donegan (brendan-donegan)]

I know this is work in progress, but let's have all the Cellular test cases in one place, so rather than adding a new TechnologyPreferencesTestCases, just add your new tests in CellularTestCase.

[lp:~jonas-drange/ubuntu-system-settings/1211804-allow-technology-preference]

755. By Jonas G. Drange on 2014-07-09

cleanup

756. By Jonas G. Drange on 2014-07-09

removing unused gsettings key

757. By Jonas G. Drange on 2014-07-09

merge prereq

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:756
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jonas-drange/ubuntu-system-settings/1211804-allow-technology-preference/+merge/226125/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/951/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1750
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1472
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/143
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2807
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2807/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9537
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1654
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1654/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/951/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:757
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/954/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1762
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1483
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/146
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/146/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2022
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2822
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2822/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9553
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1239
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1665
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1665/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/954/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

See comments inline

review: Needs Information

[lp:~jonas-drange/ubuntu-system-settings/1211804-allow-technology-preference]

758. By Jonas G. Drange on 2014-07-10

log -> warn

759. By Jonas G. Drange on 2014-07-10

more logging

760. By Jonas G. Drange on 2014-07-10

merge prereq

761. By Jonas G. Drange on 2014-07-10

uncommenting tests

[Jonas G. Drange (jonas-drange)]

Addressed inline comments.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:761
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/961/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1803/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/153
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/153/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/153
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2067/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2885
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2885/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9625
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1706
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1706/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/961/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:761
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/962/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1813/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1526
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/154
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/154/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/154
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2076/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2897
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2897/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1278
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1713
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1713/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/962/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good, the CI failure is an unrelated networking error.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:761
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/963/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1820/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1532
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/155
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/155/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/155
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2082/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2905
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2905/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9644
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1719
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1719/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/963/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:761
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/964/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1845
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1545
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/156
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2937
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2937/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1295
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1735
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1735/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/964/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:761
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/967/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1863
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1560
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/159
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/159/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2959
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2959/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9697
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1750
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1750/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/967/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2014-07-10 14:01:58 +0000
+++ plugins/about/PageComponent.qml	2014-07-10 14:01:58 +0000
@@ -54,7 +54,7 @@
         id: sim
         modemPath: manager.modems[0]
     }
- 
+
     Flickable {
         id: scrollWidget
         anchors.fill: parent

=== modified file 'plugins/cellular/CMakeLists.txt'
--- plugins/cellular/CMakeLists.txt	2014-07-08 16:17:02 +0000
+++ plugins/cellular/CMakeLists.txt	2014-07-10 14:01:58 +0000
@@ -6,6 +6,7 @@
     Hotspot.qml
     HotspotSetup.qml
     PageComponent.qml
+    rdosettings-helpers.js
 )
 
 

=== modified file 'plugins/cellular/PageComponent.qml'
--- plugins/cellular/PageComponent.qml	2014-07-10 14:01:58 +0000
+++ plugins/cellular/PageComponent.qml	2014-07-10 14:01:58 +0000
@@ -24,12 +24,19 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import MeeGo.QOfono 0.2
 import QMenuModel 0.1
+import "rdosettings-helpers.js" as RSHelpers
 
 ItemPage {
     id: root
     title: i18n.tr("Cellular")
     objectName: "cellularPage"
 
+    OfonoRadioSettings {
+        id: rdoSettings
+        modemPath: manager.modems[0]
+        onTechnologyPreferenceChanged: RSHelpers.preferenceChanged(preference);
+    }
+
     QDBusActionGroup {
         id: actionGroup
         busType: 1
@@ -49,7 +56,7 @@
 
     OfonoSimManager {
         id: sim
-        modemPath: manager.modems[0]        
+        modemPath: manager.modems[0]
     }
 
     OfonoNetworkRegistration {
@@ -70,6 +77,13 @@
     OfonoConnMan {
         id: connMan
         modemPath: manager.modems[0]
+        powered: techPrefSelector.selectedIndex !== 0
+        onPoweredChanged: RSHelpers.poweredChanged(powered);
+    }
+
+    OfonoModem {
+        id: modem
+        modemPath: manager.modems[0]
     }
 
     Flickable {
@@ -82,51 +96,53 @@
             anchors.left: parent.left
             anchors.right: parent.right
 
-            /* TODO: use selector once ofono supports those options (bug #1211804) */
+            ListModel {
+                id: techPrefModel
+                ListElement { name: "Off"; key: "off" }
+                ListElement { name: "2G only (saves battery)"; key: "gsm"; }
+                ListElement { name: "2G/3G/4G (faster)"; key: "any"; }
+            }
+
+            Component {
+                id: techPrefDelegate
+                OptionSelectorDelegate { text: i18n.tr(name); }
+            }
+
             ListItem.ItemSelector {
-                id: dataTypeSelector
+                id: techPrefSelector
+                objectName: "technologyPreferenceSelector"
                 expanded: true
-                visible: showAllUI
+                delegate: techPrefDelegate
+                model: techPrefModel
                 text: i18n.tr("Cellular data:")
-                model: [i18n.tr("Off"),
-                    i18n.tr("2G only (saves battery)"),
-                    i18n.tr("2G/3G/4G (faster)")]
-                selectedIndex: !connMan.powered ? 0 : 2
-                onSelectedIndexChanged: {
-                    if (selectedIndex == 0)
-                        connMan.powered = false;
-                    else
-                        connMan.powered = true;
+
+                // technologyPreference "" is not valid, assume sim locked or data unavailable
+                enabled: rdoSettings.technologyPreference !== ""
+                selectedIndex: {
+                    var pref = rdoSettings.technologyPreference;
+                    // make nothing selected if the string from OfonoRadioSettings is empty
+                    if (pref === "") {
+                        console.warn("Disabling TechnologyPreference item selector due to empty TechnologyPreference");
+                        return -1;
+                    } else {
+                        // normalizeKey turns "lte" and "umts" into "any"
+                        return RSHelpers.keyToIndex(RSHelpers.normalizeKey(pref));
+                    }
                 }
+                onDelegateClicked: RSHelpers.delegateClicked(index)
             }
 
             ListItem.Standard {
-                text: i18n.tr("Cellular data")
-                visible: !showAllUI
-                control: Switch {
-                    id: dataSwitch
-                    checked: connMan.powered
-                    onClicked: connMan.powered = checked
-                }
-             }
-
-            ListItem.Standard {
                 id: dataRoamingItem
+                objectName: "dataRoamingSwitch"
                 text: i18n.tr("Data roaming")
-                enabled: dataSwitch.checked
+                // sensitive to data type, and disabled if "Off" is selected
+                enabled: techPrefSelector.selectedIndex !== 0
                 control: Switch {
                     id: dataRoamingControl
                     checked: connMan.roamingAllowed
                     onClicked: connMan.roamingAllowed = checked
                 }
-                onEnabledChanged: {
-                    if (!enabled)
-                        dataRoamingControl.checked = false
-                    else
-                        dataRoamingControl.checked = Qt.binding(function() {
-                            return connMan.roamingAllowed
-                        })
-                }
             }
 
             ListItem.SingleValue {

=== added file 'plugins/cellular/rdosettings-helpers.js'
--- plugins/cellular/rdosettings-helpers.js	1970-01-01 00:00:00 +0000
+++ plugins/cellular/rdosettings-helpers.js	2014-07-10 14:01:58 +0000
@@ -0,0 +1,90 @@
+
+/* return index of key k using data in techPrefModel */
+function keyToIndex (k) {
+    console.warn('keyToIndex key:', k)
+    for (var i=0; i < techPrefModel.count; i++) {
+        if (indexToKey(i) === k) {
+            return i;
+        }
+    }
+    // we did not find a suitable ui item
+    console.warn('keyToIndex did not find matching index for key', k);
+    return -1;
+}
+
+/* return key of index i using data in techPrefModel */
+function indexToKey (i) {
+    return techPrefModel.get(i).key;
+}
+
+/* return currently selected key or null if none selected */
+function getSelectedKey () {
+    var i = techPrefSelector.selectedIndex;
+    var model = techPrefModel.get(i);
+    return model ? model.key : null;
+}
+
+/* return key or 'any' if key matches 'lte' or 'umts'
+The UI currently does not support umts/lte only
+*/
+function normalizeKey (k) {
+    if (k === 'lte' || k === 'umts') {
+        console.warn("normalizeKey saw", k);
+        return 'any';
+    } else {
+        return k;
+    }
+}
+
+/* handler for when RadioSettings TechnologyPreference changes */
+function preferenceChanged (preference) {
+    var i = techPrefSelector.selectedIndex;
+    var rdoKey = rdoSettings.technologyPreference;
+    var selKey = getSelectedKey();
+
+    // if preference changes, but the user has chosen one already,
+    // make sure the user's setting is respected
+    if (i > 0) {
+        console.warn('Overriding RadioSettings TechnologyPreference signal', preference, 'with user selection', selKey);
+        rdoSettings.technologyPreference = selKey;
+        return;
+    }
+
+    // if the pref changes and the modem is on,
+    // normlize and update the UI
+    if (connMan.powered) {
+        techPrefSelector.selectedIndex = keyToIndex(normalizeKey(rdoKey));
+    } else {
+        // if the modem is off,
+        // just normalize
+        rdoSettings.technologyPreference = normalizeKey(rdoKey);
+    }
+    console.warn('Modem', connMan.powered ? 'online' : 'offline', 'TechnologyPreference', rdoKey);
+}
+
+/* handler for when ConnectionManager powered changes */
+function poweredChanged (powered) {
+    var rdoKey = rdoSettings.technologyPreference;
+    if (powered) {
+        if (rdoKey === '') {
+            console.warn('Modem came online but TechnologyPreference is empty');
+            return;
+        } else {
+            console.warn('Modem came online, TechnologyPreference', rdoKey);
+            techPrefSelector.selectedIndex = keyToIndex(normalizeKey(rdoKey));
+        }
+    } else {
+        console.warn('Modem went offline');
+        techPrefSelector.selectedIndex = 0;
+    }
+}
+
+/* handler for when user clicks the TechnologyPreference item selector */
+function delegateClicked (index) {
+    console.warn('delegateClicked', index);
+    // if the user selects a TechnologyPreference, update RadioSettings
+    if (index > 0) {
+        rdoSettings.technologyPreference = indexToKey(index);
+        console.warn('delegateClicked setting TechnologyPreference to', indexToKey(index));
+    }
+}

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2014-06-11 09:36:44 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2014-07-10 14:01:58 +0000
@@ -65,7 +65,8 @@
         app = testobj.launch_test_application(
             *params,
             app_type='qt',
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase,
+            capture_output=True)
 
         return app
 
@@ -110,7 +111,7 @@
 
     @property
     def cellular_page(self):
-        """ Return 'About' page """
+        """ Return 'Cellular' page """
         return self.select_single(objectName='cellularPage')
 
     @property

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-06-11 09:36:44 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-07-10 14:01:58 +0000
@@ -22,6 +22,9 @@
 import dbusmock
 import subprocess
 
+CONNMAN_IFACE = 'org.ofono.ConnectionManager'
+RDO_IFACE = 'org.ofono.RadioSettings'
+
 
 class UbuntuSystemSettingsTestCase(UbuntuUIToolkitAppTestCase):
     """ Base class for Ubuntu System Settings """
@@ -79,18 +82,28 @@
                                         dbusmock.DBusTestCase):
     """ Class for cellular tests which sets up an Ofono mock """
 
-    @classmethod
-    def setUpClass(klass):
-        klass.start_system_bus()
-        klass.dbus_con = klass.get_dbus(True)
-        # Add a mock Ofono environment so we get consistent results
-        (klass.p_mock, klass.obj_ofono) = klass.spawn_server_template(
-            'ofono', stdout=subprocess.PIPE)
-        klass.dbusmock = dbus.Interface(klass.obj_ofono, dbusmock.MOCK_IFACE)
-
-    def setUp(self, panel=None):
-        self.obj_ofono.Reset()
-        # Add an available carrier
+    modem_powered = True
+    technology_preference = 'gsm'
+
+    def mock_connection_manager(self):
+        self.modem_0.AddProperty(CONNMAN_IFACE, 'Powered',
+                                 self.modem_powered)
+
+        self.modem_0.AddMethods(
+            CONNMAN_IFACE,
+            [
+                (
+                    'GetProperties', '', 'a{sv}',
+                    'ret = self.GetAll("%s")' % CONNMAN_IFACE),
+                (
+                    'SetProperty', 'sv', '',
+                    'self.Set("IFACE", args[0], args[1]); '
+                    'self.EmitSignal("IFACE", "PropertyChanged", "sv",\
+                        [args[0], args[1]])'.replace(
+                    "IFACE", CONNMAN_IFACE)),
+            ])
+
+    def mock_carriers(self):
         self.dbusmock.AddObject(
             '/ril_0/operator/op2',
             'org.ofono.NetworkOperator',
@@ -124,6 +137,50 @@
                 ('Register', '', '', ''),
             ]
         )
+
+    def mock_radio_settings(self):
+        modem_interfaces = self.modem_0.GetProperties()['Interfaces']
+        modem_interfaces.append(RDO_IFACE)
+        self.modem_0.AddProperty(
+            RDO_IFACE, 'TechnologyPreference', self.technology_preference)
+        self.modem_0.SetProperty('Interfaces', modem_interfaces)
+        self.modem_0.AddMethods(
+            RDO_IFACE,
+            [
+                (
+                    'GetProperties', '', 'a{sv}',
+                    'ret = self.GetAll("%s")'
+                    % RDO_IFACE),
+                (
+                    'SetProperty', 'sv', '',
+                    'self.Set("IFACE", args[0], args[1]); '
+                    'self.EmitSignal("IFACE",\
+                        "PropertyChanged", "sv", [args[0], args[1]])'.replace(
+                    'IFACE', RDO_IFACE)),
+            ])
+
+    @classmethod
+    def setUpClass(klass):
+        klass.start_system_bus()
+        klass.dbus_con = klass.get_dbus(True)
+        # Add a mock Ofono environment so we get consistent results
+        (klass.p_mock, klass.obj_ofono) = klass.spawn_server_template(
+            'ofono', stdout=subprocess.PIPE)
+        klass.dbusmock = dbus.Interface(klass.obj_ofono, dbusmock.MOCK_IFACE)
+
+    def setUp(self, panel=None):
+        self.obj_ofono.Reset()
+
+        # create modem_0 proxy
+        self.modem_0 = self.dbus_con.get_object('org.ofono', '/ril_0')
+
+        # Add an available carrier
+        self.mock_carriers()
+
+        self.mock_radio_settings()
+
+        self.mock_connection_manager()
+
         super(UbuntuSystemSettingsOfonoTestCase, self).setUp('cellular')
 
 
@@ -168,8 +225,7 @@
 
     def get_storage_space_used_by_category(self, objectName):
         return self.main_view.wait_select_single(
-            'StorageItem', objectName=objectName
-        ).value
+            'StorageItem', objectName=objectName).value
 
     @property
     def storage_page(self):

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_cellular.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-04-04 15:31:49 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-07-10 14:01:58 +0000
@@ -4,19 +4,52 @@
 # 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.
-
+import dbus
+from time import sleep
 from autopilot.introspection.dbus import StateNotFoundError
+from gi.repository import Gio
 from testtools.matchers import Equals, NotEquals, raises
 
-from ubuntu_system_settings.tests import UbuntuSystemSettingsOfonoTestCase
+from ubuntu_system_settings.tests import (
+    UbuntuSystemSettingsOfonoTestCase, CONNMAN_IFACE, RDO_IFACE)
 from ubuntu_system_settings.utils.i18n import ugettext as _
 
 from ubuntuuitoolkit import emulators as toolkit_emulators
 
 
+PREFERENCE_2G = '2G only (saves battery)'
+PREFERENCE_ANY = '2G/3G/4G (faster)'
+PREFERENCE_OFF = 'Off'
+
+
 class CellularTestCase(UbuntuSystemSettingsOfonoTestCase):
     """ 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 that clicks a preference that matches provided label"""
+        pref = self.data_preference_selector.select_single('Label', text=label)
+        self.system_settings.main_view.pointer.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, Equals(index))
+
     def navigate_to_manual(self):
         selector = self.system_settings.main_view.cellular_page.select_single(
             toolkit_emulators.ItemSelector,
@@ -77,3 +110,120 @@
             lambda: carriers.select_single('Label', text="my.bad.telco"),
             raises(StateNotFoundError)
         )
+
+    def test_set_modem_offline(self):
+        self.select_preference(PREFERENCE_OFF)
+
+        sleep(1)
+
+        self.assertEqual(False, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
+
+    def test_set_modem_online(self):
+        self.select_preference(PREFERENCE_OFF)
+        sleep(1)
+        self.assertEqual(False, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
+
+        self.select_preference(PREFERENCE_ANY)
+        sleep(1)
+        self.assertEqual(True, self.modem_0.Get(CONNMAN_IFACE, 'Powered'))
+
+    def test_modem_online_status_toggles_data_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.assertTrue(roaming_switch.get_properties()['enabled'])
+
+        # click off
+        self.select_preference(PREFERENCE_OFF)
+        # assert roaming_switch is disabled
+        self.assertFalse(roaming_switch.get_properties()['enabled'])
+
+    def test_data_preference_change_is_reflected_by_dbus(self):
+        self.select_preference(PREFERENCE_2G)
+
+        sleep(1)
+        self.assertEqual('gsm', self.modem_0.Get(RDO_IFACE, 'TechnologyPreference'))
+
+        self.select_preference(PREFERENCE_ANY)
+
+        sleep(1)
+
+        self.assertEqual('any', self.modem_0.Get(RDO_IFACE, 'TechnologyPreference'))
+
+    def test_modem_online_status_insensitive_to_radio_preference(self):
+        # turn off cellular data
+        self.select_preference(PREFERENCE_OFF)
+
+        # fake dbus signal, changing to any
+        self.modem_0.EmitSignal(
+            'org.ofono.RadioSettings',
+            'PropertyChanged',
+            'sv',
+            ['TechnologyPreference',  dbus.String('any', variant_level=1)])
+
+        # TODO: use 'eventually' instead
+        sleep(1)
+
+        # assert that "Off" has not changed
+        self.assert_selected_preference(0)
+
+    def test_ui_reacts_to_modem_set_coming_online(self):
+        self.select_preference(PREFERENCE_2G)
+        self.select_preference(PREFERENCE_OFF)
+
+        sleep(1)
+
+        self.modem_0.EmitSignal(
+            CONNMAN_IFACE,
+            'PropertyChanged',
+            'sv',
+            ['Powered', 'true'])
+
+        sleep(1)
+
+        # assert that 2G is selected
+        self.assert_selected_preference(1)
+
+    def test_radio_preference_change_does_not_override_user_selection(self):
+        self.select_preference(PREFERENCE_2G)
+
+        self.modem_0.EmitSignal(
+            'org.ofono.RadioSettings',
+            'PropertyChanged',
+            'sv',
+            ['TechnologyPreference',  dbus.String('lte', variant_level=1)])
+
+        sleep(1)
+
+        self.assertEqual('gsm', self.modem_0.Get(RDO_IFACE, 'TechnologyPreference'))
+
+        # assert that the preference is any
+        self.assert_selected_preference(1)
+
+    def test_ui_if_sim_was_unlocked_on_opening(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.pointer.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)])
+
+        sleep(1)
+
+        self.assert_selected_preference(2)