Merge lp:~jonas-drange/ubuntu-system-settings/hotspots-change-test-backend into lp:ubuntu-system-settings

[Jonas G. Drange]

[cellular] mock Connectivity and indicator-network so that we can test the Wi-Fi Hotspots backend

[cellular] mock Connectivity and indicator-network so that we can test the Wi-Fi Hotspots backend

We also remove the ConnectivityMixing now that there's a mock for it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1474
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/hotspots-change-test-backend/+merge/265530/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2203/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/421/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/64
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/308/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/421
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/421/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22056

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1480
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2212/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/441/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/73/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/73/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/441/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1481
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2213/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/442/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/442/console

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

There are some unrelated fixes in this merge proposal, please split those out. Otherwise this looks great!

review: Needs Fixing

[Ken VanDine (ken-vandine)]

Perfect, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1482
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2215/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/444/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/444/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1482
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2217/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/446/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/446/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-07-24 20:00:35 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-07-24 20:00:36 +0000
@@ -33,6 +33,10 @@
 from fixtures import EnvironmentVariable
 from gi.repository import UPowerGlib
 from testtools.matchers import Equals, NotEquals, GreaterThan
+from ubuntu_system_settings.tests.connectivity import (
+    PRIV_OBJ as CTV_PRIV_OBJ, NETS_OBJ as CTV_NETS_OBJ,
+    MAIN_IFACE as CTV_IFACE
+)
 
 ACCOUNTS_IFACE = 'org.freedesktop.Accounts'
 ACCOUNTS_USER_IFACE = 'org.freedesktop.Accounts.User'
@@ -380,65 +384,47 @@
 
 class HotspotBaseTestCase(CellularBaseTestCase):
 
+    connectivity_parameters = {}
+
     @classmethod
     def setUpClass(cls):
+        cls.start_session_bus()
+        cls.dbus_con = cls.get_dbus(False)
+
+        # Connectivity API Mock
+        ctv_tmpl = os.path.join(os.path.dirname(__file__), 'connectivity.py')
+        (cls.ctv_mock, cls.obj_ctv) = cls.spawn_server_template(
+            ctv_tmpl, parameters=cls.connectivity_parameters,
+            stdout=subprocess.PIPE)
+
+        cls.ctv_private = dbus.Interface(
+            cls.dbus_con.get_object(CTV_IFACE, CTV_PRIV_OBJ),
+            'org.freedesktop.DBus.Properties')
+
+        cls.ctv_nets = dbus.Interface(
+            cls.dbus_con.get_object(CTV_IFACE, CTV_NETS_OBJ),
+            'org.freedesktop.DBus.Properties')
+
+        # indicator-network mock
+        inetwork = os.path.join(
+            os.path.dirname(__file__), 'indicatornetwork.py'
+        )
+        (cls.inetwork_mock, cls.obj_inetwork) = cls.spawn_server_template(
+            inetwork, stdout=subprocess.PIPE)
+
         super(HotspotBaseTestCase, cls).setUpClass()
-        nm_tmpl = os.path.join(os.path.dirname(__file__), 'networkmanager.py')
-        (cls.n_mock, cls.obj_nm) = cls.spawn_server_template(
-            nm_tmpl, stdout=subprocess.PIPE)
-        (cls.u_mock, cls.obj_urf) = cls.spawn_server_template(
-            'urfkill', stdout=subprocess.PIPE)
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.n_mock.terminate()
-        cls.n_mock.wait()
-        cls.u_mock.terminate()
-        cls.u_mock.wait()
-        super(HotspotBaseTestCase, cls).tearDownClass()
-
-    def tearDown(self):
-        self.obj_nm.Reset()
-        self.urfkill_mock.ClearCalls()
-        super(HotspotBaseTestCase, self).tearDown()
+
+    def start_network_indicator(self):
+        subprocess.call(['initctl', 'start', 'indicator-network'])
+
+    def stop_network_indicator(self):
+        subprocess.call(['initctl', 'stop', 'indicator-network'])
 
     def setUp(self):
