ubuntu-system-settings

Merge lp:~jonas-drange/ubuntu-system-settings/port-eduroamtest-qml into lp:ubuntu-system-settings

port-eduroamtest-qml
Merge into trunk

Proposed by Jonas G. Drange on 2016-08-16

Status:	Merged
Approved by:	Ken VanDine on 2016-08-18
Approved revision:	1699
Merged at revision:	1699
Proposed branch:	lp:~jonas-drange/ubuntu-system-settings/port-eduroamtest-qml
Merge into:	lp:ubuntu-system-settings
Prerequisite:	lp:~jonas-drange/ubuntu-system-settings/makeqmltest
Diff against target:	1539 lines (+939/-340) 25 files modified plugins/mouse/TapArea.qml (+1/-0) plugins/wifi/CMakeLists.txt (+1/-1) plugins/wifi/OtherNetwork.qml (+0/-1) plugins/wifi/wifidbushelper.cpp (+13/-7) plugins/wifi/wifidbushelper.h (+1/-0) tests/CMakeLists.txt (+1/-1) tests/autopilot/ubuntu_system_settings/__init__.py (+0/-197) tests/autopilot/ubuntu_system_settings/tests/test_wifi.py (+0/-129) tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt (+1/-0) tests/mocks/Ubuntu/SystemSettings/Wifi/CMakeLists.txt (+26/-0) tests/mocks/Ubuntu/SystemSettings/Wifi/MockCertHandler.cpp (+103/-0) tests/mocks/Ubuntu/SystemSettings/Wifi/MockCertHandler.h (+92/-0) tests/mocks/Ubuntu/SystemSettings/Wifi/MockDbusHelper.cpp (+76/-0) tests/mocks/Ubuntu/SystemSettings/Wifi/MockDbusHelper.h (+57/-0) tests/mocks/Ubuntu/SystemSettings/Wifi/plugin.cpp (+42/-0) tests/mocks/Ubuntu/SystemSettings/Wifi/plugin.h (+32/-0) tests/mocks/Ubuntu/SystemSettings/Wifi/qmldir (+2/-0) tests/mocks/plugins/wifi/fakenetworkmanager.cpp (+65/-0) tests/mocks/plugins/wifi/fakenetworkmanager.h (+56/-0) tests/plugins/CMakeLists.txt (+11/-3) tests/plugins/mouse/tst_mouse.qml (+2/-1) tests/plugins/wifi/CMakeLists.txt (+23/-0) tests/plugins/wifi/WifiSource/qmldir (+2/-0) tests/plugins/wifi/tst_OtherNetwork.qml (+169/-0) tests/plugins/wifi/tst_wifidbushelper.cpp (+163/-0)
To merge this branch:	bzr merge lp:~jonas-drange/ubuntu-system-settings/port-eduroamtest-qml
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Ken VanDine		2016-08-16	Approve on 2016-08-18
system-apps-ci-bot	continuous-integration		Approve on 2016-08-18
Review via email: mp+303081@code.launchpad.net

Commit message

Port most autopilot tests in test_wifi to qml tests and ctests.

lp:~jonas-drange/ubuntu-system-settings/port-eduroamtest-qml updated on 2016-08-16

1694. By Jonas G. Drange on 2016-08-16: revert some changes that were made in error

Revision history for this message

Jonas G. Drange (jonas-drange) on 2016-08-17:

lp:~jonas-drange/ubuntu-system-settings/port-eduroamtest-qml updated on 2016-08-17

1695. By Jonas G. Drange on 2016-08-17: fix minor inaccuracies

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-17:

FAILED: Continuous integration, rev:1694
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/port-eduroamtest-qml/+merge/303081/+edit-commit-message

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/108/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-17:

FAILED: Continuous integration, rev:1695
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/port-eduroamtest-qml/+merge/303081/+edit-commit-message

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/109/rebuild

review: Needs Fixing (continuous-integration)

lp:~jonas-drange/ubuntu-system-settings/port-eduroamtest-qml updated on 2016-08-17

1696. By Jonas G. Drange on 2016-08-17: set xvfb cmd
1697. By Jonas G. Drange on 2016-08-17: make mouse test less flaky

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-17:

FAILED: Continuous integration, rev:1697
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/port-eduroamtest-qml/+merge/303081/+edit-commit-message

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/110/rebuild

review: Needs Fixing (continuous-integration)

lp:~jonas-drange/ubuntu-system-settings/port-eduroamtest-qml updated on 2016-08-17

1698. By Jonas G. Drange on 2016-08-17: put clicks in middle of button, and drop qmenumodel import as it is unused

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-17:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/111/rebuild

review: Needs Fixing (continuous-integration)

lp:~jonas-drange/ubuntu-system-settings/port-eduroamtest-qml updated on 2016-08-17

1699. By Jonas G. Drange on 2016-08-17: harden mouse test

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-17:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/112/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-17:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/114/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-08-18:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/115/rebuild

review: Approve (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2016-08-18:

This is a great improvement

review: Approve

lp:~jonas-drange/ubuntu-system-settings/port-eduroamtest-qml updated on 2016-08-19

1700. By Jonas G. Drange on 2016-08-19: sync with trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Jonas G. Drange

Ubuntu Touch System Settings

 === modified file 'plugins/mouse/TapArea.qml'
 --- plugins/mouse/TapArea.qml	2016-01-25 18:32:08 +0000
 +++ plugins/mouse/TapArea.qml	2016-08-19 12:48:19 +0000
@@ -30,6 +30,7 @@
      Timer {
          id: clickTimer
++        objectName: "clickTimer"
          triggeredOnStart: false
          repeat: false
          interval: doubleTapSpeed
 === modified file 'plugins/wifi/CMakeLists.txt'
 --- plugins/wifi/CMakeLists.txt	2016-04-13 18:49:49 +0000
 +++ plugins/wifi/CMakeLists.txt	2016-08-19 12:48:19 +0000
@@ -40,7 +40,7 @@
  set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Wifi)
  install(TARGETS UbuntuWifiPanel DESTINATION ${PLUG_DIR})
--install(FILES qmldir DESTINATION ${PLUG_DIR})
++install(FILES qmldir.in DESTINATION ${PLUG_DIR} RENAME qmldir)
  install(FILES wifi.settings DESTINATION ${PLUGIN_MANIFEST_DIR})
  install(FILES settings-wifi.svg DESTINATION ${PLUGIN_MANIFEST_DIR}/icons)
  install(FILES ${QML_SOURCES} DESTINATION ${PLUGIN_QML_DIR}/wifi)
 === modified file 'plugins/wifi/OtherNetwork.qml'
 --- plugins/wifi/OtherNetwork.qml	2016-07-14 13:51:56 +0000
 +++ plugins/wifi/OtherNetwork.qml	2016-08-19 12:48:19 +0000
@@ -21,7 +21,6 @@
  import Ubuntu.Components.ListItems 1.3 as ListItems
  import Ubuntu.Components.Popups 1.3
  import Ubuntu.SystemSettings.Wifi 1.0
--import QMenuModel 0.1
  Component {
 === renamed file 'plugins/wifi/qmldir' => 'plugins/wifi/qmldir.in'
 === modified file 'plugins/wifi/wifidbushelper.cpp'
 --- plugins/wifi/wifidbushelper.cpp	2016-07-13 19:43:56 +0000
 +++ plugins/wifi/wifidbushelper.cpp	2016-08-19 12:48:19 +0000
@@ -40,8 +40,14 @@
  typedef QMap<QString,QVariantMap> ConfigurationData;
  Q_DECLARE_METATYPE(ConfigurationData)
--WifiDbusHelper::WifiDbusHelper(QObject *parent) : QObject(parent),
--    m_systemBusConnection(QDBusConnection::systemBus())
++WifiDbusHelper::WifiDbusHelper(QObject *parent)
++    : WifiDbusHelper(QDBusConnection::systemBus(), parent)
++{
++}
++
++WifiDbusHelper::WifiDbusHelper(const QDBusConnection &dbus, QObject *parent)
++    : QObject(parent)
++    , m_systemBusConnection(dbus)
+ {
      qDBusRegisterMetaType<ConfigurationData>();
+ }
@@ -194,7 +200,7 @@
          QDBusInterface iface(NM_SERVICE,
                               d.path(),
                               NM_DEVICE_IFACE,
--                             QDBusConnection::systemBus());
++                             m_systemBusConnection);
          auto type_v = iface.property("DeviceType");
          if (type_v.toUInt() == 2 /* NM_DEVICE_TYPE_WIFI */) {
@@ -206,7 +212,7 @@
              QDBusInterface wiface(NM_SERVICE,
                                    d.path(),
                                    NM_DEVICE_WIRELESS_IFACE,
--                                  QDBusConnection::systemBus());
++                                  m_systemBusConnection);
              // Get a list of access points and use ssid to find the
              // one we're trying to connect to.
@@ -229,7 +235,7 @@
                      QDBusInterface aiface(NM_SERVICE,
                                            ap_list[i].path(),
                                            NM_AP_IFACE,
--                                          QDBusConnection::systemBus());
++                                          m_systemBusConnection);
                      auto ssid_v = aiface.property("Ssid");