-        self.patch_environment("USS_SHOW_ALL_UI", "1")
-        self.nm_mock = dbus.Interface(self.obj_nm, dbusmock.MOCK_IFACE)
-        self.device_path = self.obj_nm.AddWiFiDevice('test0', 'Barbaz', 1)
-        self.device_mock = dbus.Interface(self.dbus_con.get_object(
-            NM_SERVICE, self.device_path),
-            'org.freedesktop.DBus.Properties')
-        self.urfkill_mock = dbus.Interface(self.obj_urf, dbusmock.MOCK_IFACE)
+        self.stop_network_indicator()
+        self.addCleanup(self.start_network_indicator)
         super(HotspotBaseTestCase, self).setUp()
 
-    def add_hotspot(self, name, password, secured=True, enabled=False):
-        settings = {
-            'connection': {
-                'id': dbus.String('Test AP', variant_level=1),
-                'type': dbus.String('802-11-wireless', variant_level=1), },
-            '802-11-wireless': {
-                'mode': dbus.String('ap', variant_level=1),
-                'ssid': dbus.String(name, variant_level=1),
-            }
-        }
-
-        if secured:
-            settings['802-11-wireless']['security'] = dbus.String(
-                '802-11-wireless-security', variant_level=1)
-            settings['802-11-wireless-security'] = {
-                'auth-alg': dbus.String('shared', variant_level=1),
-                'key-mgmt': dbus.String('wpa-psk', variant_level=1),
-                'psk': dbus.String(password, variant_level=1),
-            }
-
-        if enabled:
-            settings['connection']['autoconnect'] = True
-
-        connection_path = self.obj_nm.SettingsAddConnection(settings)
-
-        return connection_path
-
 
 class BluetoothBaseTestCase(UbuntuSystemSettingsTestCase):
 
@@ -831,38 +817,6 @@
         super(ResetBaseTestCase, self).tearDown()
 
 
-class ConnectivityMixin(dbusmock.DBusTestCase):
-    @classmethod
-    def setUpClass(cls):
-        cls.start_session_bus()
-        cls.connectivity_dbus = cls.get_dbus()
-        cls.connectivity_server = cls.spawn_server(CON_SERVICE,
-                                                   CON_PATH,
-                                                   CON_IFACE,
-                                                   system_bus=False,
-                                                   stdout=subprocess.PIPE)
-
-        cls.connectivity_mock = dbus.Interface(
-            cls.connectivity_dbus.get_object(CON_SERVICE,
-                                             CON_PATH),
-            dbusmock.MOCK_IFACE)
-
-        cls.connectivity_mock.AddMethod('', 'UnlockModem', 's', '', '')
-        super(ConnectivityMixin, cls).setUpClass()
-
-    def setUp(self):
-        self.wait_for_bus_object(CON_SERVICE,
-                                 CON_PATH,
-                                 system_bus=False)
-        super(ConnectivityMixin, self).setUp()
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.connectivity_server.terminate()
-        cls.connectivity_server.wait()
-        super(ConnectivityMixin, cls).tearDownClass()
-
-
 class SecurityBaseTestCase(UbuntuSystemSettingsOfonoTestCase):
     """ Base class for security and privacy settings tests"""
 