@@ -484,7 +490,7 @@
      OrgFreedesktopNetworkManagerSettingsInterface foo
              (NM_SERVICE,
               "/org/freedesktop/NetworkManager/Settings",
--             QDBusConnection::systemBus());
++             m_systemBusConnection);
      auto reply = foo.ListConnections();
      reply.waitForFinished();
      if (reply.isValid()) {
@@ -520,7 +526,7 @@
      OrgFreedesktopNetworkManagerSettingsConnectionInterface bar
              (NM_SERVICE,
               dbus_path,
--             QDBusConnection::systemBus());
++             m_systemBusConnection);
      auto reply = bar.Delete();
      reply.waitForFinished();
      if(!reply.isValid()) {
 === modified file 'plugins/wifi/wifidbushelper.h'
 --- plugins/wifi/wifidbushelper.h	2015-06-03 19:35:09 +0000
 +++ plugins/wifi/wifidbushelper.h	2016-08-19 12:48:19 +0000
@@ -35,6 +35,7 @@
  public:
      explicit WifiDbusHelper(QObject *parent = nullptr);
++    explicit WifiDbusHelper(const QDBusConnection &dbus, QObject *parent = nullptr);
      ~WifiDbusHelper() {};
      Q_INVOKABLE void connect(QString ssid, int security, int auth, QStringList usernames, QStringList password, QStringList certs, int p2auth);
 === modified file 'tests/CMakeLists.txt'
 --- tests/CMakeLists.txt	2016-08-16 11:42:49 +0000
 +++ tests/CMakeLists.txt	2016-08-19 12:48:19 +0000
@@ -66,7 +66,7 @@
  add_subdirectory(utils)
--# QML tests that require graphical capabitlies.
++# QML tests that require graphical capabilities.
  add_custom_target(qmluitests)
  add_dependencies(qmluitests UbuntuTest)
 === modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
 --- tests/autopilot/ubuntu_system_settings/__init__.py	2016-08-03 12:02:13 +0000
 +++ tests/autopilot/ubuntu_system_settings/__init__.py	2016-08-19 12:48:19 +0000
@@ -1548,60 +1548,6 @@
          if obj.checked != state:
              self.pointing_device.click_object(obj)
--    """Connects to hidden network
--
--    :param name: Network name string (SSID)
--    :kwarg security: A string that is either "none", "wpa" or "wep
--    :kwarg password: A string/hex secret
--    :kwarg cancel: A boolean deciding whether we press cancel or not
--
--    :returns: If we are connecting, it returns the dialog,
--        if we cancel, it returns itself
--
--    """
--    @autopilot.logging.log_action(logger.debug)
--    def connect_to_hidden_network(self, name, security='none', username=None,
--                                  password=None, auth=None, protocol=None,
--                                  cancel=False):
--        dialog = self._click_connect_to_hidden_network()
--        dialog._scroll_to_and_click = self._scroll_to_and_click
--        dialog.enter_name(name)
--        utils.dismiss_osk()
--
--        if security:
--            dialog.set_security(security)
--        if auth:
--            dialog.set_auth(auth)
--        if protocol:
--            dialog.set_protocol(protocol)
--        if username:
--            dialog.enter_username(username)
--            utils.dismiss_osk()
--        if password:
--            dialog.enter_password(password)
--            utils.dismiss_osk()
--        if cancel:
--            utils.dismiss_osk()
--            dialog.cancel()
--            return self
--        else:
--            utils.dismiss_osk()
--            dialog.connect()
--            return dialog
--
--    @autopilot.logging.log_action(logger.debug)
--    def _click_connect_to_hidden_network(self):
--
--        # we can't mock the qunitymenu items, so we
--        # have to wait for them to be built
--        sleep(0.5)
--
--        button = self.select_single('*',
--                                    objectName='connectToHiddenNetwork')
--        self._scroll_to_and_click(button)
--        return self.get_root_instance().wait_select_single(
--            objectName='otherNetworkDialog')
--
      @autopilot.logging.log_action(logger.debug)
      def go_to_previous_networks(self):
          return self._click_previous_network()
@@ -1647,79 +1593,6 @@
                  return True
          return False
--    # FIXME: Use ListItem methods instead.
--    @autopilot.logging.log_action(logger.debug)
--    def _expand_list(self, list_name):
--        item_list = self.select_single(
--            '*', objectName=list_name)
--        active_child = item_list.select_single(
--            '*', objectName='listContainer')
--        self._scroll_to_and_click(active_child)
--        # wait for it to expand
--        sleep(0.5)
--        return item_list
--
--    @autopilot.logging.log_action(logger.debug)
--    def enter_name(self, name):
--        self._enter_name(name)
--
--    @autopilot.logging.log_action(logger.debug)
--    def _enter_name(self, name):
--        namefield = self.wait_select_single('TextField',
--                                            objectName='networkname')
--        self._scroll_to_and_click(namefield)
--        namefield.write(name)
--
--    @autopilot.logging.log_action(logger.debug)
--    def enter_username(self, username):
--        self._enter_username(username)
--
--    @autopilot.logging.log_action(logger.debug)
--    def _enter_username(self, username):
--        namefield = self.wait_select_single('TextField',
--                                            objectName='username')
--        self._scroll_to_and_click(namefield)
--        namefield.write(username)
--
--    @autopilot.logging.log_action(logger.debug)
--    def set_security(self, security):
--        """Sets the hidden network's security
--
--        :param security: Either 'none', 'wpa', 'wep', 'wpa-ep', 'dewp', 'leap'
--
--        :returns: None
--        """
--
--        # We only set security if not none, since none is default
--        if security != 'none':
--            self._set_security(security)
--
--    @autopilot.logging.log_action(logger.debug)
--    def _set_security(self, security):
--        s_list = self._expand_list('securityList')
--        item = None
--        if security == 'none':
--            item = s_list.wait_select_single('*', text=_('None'))
--        elif security == 'wpa':
--            item = s_list.wait_select_single('*',
--                                             text=_('WPA & WPA2 Personal'))
--        elif security == 'wep':
--            item = s_list.wait_select_single('*', text=_('WEP'))
--        elif security == 'wpa-ep':
--            item = s_list.wait_select_single('*',
--                                             text=_('WPA & WPA2 Enterprise'))
--        elif security == 'dwep':
--            item = s_list.wait_select_single('*',
--                                             text=_('Dynamic WEP (802.1x)'))
--        elif security == 'leap':
--            item = s_list.wait_select_single('*', text=_('LEAP'))
--        elif security is not None:
--            raise ValueError('security type %s is not valid' % security)
--
--        self.pointing_device.click_object(item)
--        # wait for ui to change
--        sleep(0.5)
--
      @autopilot.logging.log_action(logger.debug)
      def enter_password(self, password):
          self._enter_password(password)
@@ -1732,76 +1605,6 @@
          pwdfield.write(password)
      @autopilot.logging.log_action(logger.debug)
--    def set_protocol(self, protocol):
--        """Sets the hidden network's protocol.
--
--        :param protocol: Either 'pap', 'mschapv2', 'mschap', 'chap', 'gtc',
--                         or 'md5'.
--        """
--        self._set_protocol(protocol)
--
--    @autopilot.logging.log_action(logger.debug)
--    def _set_protocol(self, protocol):
--        p_list = self._expand_list('p2authList')
--        item = None
--        if protocol == 'pap':
--            item = p_list.wait_select_single(text='PAP')
--        elif protocol == 'mschapv2':
--            item = p_list.wait_select_single(text='MSCHAPv2')
--        elif protocol == 'mschap':
--            item = p_list.wait_select_single(text='MSCHAP')
--        elif protocol == 'chap':
--            item = p_list.wait_select_single(text='CHAP')
--        elif protocol == 'gtc':
--            item = p_list.wait_select_single(text='GTC')
--        elif protocol == 'md5':
--            item = p_list.wait_select_single(text='MD5')
--        elif protocol is not None:
--            raise ValueError('protocol type %s is not valid' % protocol)
--
--        self.pointing_device.click_object(item)
--        # wait for ui to change
--        sleep(0.5)
--
--    @autopilot.logging.log_action(logger.debug)
--    def set_auth(self, auth):
--        """Sets the hidden network's protocol.
--
--        :param auth: Either 'tls', 'ttls', 'leap', 'fast' or 'peap'.
--        """
--        self._set_auth(auth)
--
--    @autopilot.logging.log_action(logger.debug)
--    def _set_auth(self, auth):
--        a_list = self._expand_list('authList')
--        item = None
--        if auth == 'tls':
--            item = a_list.wait_select_single(text='TLS')
--        elif auth == 'ttls':
--            item = a_list.wait_select_single(text='TTLS')
--        elif auth == 'leap':
--            item = a_list.wait_select_single(text='LEAP')
--        elif auth == 'fast':
--            item = a_list.wait_select_single(text='FAST')
--        elif auth == 'peap':
--            item = a_list.wait_select_single(text='PEAP')
--        elif auth is not None:
--            raise ValueError('auth type %s is not valid' % auth)
--
--        self.pointing_device.click_object(item)
--        # wait for ui to change
--        sleep(0.5)
--
--    @autopilot.logging.log_action(logger.debug)
--    def cancel(self):
--        self._click_cancel()
--
--    @autopilot.logging.log_action(logger.debug)
--    def _click_cancel(self):
--        button = self.select_single('Button', objectName='cancel')
--        self._scroll_to_and_click(button)
--
--    @autopilot.logging.log_action(logger.debug)
      def connect(self):
          self._click_connect()
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_wifi.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2015-09-04 14:32:16 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2016-08-19 12:48:19 +0000
@@ -10,15 +10,11 @@
  import dbus
  from autopilot.matchers import Eventually
--from dbusmock.templates.networkmanager import (
--    DEVICE_IFACE, NM80211ApSecurityFlags
--)
  from testtools.matchers import Equals
  from time import sleep
  from ubuntu_system_settings.tests import (WifiBaseTestCase,
                                            WifiWithSSIDBaseTestCase)
  from ubuntu_system_settings.utils.i18n import ugettext as _
--from unittest import skip
  class WifiEnabledTestCase(WifiBaseTestCase):
@@ -30,131 +26,6 @@
              self.wifi_page.title,
              Equals(_('Wi-Fi')))
--    def test_connect_to_hidden_network(self):
--        dialog = self.wifi_page.connect_to_hidden_network(
--            'test_ap',
--            password='abcdefgh',)
--
--        # allow backend to set up listeners
--        sleep(0.3)
--
--        if dialog:
--            dialog.wait_until_destroyed()
--
--    def test_connect_to_eduroam(self):
--        self.create_access_point(
--            'eduroam', 'eduroam',
--            security=NM80211ApSecurityFlags.NM_802_11_AP_SEC_KEY_MGMT_802_1X
--        )
--
--        dialog = self.wifi_page.connect_to_hidden_network(
--            'eduroam',
--            username='student',
--            password='a',
--            security='wpa-ep',
--            auth='peap',
--            protocol='mschapv2',
--        )
--
--        # allow backend to set up listeners
--        sleep(0.3)
--
--        if dialog:
--            dialog.wait_until_destroyed()
--
--        dev = dbus.Interface(self.dbus_con.get_object(
--            'org.freedesktop.NetworkManager', self.device_path),
--            'org.freedesktop.DBus.Properties')
--
--        conn_obj = dev.Get(
--            'org.freedesktop.NetworkManager.Device', 'AvailableConnections'
--        )[0]
--        conn = dbus.Interface(self.dbus_con.get_object(
--            'org.freedesktop.NetworkManager', conn_obj),
--            'org.freedesktop.NetworkManager.Settings.Connection')
--
--        conn_settings = conn.GetSettings()
--        wconn = conn_settings['connection']
--        w802_11_sec = conn_settings['802-11-wireless-security']
--        w802_1x = conn_settings['802-1x']
--
--        self.assertEquals(wconn['type'], '802-11-wireless')
--        self.assertEquals(w802_11_sec['key-mgmt'], 'wpa-eap')
--        self.assertIn('peap', w802_1x['eap'])
--        self.assertEquals(w802_1x['identity'], 'student')
--        self.assertEquals(w802_1x['password'], 'a')
--        self.assertEquals(w802_1x['phase2-auth'], 'mschapv2')
--
--    def test_connect_to_nonexistant_hidden_network(self):
--        dialog = self.wifi_page.connect_to_hidden_network(
--            'n/a',
--            password='abcdefgh',
--        )
--
--        # allow backend to set up listeners
--        sleep(0.3)
--
--        """Mock a StateChanged signal on the Device, using a likely
--        scenario of a not found SSID:
--            newState = 120 # NM_DEVICE_STATE_FAILED
--            oldState = 0 # does not matter
--            reason = 53 # NM_DEVICE_STATE_REASON_SSID_NOT_FOUND
--
--            We manually emit this signal, because the networkmanager mock
--            currently does not support this. See [1].
--
--            [1] https://github.com/martinpitt/python-dbusmock/issues/8
--        """
--
--        self.device_mock.EmitSignal(
--            DEVICE_IFACE, 'StateChanged', 'uuu', [120, 0, 53])
--
--        self.assertThat(
--            dialog.text, Eventually(Equals(
--                _('The Wi-Fi network could not be found'))))
--
--    @skip('skipped due to %s' % (
--        'https://github.com/martinpitt/python-dbusmock/issues/7'))
--    def test_connect_to_hidden_network_using_secrets(self):
--        dialog = self.wifi_page.connect_to_hidden_network(
--            'test_ap', security='wpa', password='abcdefgh',
--        )
--
--        # allow backend to set up listeners
--        sleep(0.3)
--
--        if dialog:
--            dialog.wait_until_destroyed()
--
--    @skip('skipped due to %s' % (
--        'https://github.com/martinpitt/python-dbusmock/issues/7'))
--    def test_connect_to_hidden_network_using_incorrect_secrets(self):
--        dialog = self.wifi_page.connect_to_hidden_network(
--            'test_ap',
--            security='wpa',
--            password='abcdefgh',
--        )
--
--        # allow backend to set up listeners
--        sleep(0.3)
--
--        self.assertThat(
--            dialog.text, Eventually(Equals(
--                _('Your authentication details were incorrect'))))
--
--    @skip('networkmanager mock does not yet support deletion of cons')
--    def test_connect_to_hidden_network_then_cancel(self):
--        dialog = self.wifi_page.connect_to_hidden_network('foo',)
--
--        # allow backend to set up listeners
--        sleep(0.3)
--
--        dialog.cancel()
--
--        self.assertThat(
--            lambda: len(self.active_connection_mock.GetMethodCalls('Delete')),
--            Eventually(Equals(1)))
--
      def test_remove_previous_network(self):
          access_points = ['Series of Tubes', 'dev/null', 'Mi-Fi',
                           'MonkeySphere']
 === modified file 'tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt'
 --- tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt	2016-07-25 13:54:08 +0000
 +++ tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt	2016-08-19 12:48:19 +0000