=== added file 'tests/autopilot/ubuntu_system_settings/tests/connectivity.py'
--- tests/autopilot/ubuntu_system_settings/tests/connectivity.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/connectivity.py	2015-07-24 20:00:36 +0000
@@ -0,0 +1,131 @@
+'''connectivity D-BUS mock template'''
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option) any
+# later version.  See http://www.gnu.org/copyleft/lgpl.html for the full text
+# of the license.
+
+__author__ = 'Jonas G. Drange'
+__email__ = '[e-mail]'
+__copyright__ = '(c) 2015 Canonical Ltd.'
+__license__ = 'LGPL 3+'
+
+
+import dbus
+import dbusmock
+
+BUS_NAME = 'com.ubuntu.connectivity1'
+MAIN_IFACE = 'com.ubuntu.connectivity1'
+MAIN_OBJ = '/'
+SYSTEM_BUS = False
+
+PRIV_IFACE = 'com.ubuntu.connectivity1.Private'
+PRIV_OBJ = '/com/ubuntu/connectivity1/Private'
+
+NETS_IFACE = 'com.ubuntu.connectivity1.NetworkingStatus'
+NETS_OBJ = '/com/ubuntu/connectivity1/NetworkingStatus'
+
+NOT_IMPLEMENTED = '''raise dbus.exceptions.DBusException(
+    "org.ofono.Error.NotImplemented")'''
+
+_parameters = {}
+
+
+def set_hotspot_enabled(self, value):
+    self.SetProperty(NETS_OBJ, NETS_IFACE, 'HotspotEnabled', value)
+
+    # Set HotspotStored = True if not stored and we're enabling it.
+    stored = dbusmock.get_object(NETS_OBJ).Get(NETS_IFACE, 'HotspotStored')
+    if value and not bool(stored):
+        self.SetProperty(NETS_OBJ, NETS_IFACE, 'HotspotStored', True)
+
+
+def set_hotspot_ssid(self, value):
+    self.SetProperty(NETS_OBJ, NETS_IFACE, 'HotspotSsid', value)
+
+
+def set_hotspot_password(self, value):
+    self.SetProperty(PRIV_OBJ, PRIV_IFACE, 'HotspotPassword', value)
+
+
+def load(mock, parameters):
+    global _parameters
+    _parameters = parameters
+
+    mock.set_hotspot_enabled = set_hotspot_enabled
+    mock.set_hotspot_ssid = set_hotspot_ssid
+    mock.set_hotspot_password = set_hotspot_password
+
+    mock.modems = []  # path to boolean e.g. ril_0: False
+    mock.flight_mode = False
+    mock.wifi_enabled = False
+
+    mock.AddObject(
+        NETS_OBJ,
+        NETS_IFACE,
+        {
+            'HotspotSsid': _parameters.get(
+                'HotspotSsid', dbus.ByteArray('Ubuntu'.encode('UTF-8'))),
+            'HotspotEnabled': _parameters.get(
+                'HotspotEnabled', dbus.Boolean(False)),
+            'HotspotMode': _parameters.get('HotspotMode', dbus.String('ap')),
+            'HotspotStored': _parameters.get(
+                'HotspotStored', dbus.Boolean(False)
+            ),
+            'UnstoppableOperationHappening': dbus.Boolean(False),
+        },
+        []
+    )
+
+    mock.AddObject(
+        PRIV_OBJ,
+        PRIV_IFACE,
+        {
+            'HotspotPassword': _parameters.get(
+                'HotspotPassword', dbus.String('abcdefgh')
+            )
+        },
+        [
+            (
+                'UnlockAllModems', '', '',
+                ''
+            ),
+            (
+                'UnlockModem', 's', '',
+                ''
+            ),
+            (
+                'SetFlightMode', 'b', '',
+                ''
+            ),
+            (
+                'SetWifiEnabled', 'b', '',
+                ''
+            ),
+            (
+                'SetHotspotSsid', 'ay', '',
+                'objects["/"].set_hotspot_ssid(self, args[0])'
+            ),
+            (
+                'SetHotspotPassword', 's', '',
+                'objects["/"].set_hotspot_password(self, args[0])'
+            ),
+            (
+                'SetHotspotEnabled', 'b', '',
+                'objects["/"].set_hotspot_enabled(self, args[0])'
+            ),
+            (
+                'SetHotspotMode', 's', '',
+                ''
+            )
+        ]
+    )
+
+
[e-mail](dbusmock.MOCK_IFACE,
+                     in_signature='sssv', out_signature='')
+def SetProperty(self, path, iface, name, value):
+    obj = dbusmock.get_object(path)
+    obj.Set(iface, name, value)
+    obj.EmitSignal(iface, 'PropertiesChanged', 'a{sv}', [{name: value}])

=== added file 'tests/autopilot/ubuntu_system_settings/tests/indicatornetwork.py'
--- tests/autopilot/ubuntu_system_settings/tests/indicatornetwork.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/indicatornetwork.py	2015-07-24 20:00:36 +0000
@@ -0,0 +1,52 @@
+'''indicator-network D-BUS mock template'''
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option) any
+# later version.  See http://www.gnu.org/copyleft/lgpl.html for the full text
+# of the license.
+
+__author__ = 'Jonas G. Drange'
+__email__ = '[e-mail]'
+__copyright__ = '(c) 2015 Canonical Ltd.'
+__license__ = 'LGPL 3+'
+
+
+BUS_NAME = 'com.canonical.indicator.network'
+MAIN_IFACE = 'org.gtk.Actions'
+MAIN_OBJ = '/com/canonical/indicator/network'
+SYSTEM_BUS = False
+
+NOT_IMPLEMENTED = '''raise dbus.exceptions.DBusException(
+    "org.ofono.Error.NotImplemented")'''
+
+_parameters = {}
+
+
+def load(mock, parameters):
+    global _parameters
+    _parameters = parameters
+
+    mock.AddMethods(
+        MAIN_IFACE,
+        [
+            (
+                'Activate', 'sava{sv}', '', ''
+            ),
+            (
+                'Describe', 's', '(bgav)',
+                'if args[0] == "wifi.enable":'
+                '   ret = (True, "", [True])'
+            ),
+            (
+                'DescribeAll', '', 'a{s(bgav)}',
+                'ret = {"wifi.enable": (True, "", [True])}'
+            ),
+            (
+                'List', '', 'as',
+                'ret = ["wifi.enable"]'
+            ),
+            (
+                'SetState', 'sva{sv}', '', ''
+            )
+        ])

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_cellular.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2015-07-24 20:00:35 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2015-07-24 20:00:36 +0000
@@ -5,7 +5,6 @@
 # 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
 
@@ -17,8 +16,9 @@
     CellularBaseTestCase, HotspotBaseTestCase, CONNMAN_IFACE, RDO_IFACE,
     NETREG_IFACE)
 
-from ubuntu_system_settings.tests.networkmanager import (
-    CSETTINGS_IFACE, MAIN_OBJ as NM_PATH, MAIN_IFACE as NM_IFACE,
+
+from ubuntu_system_settings.tests.connectivity import (
+    PRIV_IFACE as CTV_PRIV_IFACE, NETS_IFACE as CTV_NETS_IFACE
 )
 
 DEV_IFACE = 'org.freedesktop.NetworkManager.Device'
@@ -298,114 +298,102 @@
             Eventually(Equals('/ril_1')))
 
 
-class HotspotTestCase(HotspotBaseTestCase):
+class HotspotNonExistantTestCase(HotspotBaseTestCase):
+
+    connectivity_parameters = {
+        'HotspotEnabled': False,
+        'HotspotStored': False
+    }
 
     def test_setup(self):
-        if not self.cellular_page.have_hotspot():
-            self.skipTest('Cannot test hotspot since wifi is disabled.')
-
-        ssid = 'Ubuntu'
-        password = 'abcdefgh'
-        config = {'password': password}
-        active_con_path = NM_PATH + '/ActiveConnection/0'
-        con_path = NM_PATH + '/Settings/0'
+        sleep(10)
+        ssid = 'bar'
+        password = 'zomgzomg'
+        config = {'ssid': ssid, 'password': password}
 
         hotspot_page = self.cellular_page.setup_hotspot(config)
 
         # Assert that the switch is on.
         self.assertTrue(hotspot_page.get_hotspot_status())
 
-        # Assert that Block on Urfkill is called twice.
-        self.assertThat(
-            lambda: len(self.urfkill_mock.GetMethodCalls('Block')),
-            Eventually(Equals(2))
-        )
-
-        # Assert that we get one active connection.
-        self.assertThat(
-            lambda: len(self.obj_nm.GetAll(NM_IFACE)['ActiveConnections']),
-            Eventually(Equals(1))
-        )
-
-        # Assert that the active connection has a certain path.
-        self.assertThat(
-            lambda: self.obj_nm.GetAll(NM_IFACE)['ActiveConnections'][0],
-            Eventually(Equals(active_con_path))
-        )
-
-        # Assert the device's active connection
-        self.assertThat(
-            lambda: self.device_mock.Get(DEV_IFACE, 'ActiveConnection'),
-            Eventually(Equals(active_con_path))
-        )
-
-        connection_mock = dbus.Interface(self.dbus_con.get_object(
-            NM_IFACE, con_path), CSETTINGS_IFACE)
-
-        settings = connection_mock.GetSettings()
-
-        # Assert that autoconnect is true, that ssid and password is what we
-        # expect them to be.
-        self.assertTrue(settings['connection']['autoconnect'])
-
-        s_ssid = bytearray(settings['802-11-wireless']['ssid']).decode('utf-8')
-        self.assertEqual(s_ssid, ssid)
-        self.assertEqual(settings['802-11-wireless-security']['psk'], password)
+        self.assertThat(
+            lambda: self.ctv_nets.Get(CTV_NETS_IFACE, 'HotspotEnabled'),
+            Eventually(Equals(True))
+        )
+
+        self.assertThat(
+            lambda: bytearray(
+                self.ctv_nets.Get(CTV_NETS_IFACE, 'HotspotSsid')
+            ).decode('UTF-8'),
+            Eventually(Equals(ssid))
+        )
+
+        self.assertThat(
+            lambda: self.ctv_private.Get(CTV_PRIV_IFACE, 'HotspotPassword'),
+            Eventually(Equals(password))
+        )
+
+        self.assertThat(
+            lambda: self.ctv_nets.Get(CTV_NETS_IFACE, 'HotspotStored'),
+            Eventually(Equals(True))
+        )
+
+
+class HotspotExistsTestCase(HotspotBaseTestCase):
+
+    connectivity_parameters = {
+        'HotspotStored': True
+    }
 
     def test_enabling(self):