@@ -1,2 +1,3 @@
  add_subdirectory(Notifications)
  add_subdirectory(Update)
++add_subdirectory(Wifi)
 === added directory 'tests/mocks/Ubuntu/SystemSettings/Wifi'
 === added file 'tests/mocks/Ubuntu/SystemSettings/Wifi/CMakeLists.txt'
 --- tests/mocks/Ubuntu/SystemSettings/Wifi/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Ubuntu/SystemSettings/Wifi/CMakeLists.txt	2016-08-19 12:48:19 +0000
@@ -0,0 +1,26 @@
++include_directories(
++    ${CMAKE_CURRENT_BINARY_DIR}
++    ${CMAKE_SOURCE_DIR}/plugins/wifi/
++    ${Qt5Core_INCLUDE_DIRS}
++    ${Qt5Quick_INCLUDE_DIRS}
++    ${Qt5Qml_INCLUDE_DIRS}
++)
++
++set(MOCK_WIFI_SRCS
++    MockCertHandler.h
++    MockCertHandler.cpp
++    MockDbusHelper.h
++    MockDbusHelper.cpp
++    plugin.cpp
++)
++
++add_library(MockUbuntuWifiPanel SHARED ${MOCK_WIFI_SRCS})
++
++target_link_libraries(MockUbuntuWifiPanel
++    ${Qt5Core_LIBRARIES}
++    ${Qt5Quick_LIBRARIES}
++    ${Qt5Qml_LIBRARIES}
++)
++
++add_uss_mock(Ubuntu.SystemSettings.Wifi 1.0 Ubuntu/SystemSettings/Wifi
++             TARGETS MockUbuntuWifiPanel)
 === added file 'tests/mocks/Ubuntu/SystemSettings/Wifi/MockCertHandler.cpp'
 --- tests/mocks/Ubuntu/SystemSettings/Wifi/MockCertHandler.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Ubuntu/SystemSettings/Wifi/MockCertHandler.cpp	2016-08-19 12:48:19 +0000
@@ -0,0 +1,103 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2016 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 warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
++ */
++
++#include "MockCertHandler.h"
++
++MockAbstractListModel::MockAbstractListModel(QObject *parent)
++{
++}
++
++QHash<int, QByteArray> MockAbstractListModel::roleNames() const
++{
++    QHash<int, QByteArray> roles;
++
++    roles[CNRole] = "CommonName";
++    roles[ORole] = "Organization";
++    roles[expDateRole] = "expiryDate";
++
++    roles[keyName] = "KeyName";
++    roles[keyType] = "KeyType";
++    roles[keyAlgorithm] = "KeyAlgorithm";
++    roles[keyLength] = "KeyLength";
++
++    roles[pacFileName] = "pacFileName";
++
++    return roles;
++}
++
++int MockAbstractListModel::rowCount(const QModelIndex &parent) const
++{
++    return m_files.size();
++}
++
++QString MockAbstractListModel::getfileName(const int selectedIndex) const
++{
++    return m_files[selectedIndex].fileName;
++}
++
++void MockAbstractListModel::dataupdate()
++{
++}
++
++QVariant MockAbstractListModel::data(const QModelIndex &index, int role) const
++{
++    auto ret = QVariant();
++    switch (role) {
++    case CNRole:
++        return m_files[index.row()].commonName;
++    case ORole:
++        return m_files[index.row()].organization;
++    case expDateRole:
++        return m_files[index.row()].expiryDate;
++    case keyName:
++        return m_files[index.row()].keyName;
++    case keyType:
++        return m_files[index.row()].keyType;
++    case keyAlgorithm:
++        return m_files[index.row()].keyAlgorithm;
++    case keyLength:
++        return m_files[index.row()].keyLength;
++    case pacFileName:
++        return m_files[index.row()].pacFileName;
++    }
++}
++
++QByteArray MockFileHandler::getCertContent(QString filename)
++{
++    return QByteArray();
++}
++
++QString MockFileHandler::moveCertFile(QString filename)
++{
++    return QString();
++}
++
++QString MockFileHandler::moveKeyFile(QString filename)
++{
++    return QString();
++}
++
++QString MockFileHandler::movePacFile(QString filename)
++{
++    return QString();
++}
++
++bool MockFileHandler::removeFile(QString filename)
++{
++    return false;
++}
 === added file 'tests/mocks/Ubuntu/SystemSettings/Wifi/MockCertHandler.h'
 --- tests/mocks/Ubuntu/SystemSettings/Wifi/MockCertHandler.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Ubuntu/SystemSettings/Wifi/MockCertHandler.h	2016-08-19 12:48:19 +0000