-        if not self.cellular_page.have_hotspot():
-            self.skipTest('Cannot test hotspot since wifi is disabled.')
-
-        self.add_hotspot('foo', 'abcdefgh', enabled=False)
-
         self.assertThat(
-            lambda: len(self.obj_nm.GetAll(NM_IFACE)['ActiveConnections']),
-            Eventually(Equals(0))
+            lambda: self.ctv_nets.Get(CTV_NETS_IFACE, 'HotspotEnabled'),
+            Eventually(Equals(False))
         )
 
         self.cellular_page.enable_hotspot()
 
         self.assertThat(
-            lambda: len(self.obj_nm.GetAll(NM_IFACE)['ActiveConnections']),
-            Eventually(Equals(1))
-        )
+            lambda: self.ctv_nets.Get(CTV_NETS_IFACE, 'HotspotEnabled'),
+            Eventually(Equals(True))
+        )
+
+    def test_changing(self):
+        ssid = 'bar'
+        password = 'zomgzomg'
+        config = {'ssid': ssid, 'password': password}
+        self.cellular_page.setup_hotspot(config)
+
+        self.assertThat(
+            lambda: bytearray(
+                self.ctv_nets.Get(CTV_NETS_IFACE, 'HotspotSsid')
+            ).decode('UTF-8'),
+            Eventually(Equals(ssid))
+        )
+
+        self.assertThat(
+            lambda: self.ctv_private.Get(CTV_PRIV_IFACE, 'HotspotPassword'),
+            Eventually(Equals(password))
+        )
+
+
+class HotspotEnabledTestCase(HotspotBaseTestCase):
+
+    connectivity_parameters = {
+        'HotspotStored': True,
+        'HotspotEnabled': True
+    }
 
     def test_disabling(self):
-        if not self.cellular_page.have_hotspot():
-            self.skipTest('Cannot test hotspot since wifi is disabled.')
-
-        self.add_hotspot('foo', 'abcdefgh', enabled=True)
 
         self.assertThat(
-            lambda: len(self.obj_nm.GetAll(NM_IFACE)['ActiveConnections']),
-            Eventually(Equals(1))
+            lambda: self.ctv_nets.Get(CTV_NETS_IFACE, 'HotspotEnabled'),
+            Eventually(Equals(True))
         )
 
         self.cellular_page.disable_hotspot()
 
         self.assertThat(
-            lambda: len(self.obj_nm.GetAll(NM_IFACE)['ActiveConnections']),
-            Eventually(Equals(0))
+            lambda: self.ctv_nets.Get(CTV_NETS_IFACE, 'HotspotEnabled'),
+            Eventually(Equals(False))
         )
-
-    def test_changing(self):
-        if not self.cellular_page.have_hotspot():
-            self.skipTest('Cannot test hotspot since wifi is disabled.')
-
-        con_path = self.add_hotspot('foo', 'abcdefgh', enabled=True)
-
-        ssid = 'bar'
-        password = 'zomgzomg'
-        config = {'ssid': ssid, 'password': password}
-        self.cellular_page.setup_hotspot(config)
-
-        con_path = NM_PATH + '/Settings/0'
-
-        con_mock = dbus.Interface(self.dbus_con.get_object(
-            NM_IFACE, con_path), CSETTINGS_IFACE)
-
-        settings = con_mock.GetSettings()
-
-        s_ssid = bytearray(settings['802-11-wireless']['ssid']).decode('utf-8')
-        self.assertEqual(s_ssid, ssid)
-        self.assertEqual(settings['802-11-wireless-security']['psk'], password)