@@ -0,0 +1,92 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2016 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 warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
++ */
++
++#ifndef MOCK_CERTHANDLER_H
++#define MOCK_CERTHANDLER_H
++
++#include <QAbstractListModel>
++#include <QObject>
++#include <QList>
++
++struct MockFile {
++    QString fileName;
++    QString commonName;
++    QString organization;
++    QString expiryDate; // dd.mm.yyyy
++
++    QString keyName;
++    QString keyType;
++    QString keyAlgorithm;
++    uint keyLength;
++
++    QString pacFileName;
++};
++
++class MockAbstractListModel : public QAbstractListModel
++{
++    Q_OBJECT
++public:
++    enum Roles {
++        CNRole = Qt::UserRole + 1,
++        ORole,
++        expDateRole,
++
++        keyName,
++        keyType,
++        keyAlgorithm,
++        keyLength,
++
++        pacFileName
++    };
++    explicit MockAbstractListModel(QObject *parent = 0);
++    ~MockAbstractListModel() {};
++    QHash<int, QByteArray> roleNames() const;
++    Q_INVOKABLE int rowCount(const QModelIndex &parent = QModelIndex()) const;
++    Q_INVOKABLE QString  getfileName(const int selectedIndex) const;
++    Q_INVOKABLE void dataupdate();
++    QVariant data(const QModelIndex &index, int role) const;
++    QList<MockFile> m_files = QList<MockFile>();
++};
++
++class MockFileHandler : public QObject
++{
++    Q_OBJECT
++public:
++    Q_INVOKABLE QByteArray getCertContent(QString filename);
++    Q_INVOKABLE QString moveCertFile(QString filename);
++    Q_INVOKABLE QString moveKeyFile(QString filename);
++    Q_INVOKABLE QString movePacFile(QString filename);
++    Q_INVOKABLE bool removeFile(QString filename);
++};
++
++class MockCertificateListModel : public MockAbstractListModel
++{
++    Q_OBJECT
++};
++
++class MockPrivatekeyListModel : public MockAbstractListModel
++{
++    Q_OBJECT
++};
++
++class MockPacFileListModel : public MockAbstractListModel
++{
++    Q_OBJECT
++};
++
++#endif // MOCK_CERTHANDLER_H
 === added file 'tests/mocks/Ubuntu/SystemSettings/Wifi/MockDbusHelper.cpp'
 --- tests/mocks/Ubuntu/SystemSettings/Wifi/MockDbusHelper.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Ubuntu/SystemSettings/Wifi/MockDbusHelper.cpp	2016-08-19 12:48:19 +0000
@@ -0,0 +1,76 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2016 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 warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
++ */
++
++#include "MockDbusHelper.h"
++
++MockDbusHelper::MockDbusHelper(QObject *parent)
++{
++    Q_UNUSED(parent);
++}
++
++void MockDbusHelper::connect(QString ssid, int security, int auth, QStringList usernames, QStringList password, QStringList certs, int p2auth)
++{
++    m_connect["ssid"] = ssid;
++    m_connect["security"] = security;
++    m_connect["auth"] = auth;
++    m_connect["usernames"] = usernames;
++    m_connect["password"] = password;
++    m_connect["certs"] = certs;
++    m_connect["p2auth"] = p2auth;
++}
++
++QList<QStringList> MockDbusHelper::getPreviouslyConnectedWifiNetworks()
++{
++    return QList<QStringList>();
++}
++
++void MockDbusHelper::forgetConnection(const QString dbus_path)
++{
++    Q_UNUSED(dbus_path);
++}
++
++bool MockDbusHelper::forgetActiveDevice()
++{
++    forgetActiveDeviceCalled = true;
++    return true;
++}
++
++void MockDbusHelper::nmDeviceStateChanged(uint, uint, uint)
++{
++}
++
++QString MockDbusHelper::getWifiIpAddress()
++{
++    return QString();
++}
++
++void MockDbusHelper::mockDeviceStateChanged(uint newState, uint reason)
++{
++    Q_EMIT deviceStateChanged(newState, reason);
++}
++
++QVariantMap MockDbusHelper::getConnectArguments()
++{
++    return m_connect;
++}
++
++bool MockDbusHelper::getForgetActiveDeviceCalled()
++{
++    return forgetActiveDeviceCalled;
++}
++
 === added file 'tests/mocks/Ubuntu/SystemSettings/Wifi/MockDbusHelper.h'
 --- tests/mocks/Ubuntu/SystemSettings/Wifi/MockDbusHelper.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Ubuntu/SystemSettings/Wifi/MockDbusHelper.h	2016-08-19 12:48:19 +0000
@@ -0,0 +1,57 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2016 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 warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
++ */
++
++#ifndef MOCK_WIFI_DBUS_HELPER_H
++#define MOCK_WIFI_DBUS_HELPER_H
++
++#include <QObject>
++#include <QStringList>
++#include <QVariantMap>
++
++class MockDbusHelper : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(QString wifiIp4Address READ getWifiIpAddress
++               NOTIFY wifiIp4AddressChanged)
++public:
++    explicit MockDbusHelper(QObject *parent = nullptr);
++    ~MockDbusHelper() {};
++
++    Q_INVOKABLE void connect(QString ssid, int security, int auth, QStringList usernames, QStringList password, QStringList certs, int p2auth);
++    Q_INVOKABLE QList<QStringList> getPreviouslyConnectedWifiNetworks();
++    Q_INVOKABLE void forgetConnection(const QString dbus_path);
++    Q_INVOKABLE bool forgetActiveDevice();
++    QString getWifiIpAddress();
++
++    Q_INVOKABLE void mockDeviceStateChanged(uint newState, uint reason);
++    Q_INVOKABLE QVariantMap getConnectArguments(); // mock only
++    Q_INVOKABLE bool getForgetActiveDeviceCalled(); // mock only
++
++public Q_SLOTS:
++    void nmDeviceStateChanged(uint, uint, uint);
++
++Q_SIGNALS:
++    void wifiIp4AddressChanged(QString wifiIp4Address);
++    void deviceStateChanged(uint newState, uint reason);
++private:
++    // This stores params passed to connect().
++    bool forgetActiveDeviceCalled = false;
++    QVariantMap m_connect = QVariantMap();
++};
++
++#endif // MOCK_WIFI_DBUS_HELPER_H
 === added file 'tests/mocks/Ubuntu/SystemSettings/Wifi/plugin.cpp'
 --- tests/mocks/Ubuntu/SystemSettings/Wifi/plugin.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Ubuntu/SystemSettings/Wifi/plugin.cpp	2016-08-19 12:48:19 +0000
@@ -0,0 +1,42 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2016 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 warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
++ */
++
++#include "plugin.h"
++#include "MockCertHandler.h"
++#include "MockDbusHelper.h"
++
++#include <QtQml>
++
++#define MAKE_SINGLETON_FACTORY(type) \
++    static QObject* type##_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine) { \
++        Q_UNUSED(engine); \
++        Q_UNUSED(scriptEngine); \
++        return new type(); \
++    }
++
++MAKE_SINGLETON_FACTORY(MockDbusHelper)
++
++void BackendPlugin::registerTypes(const char *uri)
++{
++    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Wifi"));
++    qmlRegisterSingletonType<MockDbusHelper>(uri, 1, 0, "DbusHelper", MockDbusHelper_singleton_factory);
++    qmlRegisterType<MockCertificateListModel>(uri, 1, 0, "CertificateListModel");
++    qmlRegisterType<MockPrivatekeyListModel>(uri, 1, 0, "PrivatekeyListModel");
++    qmlRegisterType<MockPacFileListModel>(uri, 1, 0, "PacFileListModel");
++    qmlRegisterType<MockFileHandler>(uri, 1, 0, "FileHandler");
++}
 === added file 'tests/mocks/Ubuntu/SystemSettings/Wifi/plugin.h'
 --- tests/mocks/Ubuntu/SystemSettings/Wifi/plugin.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Ubuntu/SystemSettings/Wifi/plugin.h	2016-08-19 12:48:19 +0000
@@ -0,0 +1,32 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2016 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 warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
++ */
++
++#ifndef MOCK_SYSTEMSETTINGS_WIFI_PLUGIN_H
++#define MOCK_SYSTEMSETTINGS_WIFI_PLUGIN_H
++
++#include <QQmlExtensionPlugin>
++
++class BackendPlugin : public QQmlExtensionPlugin
++{
++    Q_OBJECT
++    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
++public:
++    void registerTypes(const char *uri) override;
++};
++
++#endif // MOCK_SYSTEMSETTINGS_WIFI_PLUGIN_H
 === added file 'tests/mocks/Ubuntu/SystemSettings/Wifi/qmldir'
 --- tests/mocks/Ubuntu/SystemSettings/Wifi/qmldir	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Ubuntu/SystemSettings/Wifi/qmldir	2016-08-19 12:48:19 +0000
@@ -0,0 +1,2 @@
++module Ubuntu.SystemSettings.Wifi
++plugin MockUbuntuWifiPanel
 === added directory 'tests/mocks/plugins/wifi'
 === added file 'tests/mocks/plugins/wifi/fakenetworkmanager.cpp'
 --- tests/mocks/plugins/wifi/fakenetworkmanager.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/plugins/wifi/fakenetworkmanager.cpp	2016-08-19 12:48:19 +0000
@@ -0,0 +1,65 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2016 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 warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
++ */
++
++#include "fakenetworkmanager.h"
++
++FakeNetworkManager::FakeNetworkManager(const QVariantMap &parameters,
++                                       QObject *parent)
++    : QObject(parent)
++    , m_dbusTestRunner()
++    , m_dbusMock(m_dbusTestRunner)
++{
++    DBusMock::registerMetaTypes();
++    qDBusRegisterMetaType<QMap<QString, QString> >();
++
++    /* NETWORK_MANAGER_TEMPLATE is the path to the networkmanager.py file,
++    defined in the consuming tests makefile. */
++    m_dbusMock.registerTemplate(NM_SERVICE, NETWORK_MANAGER_TEMPLATE, parameters,
++                                QDBusConnection::SystemBus);
++
++    m_dbusTestRunner.startServices();
++    m_nmMock = new QDBusInterface(NM_SERVICE,
++                                  NM_MAIN_OBJECT,
++                                  NM_IFACE,
++                                  m_dbusTestRunner.systemConnection());
++}
++
++FakeNetworkManager::~FakeNetworkManager()
++{
++    delete m_nmMock;
++}
++
++QVariant FakeNetworkManager::getProperty(const QString &path,
++                                         const QString &interface,
++                                         const QString &property)
++{
++    QDBusInterface iface(NM_SERVICE, path,
++                         FREEDESKTOP_PROPERTIES_IFACE,
++                         m_dbusTestRunner.systemConnection());
++
++    QDBusReply<QVariant> reply = iface.call("Get", interface, property);
++
++    if (reply.isValid()) {
++        return reply.value();
++    } else {
++        qWarning() << "Error getting property from mock:"
++                   << reply.error().message();
++    }
++
++    return reply.isValid() ? reply.value() : QVariant();
++}
 === added file 'tests/mocks/plugins/wifi/fakenetworkmanager.h'
 --- tests/mocks/plugins/wifi/fakenetworkmanager.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/plugins/wifi/fakenetworkmanager.h	2016-08-19 12:48:19 +0000
@@ -0,0 +1,56 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2016 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 warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
++ */
++
++#ifndef FAKE_NETWORK_MANAGER_H
++#define FAKE_NETWORK_MANAGER_H
++
++#include <QObject>
++#include <QVariant>
++#include <QString>
++#include <QDBusConnection>
++#include <QDBusInterface>
++
++#include <libqtdbusmock/DBusMock.h>
++#include <libqtdbustest/DBusTestRunner.h>
++
++#define NM_SERVICE "org.freedesktop.NetworkManager"
++#define NM_IFACE "org.freedesktop.NetworkManager"
++#define NM_MAIN_OBJECT "/org/freedesktop/NetworkManager"
++#define FREEDESKTOP_PROPERTIES_IFACE "org.freedesktop.DBus.Properties"
++
++using namespace QtDBusTest;
++using namespace QtDBusMock;
++
++class FakeNetworkManager : public QObject
++{
++    Q_OBJECT
++public:
++    explicit FakeNetworkManager(const QVariantMap &parameters, QObject *parent = 0);
++    ~FakeNetworkManager();
++
++    const QDBusConnection & dbus() { return m_dbusTestRunner.systemConnection(); }
++    QVariant getProperty(const QString &path,
++                         const QString &interface,
++                         const QString &property);
++private:
++    DBusTestRunner m_dbusTestRunner;
++    DBusMock m_dbusMock;
++    QDBusInterface *m_nmMock;
++};
++
++#endif // FAKE_NETWORK_MANAGER_H
 === modified file 'tests/plugins/CMakeLists.txt'
 --- tests/plugins/CMakeLists.txt	2016-08-12 12:15:26 +0000
 +++ tests/plugins/CMakeLists.txt	2016-08-19 12:48:19 +0000
@@ -4,6 +4,7 @@
  add_subdirectory(security-privacy)
  add_subdirectory(system-update)
  add_subdirectory(bluetooth)
++add_subdirectory(wifi)
  add_subdirectory(notifications)
  set(qmltest_DEFAULT_TARGETS qmluitests)
@@ -13,9 +14,16 @@
+ )
  add_qml_test(mouse mouse
--    IMPORT_PATHS
--    ${CMAKE_SOURCE_DIR}/tests/plugins/mouse
--)
++             IMPORT_PATHS
++             ${CMAKE_SOURCE_DIR}/tests/plugins/mouse
++             ${qmltest_DEFAULT_IMPORT_PATHS})
++
++add_qml_test(wifi OtherNetwork
++             IMPORT_PATHS
++             ${CMAKE_BINARY_DIR}/tests/mocks/
++             ${CMAKE_SOURCE_DIR}/src
++             ${CMAKE_CURRENT_SOURCE_DIR}/wifi
++             ${qmltest_DEFAULT_IMPORT_PATHS})
  set(SYSTEMUPDATE_IMPORT_PATHS
      ${CMAKE_SOURCE_DIR}/src
 === modified file 'tests/plugins/mouse/tst_mouse.qml'
 --- tests/plugins/mouse/tst_mouse.qml	2016-07-30 02:04:45 +0000
 +++ tests/plugins/mouse/tst_mouse.qml	2016-08-19 12:48:19 +0000
@@ -51,8 +51,9 @@
              compare(area.message, i18n.tr("Double-clicked"));
+         }
          function test_double_click_fail() {
++            var timer = findInvisibleChild(testRoot, "clickTimer");
              mouseClick(area);
--            wait(220);
++            tryCompare(timer, "running", false);
              mouseClick(area);
              compare(area.message, i18n.tr("Not fast enough"));
+         }
 === added directory 'tests/plugins/wifi'
 === added file 'tests/plugins/wifi/CMakeLists.txt'
 --- tests/plugins/wifi/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tests/plugins/wifi/CMakeLists.txt	2016-08-19 12:48:19 +0000
@@ -0,0 +1,23 @@
++include_directories(
++    ${CMAKE_SOURCE_DIR}/plugins/wifi
++    ${CMAKE_SOURCE_DIR}/tests/mocks/plugins/wifi
++    ${CMAKE_CURRENT_BINARY_DIR}
++    ${QTDBUSMOCK_INCLUDE_DIRS}
++    ${QTDBUSTEST_INCLUDE_DIRS}
++)
++
++add_definitions(-DNETWORK_MANAGER_TEMPLATE="${CMAKE_SOURCE_DIR}/tests/autopilot/ubuntu_system_settings/tests/networkmanager.py")
++
++add_executable(tst-wifidbushelper
++    tst_wifidbushelper.cpp
++
++    ${CMAKE_SOURCE_DIR}/plugins/wifi/nm_manager_proxy.h
++    ${CMAKE_SOURCE_DIR}/plugins/wifi/nm_settings_proxy.h
++    ${CMAKE_SOURCE_DIR}/plugins/wifi/nm_settings_connection_proxy.h
++
++    ${CMAKE_SOURCE_DIR}/plugins/wifi/wifidbushelper.cpp
++    ${CMAKE_SOURCE_DIR}/tests/mocks/plugins/wifi/fakenetworkmanager.cpp
++)
++qt5_use_modules(tst-wifidbushelper Core DBus Network Test)
++target_link_libraries(tst-wifidbushelper ${QTDBUSMOCK_LIBRARIES} ${QTDBUSTEST_LIBRARIES})
++add_test(tst-wifidbushelper tst-wifidbushelper)
 === added directory 'tests/plugins/wifi/WifiSource'
 === added file 'tests/plugins/wifi/WifiSource/qmldir'
 --- tests/plugins/wifi/WifiSource/qmldir	1970-01-01 00:00:00 +0000
 +++ tests/plugins/wifi/WifiSource/qmldir	2016-08-19 12:48:19 +0000
@@ -0,0 +1,2 @@
++module WifiSource
++OtherNetwork 1.0 ../../../../plugins/wifi/OtherNetwork.qml
 === added file 'tests/plugins/wifi/tst_OtherNetwork.qml'
 --- tests/plugins/wifi/tst_OtherNetwork.qml	1970-01-01 00:00:00 +0000
 +++ tests/plugins/wifi/tst_OtherNetwork.qml	2016-08-19 12:48:19 +0000
@@ -0,0 +1,169 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2016 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 warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
++ */
++
++import QtQuick 2.4
++import QtTest 1.0
++import Ubuntu.Components 1.3
++import Ubuntu.Components.Popups 1.3
++import Ubuntu.SystemSettings.Wifi 1.0
++import Ubuntu.Test 0.1
++
++import WifiSource 1.0
++
++Item {
++    id: testRoot
++    width: units.gu(50)
++    height: units.gu(90)
++
++    OtherNetwork {
++        id: otherNetworkDialog
++    }
++
++    UbuntuTestCase {
++        name: "OtherNetworkTest"
++        when: windowShown
++
++        property var instance
++
++        function init() {
++            instance = PopupUtils.open(otherNetworkDialog);
++        }
++
++        function cleanup() {
++            if (instance) {
++                instance.destroy();
++                tryCompareFunction(function () {
++                    return !!findChild(testRoot, "otherNetworkDialog");
++                }, false);
++            }
++        }
++
++        function setSelectedIndex(objectName, index) {
++            findChild(instance, objectName).selectedIndex = index;
++        }
++
++        function setName(name) {
++            findChild(instance, "networkname").text = name;
++        }
++
++        function setSecurity(index) {
++            setSelectedIndex("securityList", index);
++        }
++
++        function setAuth(index) {
++            setSelectedIndex("authList", index);
++        }
++
++        function setP2auth(index) {
++            setSelectedIndex("p2authList", index);
++        }
++
++        function setPeapVersion(index) {
++            setSelectedIndex("peapVersionList", index);
++        }
++
++        function setUsername(username) {
++            findChild(instance, "username").text = username;
++        }
++
++        function setPassword(password) {
++            findChild(instance, "password").text = password;
++        }
++
++        function cancel() {
++            var btn = findChild(instance, "cancel");
++            mouseClick(btn, btn.width / 2, btn.height / 2);
++        }
++
++        function connect() {
++            var btn = findChild(instance, "connect");
++            mouseClick(btn, btn.width / 2, btn.height / 2);
++        }
++
++        function test_connect_to_hidden_network() {
++            setName("test_ap");
++            setPassword("abcdefgh");
++            connect();
++            DbusHelper.mockDeviceStateChanged(100, 0);
++
++            tryCompare(instance, "state", "SUCCEEDED");
++            compare(DbusHelper.getConnectArguments()["ssid"], "test_ap");
++            compare(DbusHelper.getConnectArguments()["password"], ["abcdefgh", "false"]);
++        }
++
++        function test_connect_to_nonexistant_hidden_network() {
++            setName("n/a");
++            setPassword("abcdefgh");
++            connect();
++            DbusHelper.mockDeviceStateChanged(120, 53);
++            tryCompare(instance, "state", "FAILED");
++
++            compare(instance.text, i18n.tr('The Wi-Fi network could not be found'));
++        }
++
++        function test_connect_to_hidden_network_using_secrets() {
++            setName("test_ap");
++            setPassword("abcdefgh");
++            setSecurity(1);
++            connect();
++            DbusHelper.mockDeviceStateChanged(100, 0);
++
++            compare(DbusHelper.getConnectArguments()["security"], 1);
++        }
++
++        function test_connect_to_hidden_network_using_incorrect_secrets() {
++            setName("test_ap");
++            setPassword("wrongpassword");
++            setSecurity(1);
++            connect();
++            DbusHelper.mockDeviceStateChanged(120, 7);
++
++            compare(instance.text, i18n.tr('Your authentication details were incorrect'));
++        }
++
++        function test_connect_to_hidden_network_then_cancel() {
++            setName("test_ap");
++            setPassword("abcdefgh");
++            connect();
++            cancel();
++
++            verify(DbusHelper.getForgetActiveDeviceCalled());
++        }
++
++        function test_connect_to_eduroam() {
++            setName("eduroam");
++            setUsername("student");
++            setPassword("abcdefgh");
++            setSecurity(2); // wpa-ep
++            setAuth(4); // PEAP
++            setP2auth(1); // MSCHAPv2
++            connect();
++            DbusHelper.mockDeviceStateChanged(100, 0);
++
++            compare(DbusHelper.getConnectArguments(), {
++                "auth": 4,
++                "certs": ["", "", "", "", "1", "2"],
++                "p2auth": 1,
++                "password": ["abcdefgh", "false"],
++                "security": 2,
++                "ssid": "eduroam",
++                "usernames": ["student", ""]
++            });
++        }
++    }
++}
 === added file 'tests/plugins/wifi/tst_wifidbushelper.cpp'
 --- tests/plugins/wifi/tst_wifidbushelper.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/wifi/tst_wifidbushelper.cpp	2016-08-19 12:48:19 +0000
@@ -0,0 +1,163 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2016 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 warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
++ */
++
++#include "wifidbushelper.h"
++#include "fakenetworkmanager.h"
++
++#include <libqtdbusmock/MethodCall.h>
++
++#include <QDBusMetaType>
++#include <QTest>
++#include <QSignalSpy>
++
++class TstDbusHelper: public QObject
++{
++    Q_OBJECT
++private Q_SLOTS:
++    void init()
++    {
++        QVariantMap parameters;
++        m_nmMock = new FakeNetworkManager(parameters);
++        m_dbus = new QDBusConnection(m_nmMock->dbus());
++        m_instance = new WifiDbusHelper(*m_dbus);
++        m_mock = new QDBusInterface(NM_SERVICE,
++                                    NM_MAIN_OBJECT,
++                                    "org.freedesktop.DBus.Mock",
++                                    *m_dbus);
++        m_methodSpy = new QSignalSpy(
++            m_mock, SIGNAL(MethodCalled(const QString&, const QVariantList&))
++        );
++
++        // Add a Wi-Fi device.
++        auto devCall = m_mock->asyncCall("AddWiFiDevice", "0", "wlan0", 100);
++        QDBusPendingCallWatcher devWatcher(devCall);
++        devWatcher.waitForFinished();
++        auto reply = QDBusPendingReply<QString>(devWatcher);
++        if (reply.isError()) {
++            QFAIL("Failed to create device");
++        } else {
++            m_devPath = reply.argumentAt<0>();
++        }
++
++        // Add access points.
++        auto wpa = QList<QVariant>();
++        wpa << m_devPath << "test_ap_wpa" << "test_ap_wpa" << "00:00:00:00:00:00" << (uint) 3
++            << (uint) 60 << (uint) 128 << QVariant::fromValue(uchar(0)) << (uint) 0x00000100;
++        m_mock->callWithArgumentList(QDBus::Block, "AddAccessPoint", wpa);
++
++        auto wpaep = QList<QVariant>();
++        wpaep << m_devPath << "test_ap_wpaep" << "test_ap_wpaep" << "11:11:11:11:11:11" << (uint) 3
++              << (uint) 60 << (uint) 128 << QVariant::fromValue(uchar(0)) << (uint) 0x00000200;
++        m_mock->callWithArgumentList(QDBus::Block, "AddAccessPoint", wpaep);
++    }
++    void cleanup()
++    {
++        m_devPath = QString::null;
++        delete m_methodSpy;
++        delete m_nmMock;
++        delete m_instance;
++        delete m_mock;
++        delete m_dbus;
++    }
++    void testConnect_data()
++    {
++        QTest::addColumn<QString>("ssid");
++        QTest::addColumn<int>("security");
++        QTest::addColumn<int>("auth");
++        QTest::addColumn<QStringList>("usernames");
++        QTest::addColumn<QStringList>("password");
++        QTest::addColumn<QStringList>("certs");
++        QTest::addColumn<int>("p2auth");
++
++        {
++            QString ssid("test_ap_wpa");
++            int security = 1;
++            int auth = 0;
++            QStringList usernames;
++            usernames << "user" << "" << "";
++            QStringList password;
++            password << "password" << "false";
++            QStringList certs;
++            certs << "" << "" << "" << "" << "" << "";
++            int p2auth = 0;
++
++            QTest::newRow("WPA2") << ssid << security << auth << usernames << password << certs << p2auth;
++        }
++        {
++            QString ssid("test_ap_wpaep");
++            int security = 2;
++            int auth = 0;
++            QStringList usernames;
++            usernames << "user" << "" << "";
++            QStringList password;
++            password << "password" << "false";
++            QStringList certs;
++            certs << "" << "" << "" << "" << "" << "";
++            int p2auth = 0;
++
++            QTest::newRow("WPA2 Enterprise") << ssid << security << auth << usernames << password << certs << p2auth;
++        }
++    }
++    void testConnect()
++    {
++        QFETCH(QString, ssid);
++        QFETCH(int, security);
++        QFETCH(int, auth);
++        QFETCH(QStringList, usernames);
++        QFETCH(QStringList, password);
++        QFETCH(QStringList, certs);
++        QFETCH(int, p2auth);
++
++        QSignalSpy activeConnectionSpy(
++            m_mock, SIGNAL(MethodCalled(const QString &, const QVariantList &))
++        );
++
++        m_instance->connect(ssid, security, auth, usernames, password, certs, p2auth);
++
++        QVERIFY(m_methodSpy->wait());
++        QDBusReply<QList<MethodCall>> reply = m_mock->call("GetMethodCalls", "AddAndActivateConnection");
++        QVERIFY2(reply.isValid(), "Method was not called correctly.");
++        QCOMPARE(reply.value().size(), 1); // Called once.
++
++        // Ensure active connection is that of the ssid we connected to.
++        auto path_v = m_nmMock->getProperty(m_devPath,
++                                            "org.freedesktop.NetworkManager.Device",
++                                            "ActiveConnection");
++        auto path = qdbus_cast<QDBusObjectPath>(path_v).path();
++        QCOMPARE(path,
++                 QString("/org/freedesktop/NetworkManager/ActiveConnection/%1")
++                    .arg(ssid));
++
++        // Ensure device state is OK (100).
++        auto state_v = m_nmMock->getProperty(m_devPath,
++                                             "org.freedesktop.NetworkManager.Device",
++                                             "State");
++        auto state = qdbus_cast<uint>(state_v);
++        QCOMPARE(state, (uint) 100);
++    }
++private:
++    QSignalSpy *m_methodSpy;
++    FakeNetworkManager *m_nmMock;
++    QDBusInterface *m_mock;
++    WifiDbusHelper *m_instance;
++    QDBusConnection *m_dbus;
++    QString m_devPath = QString::null;
++};
++
++QTEST_GUILESS_MAIN(TstDbusHelper)
++#include "tst_wifidbushelper.moc"

ubuntu-system-settings

Merge lp:~jonas-drange/ubuntu-system-settings/port-eduroamtest-qml into lp:ubuntu-system-settings

Commit message

Description of the change

Preview Diff

Subscribers