Merge lp:~unity-api-team/indicator-network/connectivity-api-mobile-data-management-tests into lp:indicator-network

[Pete Woods]

New Connectivity Service Private API for managing mobile data and SIM cards. Tests.

New Connectivity Service Private API for managing mobile data and SIM cards. Tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:583
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/414/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/66/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/66/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/414/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:585
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/422/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/74/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/422/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:587
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/429/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/81/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/81/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/429/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:588
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/432/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/84/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/84/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/432/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/indicator-network/connectivity-api-mobile-data-management-tests]

604. By Pete Woods on 2016-05-27

Use a sequence for generating DBus paths

605. By Pete Woods on 2016-05-27

Create our own modem

606. By Pete Woods on 2016-05-27

Start implementing the modem model tests

607. By Pete Woods on 2016-05-31

Init the Sims model before we use it

608. By Pete Woods on 2016-05-31

Remove phone numbers property

609. By Pete Woods on 2016-05-31

Get more ModemsListModel tests working

610. By Antti Kaijanmäki on 2016-05-31

add a test for mobile data switch.

611. By Antti Kaijanmäki on 2016-06-02

more indicator tests.

612. By Antti Kaijanmäki on 2016-06-02

merge.

613. By Antti Kaijanmäki on 2016-06-02

no macros

614. By Antti Kaijanmäki on 2016-06-02

fix cellular2

615. By Antti Kaijanmäki on 2016-06-02

merge

616. By Pete Woods on 2016-06-03

Start making a test for mobile data selector

617. By Antti Kaijanmäki on 2016-06-03

first try of initial mobile data heuristics.

618. By Antti Kaijanmäki on 2016-06-06

debug tests

619. By Antti Kaijanmäki on 2016-06-09

make tests pass.

620. By Antti Kaijanmäki on 2016-06-10

fix build on vivid.

621. By Antti Kaijanmäki on 2016-06-10

fix build on vivid 2.

622. By Antti Kaijanmäki on 2016-06-13

Switch from IMSI to ICCID

623. By Antti Kaijanmäki on 2016-06-13

Fix rest of the tests.

624. By Antti Kaijanmäki on 2016-06-13

remove sim_general.xml

625. By Antti Kaijanmäki on 2016-06-14

foofix

626. By Antti Kaijanmäki on 2016-06-14

DISABLE TESTS

627. By Antti Kaijanmäki on 2016-06-14

add IMSI to SIM interface.

628. By Antti Kaijanmäki on 2016-06-14

indicator: check that simForMobileData is also present before enabling the switch.

629. By Antti Kaijanmäki on 2016-06-15

fix small bugs.

630. By Antti Kaijanmäki on 2016-06-15

whoopsie

631. By Antti Kaijanmäki on 2016-06-16

remove debugging stuff

632. By Antti Kaijanmäki on 2016-06-17

augment tests and visual cleanup.

633. By Antti Kaijanmäki on 2016-06-17

Fix a bug where mobile data is not restored properly on startup.

634. By Antti Kaijanmäki on 2016-06-20

RE-ENABLE TESTS

635. By Antti Kaijanmäki on 2016-06-21

make "hotplugged" SIMs work.

636. By Antti Kaijanmäki on 2016-06-22

fix initial imsi

637. By Antti Kaijanmäki on 2016-06-22

do not wait on MCC and MNC

=== modified file 'data/com.ubuntu.connectivity1.Sim.xml'
--- data/com.ubuntu.connectivity1.Sim.xml	2016-06-22 09:42:47 +0000
+++ data/com.ubuntu.connectivity1.Sim.xml	2016-06-22 09:42:47 +0000
@@ -2,6 +2,7 @@
 
 <node>
     <interface name="com.ubuntu.connectivity1.Sim">
+        <property name="Iccid" type="s" access="read" />
         <property name="Imsi" type="s" access="read" />
         <property name="PrimaryPhoneNumber" type="s" access="read" />
         <property name="Locked" type="b" access="read" />
 
=== modified file 'debian/control'
--- debian/control	2016-02-15 09:31:38 +0000
+++ debian/control	2016-06-22 09:42:47 +0000
@@ -12,7 +12,7 @@
                graphviz,
                intltool,
                libglib2.0-dev,
-               libgmenuharness-dev,
+               libgmenuharness-dev (>= 0.1.1),
                libqofono-dev,
                libqofono-qt5-0,
                libqtdbusmock1-dev (>= 0.4),
 
=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp'
--- src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp	2016-06-22 09:42:47 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp	2016-06-22 09:42:47 +0000
@@ -180,6 +180,7 @@
         else if (name == "SimForMobileData")
         {
             auto path = value.value<QDBusObjectPath>();
+            p.sims();
             auto sim = m_simsModel->getSimByPath(path);
             p.setSimForMobileData(sim.get());
         }
@@ -188,6 +189,7 @@
     void simsUpdated()
     {
         auto path = m_writePropertyCache->get("SimForMobileData").value<QDBusObjectPath>();
+        p.sims();
         auto sim = m_simsModel->getSimByPath(path);
         p.setSimForMobileData(sim.get());
     }
@@ -424,6 +426,7 @@
 
 Sim *Connectivity::simForMobileData() const
 {
+    sims();
     return d->m_simForMobileData.get();
 }
 
 
=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/modem.cpp'
--- src/connectivity-api/connectivity-qt/connectivityqt/modem.cpp	2016-06-22 09:42:47 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/modem.cpp	2016-06-22 09:42:47 +0000
@@ -43,14 +43,14 @@
     {
         if (name == "Sim")
         {
-            auto sim = m_sims->getSimByPath(value.value<QDBusObjectPath>());
-            setSim(sim);
+            simsUpdated();
         }
     }
 
     void simsUpdated()
     {
-        auto sim = m_sims->getSimByPath(m_propertyCache->get("Sim").value<QDBusObjectPath>());
+        auto path = m_propertyCache->get("Sim").value<QDBusObjectPath>();
+        auto sim = m_sims->getSimByPath(path);
         setSim(sim);
     }
 
@@ -96,7 +96,7 @@
                 &internal::DBusPropertyCache::propertyChanged, d.get(),
                 &Priv::propertyChanged);
 
-    d->m_sim = d->m_sims->getSimByPath(d->m_propertyCache->get("Sim").value<QDBusObjectPath>());
+    d->simsUpdated();
 
     connect(d->m_sims.get(), &SimsListModel::simsUpdated, d.get(), &Priv::simsUpdated);
 }
 
=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.cpp'
--- src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.cpp	2016-06-22 09:42:47 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.cpp	2016-06-22 09:42:47 +0000
@@ -77,7 +77,7 @@
             p.beginInsertRows(QModelIndex(), m_modems.size(), m_modems.size() + toAdd.size() - 1);
             for (const auto& path: toAdd)
             {
-                auto modem = std::make_shared<Modem>(path, m_propertyCache->connection(), m_sims, nullptr);
+                auto modem = std::make_shared<Modem>(path, m_propertyCache->connection(), m_sims);
                 m_objectOwner(modem.get());
                 m_modems << modem;
                 connect(modem.get(), &Modem::simChanged, this, &Priv::simChanged);
@@ -178,6 +178,9 @@
         case Roles::RoleSerial:
             return modem->serial();
             break;
+        case Roles::RoleModem:
+            return QVariant::fromValue<Modem*>(modem.get());
+            break;
         case Roles::RoleSim:
             return QVariant::fromValue<Sim*>(modem->sim());
             break;
 
=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.h'
--- src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.h	2016-06-22 09:42:47 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.h	2016-06-22 09:42:47 +0000
@@ -49,6 +49,7 @@
     {
         RoleIndex = Qt::UserRole + 1,
         RoleSerial,
+        RoleModem,
         RoleSim
     };
 
@@ -67,6 +68,7 @@
         QHash<int, QByteArray> roles;
         roles[RoleIndex] = "Index";
         roles[RoleSerial] = "Serial";
+        roles[RoleModem] = "Modem";
         roles[RoleSim] = "Sim";
         return roles;
     }
 
=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/sim.cpp'
--- src/connectivity-api/connectivity-qt/connectivityqt/sim.cpp	2016-06-22 09:42:47 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/sim.cpp	2016-06-22 09:42:47 +0000
@@ -50,11 +50,16 @@
         } else if (name == "DataRoamingEnabled")
         {
             Q_EMIT p.dataRoamingEnabledChanged(value.toBool());
+        } else if (name == "Imsi")
+        {
+            Q_EMIT p.imsiChanged(value.toString());
+        } else if (name == "PrimaryPhoneNumber")
+        {
+            Q_EMIT p.primaryPhoneNumberChanged(value.toString());
         } else {
             qWarning() << "connectivityqt::Sim::Priv::propertyChanged(): "
                        << "Unexpected property: " << name;
         }
-
     }
 
 public:
@@ -92,6 +97,11 @@
     return QDBusObjectPath(d->m_simInterface->path());
 }
 
+QString Sim::iccid() const
+{
+    return d->m_propertyCache->get("Iccid").toString();
+}
+
 QString Sim::imsi() const
 {
     return d->m_propertyCache->get("Imsi").toString();
@@ -102,11 +112,6 @@
     return d->m_propertyCache->get("PrimaryPhoneNumber").toString();
 }
 
-QList<QString> Sim::phoneNumbers() const
-{
-    return d->m_propertyCache->get("PhoneNumbers").toStringList();
-}
-
 bool Sim::locked() const
 {
     return d->m_propertyCache->get("Locked").toBool();
 
=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/sim.h'
--- src/connectivity-api/connectivity-qt/connectivityqt/sim.h	2016-06-22 09:42:47 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/sim.h	2016-06-22 09:42:47 +0000
@@ -42,25 +42,25 @@
     Q_PROPERTY(QDBusObjectPath path READ path)
     QDBusObjectPath path() const;
 
-    Q_PROPERTY(QString Imsi READ imsi CONSTANT)
+    Q_PROPERTY(QString Iccid READ iccid CONSTANT)
+    QString iccid() const;
+
+    Q_PROPERTY(QString Imsi READ imsi NOTIFY imsiChanged)
     QString imsi() const;
 
-    Q_PROPERTY(QString PrimaryPhoneNumber READ primaryPhoneNumber CONSTANT)
+    Q_PROPERTY(QString PrimaryPhoneNumber READ primaryPhoneNumber NOTIFY primaryPhoneNumberChanged)
     QString primaryPhoneNumber() const;
 
-    Q_PROPERTY(QList<QString> PhoneNumbers READ phoneNumbers CONSTANT)
-    QList<QString> phoneNumbers() const;
-
     Q_PROPERTY(bool Locked READ locked NOTIFY lockedChanged)
     bool locked() const;
 
     Q_PROPERTY(bool Present READ present NOTIFY presentChanged)
     bool present() const;
 
-    Q_PROPERTY(QString Mcc READ mcc CONSTANT)
+    Q_PROPERTY(QString Mcc READ mcc NOTIFY mccChanged)
     QString mcc() const;
 
-    Q_PROPERTY(QString Mnc READ mnc CONSTANT)
+    Q_PROPERTY(QString Mnc READ mnc NOTIFY mncChanged)
     QString mnc() const;
 
     Q_PROPERTY(QList<QString> PreferredLanguages READ preferredLanguages CONSTANT)
@@ -78,7 +78,10 @@
     void lockedChanged(bool value);
     void presentChanged(bool value);
     void dataRoamingEnabledChanged(bool value);
-
+    void imsiChanged(const QString &value);
+    void primaryPhoneNumberChanged(const QString &value);
+    void mccChanged(const QString &value);
+    void mncChanged(const QString &value);
 
 protected:
     class Priv;
 
=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.cpp'
--- src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.cpp	2016-06-22 09:42:47 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.cpp	2016-06-22 09:42:47 +0000
@@ -82,6 +82,10 @@
                 connect(sim.get(), &Sim::lockedChanged, this, &Priv::lockedChanged);
                 connect(sim.get(), &Sim::presentChanged, this, &Priv::presentChanged);
                 connect(sim.get(), &Sim::dataRoamingEnabledChanged, this, &Priv::dataRoamingEnabledChanged);
+                connect(sim.get(), &Sim::imsiChanged, this, &Priv::imsiChanged);
+                connect(sim.get(), &Sim::primaryPhoneNumberChanged, this, &Priv::primaryPhoneNumberChanged);
+                connect(sim.get(), &Sim::mccChanged, this, &Priv::mccChanged);
+                connect(sim.get(), &Sim::mncChanged, this, &Priv::mncChanged);
             }
             p.endInsertRows();
         }
@@ -119,6 +123,26 @@
         auto idx = findSim(sender());
         p.dataChanged(idx, idx, {SimsListModel::Roles::RoleDataRoamingEnabled});
     }
+    void imsiChanged()
+    {
+        auto idx = findSim(sender());
+        p.dataChanged(idx, idx, {SimsListModel::Roles::RoleImsi});
+    }
+    void primaryPhoneNumberChanged()
+    {
+        auto idx = findSim(sender());
+        p.dataChanged(idx, idx, {SimsListModel::Roles::RolePrimaryPhoneNumber});
+    }
+    void mccChanged()
+    {
+        auto idx = findSim(sender());
+        p.dataChanged(idx, idx, {SimsListModel::Roles::RoleMcc});
+    }
+    void mncChanged()
+    {
+        auto idx = findSim(sender());
+        p.dataChanged(idx, idx, {SimsListModel::Roles::RoleMnc});
+    }
 
     void propertyChanged(const QString& name, const QVariant& value)
     {
@@ -183,15 +207,15 @@
 
     switch (role)
     {
+        case Roles::RoleIccid:
+            return sim->iccid();
+            break;
         case Roles::RoleImsi:
             return sim->imsi();
             break;
         case Roles::RolePrimaryPhoneNumber:
             return sim->primaryPhoneNumber();
             break;
-        case Roles::RolePhoneNumbers:
-            return QVariant::fromValue<QStringList>(sim->phoneNumbers());
-            break;
         case RoleLocked:
             return sim->locked();
             break;
@@ -209,7 +233,7 @@
         case Roles::RoleDataRoamingEnabled:
             return sim->dataRoamingEnabled();
             break;
-        case Roles::RoleSimObject:
+        case Roles::RoleSim:
             return QVariant::fromValue<Sim*>(sim.get());
             break;
     }
 
=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.h'
--- src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.h	2016-06-22 09:42:47 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.h	2016-06-22 09:42:47 +0000
@@ -47,16 +47,16 @@
 
     enum Roles
     {
-        RoleImsi = Qt::UserRole + 1,
+        RoleIccid = Qt::UserRole + 1,
+        RoleImsi,
         RolePrimaryPhoneNumber,
-        RolePhoneNumbers,
         RoleLocked,
         RolePresent,
         RoleMcc,
         RoleMnc,
         RolePreferredLanguages,
         RoleDataRoamingEnabled,
-        RoleSimObject
+        RoleSim
     };
 
     SimsListModel(const internal::SimsListModelParameters& parameters);
@@ -72,25 +72,22 @@
     QHash<int, QByteArray> roleNames() const override
     {
         QHash<int, QByteArray> roles;
+        roles[RoleIccid] = "Iccid";
         roles[RoleImsi] = "Imsi";
         roles[RolePrimaryPhoneNumber] = "PrimaryPhoneNumber";
-        roles[RolePhoneNumbers] = "PhoneNumbers";
         roles[RoleLocked] = "Locked";
         roles[RolePresent] = "Present";
         roles[RoleMcc] = "Mcc";
         roles[RoleMnc] = "Mnc";
         roles[RolePreferredLanguages] = "PreferredLanguages";
         roles[RoleDataRoamingEnabled] = "DataRoamingEnabled";
-        roles[RoleSimObject] = "SimObject";
+        roles[RoleSim] = "Sim";
         return roles;
     }
 
     Sim::SPtr getSimByPath(const QDBusObjectPath &path) const;
 
-public Q_SLOTS:
-
 Q_SIGNALS:
-
     void simsUpdated();
 
 protected:
 
=== modified file 'src/indicator/connectivity-service/connectivity-service.cpp'
--- src/indicator/connectivity-service/connectivity-service.cpp	2016-06-22 09:42:47 +0000
+++ src/indicator/connectivity-service/connectivity-service.cpp	2016-06-22 09:42:47 +0000
@@ -188,32 +188,37 @@
 
     void updateSims()
     {
-        auto current_imsis = m_sims.keys().toSet();
+        auto current_iccids = m_sims.keys().toSet();
+
         QMap<QString, nmofono::wwan::Sim::Ptr> sims;
         for (auto i : m_manager->sims())
         {
-            sims[i->imsi()] = i;
+            sims[i->iccid()] = i;
         }
         auto toAdd(sims.keys().toSet());
-        toAdd.subtract(current_imsis);
+        toAdd.subtract(current_iccids);
 
-        auto toRemove(current_imsis);
+        auto toRemove(current_iccids);
         toRemove.subtract(sims.keys().toSet());
 
-        for (auto imsi : toRemove)
-        {
-            m_sims.remove(imsi);
-        }
-
-        for (auto imsi : toAdd)
-        {
-            DBusSim::SPtr dbussim = make_shared<DBusSim>(sims[imsi], m_connection);
-            m_sims[imsi] = dbussim;
-        }
-
-        notifyPrivateProperties({
-            "Sims"
-        });
+        for (auto iccid : toRemove)
+        {
+            m_sims.remove(iccid);
+        }
+
+        for (auto iccid : toAdd)
+        {
+            DBusSim::SPtr dbussim = make_shared<DBusSim>(sims[iccid], m_connection);
+            m_sims[iccid] = dbussim;
+        }
+
+        if (!toRemove.isEmpty() || !toAdd.isEmpty())
+        {
+            notifyPrivateProperties({
+                "Sims"
+            });
+            flushProperties();
+        }
     }
 
     void updateModems()
@@ -244,9 +249,14 @@
             updateModemSimPath(dbusmodem, m->sim());
             connect(m.get(), &wwan::Modem::simUpdated, this, &Private::modemSimUpdated);
         }
-        notifyPrivateProperties({
-            "Modems"
-        });
+
+        if (!toRemove.isEmpty() || !toAdd.isEmpty())
+        {
+            notifyPrivateProperties({
+                "Modems"
+            });
+            flushProperties();
+        }
     }
 
     void modemSimUpdated()
@@ -259,11 +269,20 @@
     {
         if (!sim)
         {
-            modem->setSim(QDBusObjectPath("/"));
+            modem->setSim(QDBusObjectPath ("/"));
         }
         else
         {
-            modem->setSim(m_sims[sim->imsi()]->path());
+            if (m_sims.contains (sim->iccid()))
+            {
+                auto dbusSim = m_sims[sim->iccid()];
+                modem->setSim(dbusSim->path());
+            }
+            else
+            {
+                qWarning() << "Could not find SIM with ICCID:"
+                           << sim->iccid();
+            }
         }
     }
 
@@ -634,8 +653,15 @@
         return QDBusObjectPath("/");
     }
 
-    Q_ASSERT(p.d->m_sims.contains(sim->imsi()));
-    return p.d->m_sims[sim->imsi()]->path();
+    if (p.d->m_sims.contains(sim->iccid()))
+    {
+        return p.d->m_sims[sim->iccid()]->path();
+    }
+    else
+    {
+        qWarning() << "Could not find SIM for ICCID:" << sim->iccid();
+        return QDBusObjectPath("/");
+    }
 }
 
 void PrivateService::setSimForMobileData(const QDBusObjectPath &path)
 
=== modified file 'src/indicator/connectivity-service/dbus-modem.cpp'
--- src/indicator/connectivity-service/dbus-modem.cpp	2016-06-22 09:42:47 +0000
+++ src/indicator/connectivity-service/dbus-modem.cpp	2016-06-22 09:42:47 +0000
@@ -33,7 +33,7 @@
     m_modem(modem),
     m_connection(connection)
 {
-    m_path.setPath(DBusTypes::modemPath(m_modem->serial()));
+    m_path.setPath(DBusTypes::modemPath());
 
     new ModemAdaptor(this);
 
 
=== modified file 'src/indicator/connectivity-service/dbus-sim.cpp'
--- src/indicator/connectivity-service/dbus-sim.cpp	2016-06-22 09:42:47 +0000
+++ src/indicator/connectivity-service/dbus-sim.cpp	2016-06-22 09:42:47 +0000
@@ -35,7 +35,7 @@
     m_sim(sim),
     m_connection(connection)
 {
-    m_path.setPath(DBusTypes::simPath(m_sim->imsi()));
+    m_path.setPath(DBusTypes::simPath());
 
     new SimAdaptor(this);
 
@@ -44,6 +44,10 @@
     connect(sim.get(), &Sim::lockedChanged, this, &DBusSim::lockedChanged);
     connect(sim.get(), &Sim::presentChanged, this, &DBusSim::presentChanged);
     connect(sim.get(), &Sim::dataRoamingEnabledChanged, this, &DBusSim::dataRoamingEnabledChanged);
+    connect(sim.get(), &Sim::imsiChanged, this, &DBusSim::imsiChanged);
+    connect(sim.get(), &Sim::primaryPhoneNumberChanged, this, &DBusSim::primaryPhoneNumberChanged);
+    connect(sim.get(), &Sim::mccChanged, this, &DBusSim::mccChanged);
+    connect(sim.get(), &Sim::mncChanged, this, &DBusSim::mncChanged);
 }
 
 DBusSim::~DBusSim()
@@ -74,6 +78,11 @@
     );
 }
 
+QString DBusSim::iccid() const
+{
+    return m_sim->iccid();
+}
+
 QString DBusSim::imsi() const
 {
     return m_sim->imsi();
@@ -139,6 +148,26 @@
     notifyProperties({"DataRoamingEnabled"});
 }
 
+void DBusSim::imsiChanged()
+{
+    notifyProperties({"Imsi"});
+}
+
+void DBusSim::primaryPhoneNumberChanged()
+{
+    notifyProperties({"PrimaryPhoneNumber"});
+}
+
+void DBusSim::mccChanged()
+{
+    notifyProperties({"Mcc"});
+}
+
+void DBusSim::mncChanged()
+{
+    notifyProperties({"Mnc"});
+}
+
 nmofono::wwan::Sim::Ptr DBusSim::sim() const
 {
     return m_sim;
 
=== modified file 'src/indicator/connectivity-service/dbus-sim.h'
--- src/indicator/connectivity-service/dbus-sim.h	2016-06-22 09:42:47 +0000
+++ src/indicator/connectivity-service/dbus-sim.h	2016-06-22 09:42:47 +0000
@@ -48,6 +48,9 @@
 
     virtual ~DBusSim();
 
+    Q_PROPERTY(QString Iccid READ iccid)
+    QString iccid() const;
+
     Q_PROPERTY(QString Imsi READ imsi)
     QString imsi() const;
 
@@ -86,6 +89,10 @@
     void lockedChanged();
     void presentChanged();
     void dataRoamingEnabledChanged();
+    void imsiChanged();
+    void primaryPhoneNumberChanged();
+    void mccChanged();
+    void mncChanged();
 
 private:
     void notifyProperties(const QStringList& propertyNames);
 
=== modified file 'src/indicator/factory.cpp'
--- src/indicator/factory.cpp	2016-06-22 09:42:47 +0000
+++ src/indicator/factory.cpp	2016-06-22 09:42:47 +0000
@@ -216,10 +216,10 @@
     auto switch_r = s.get();
     auto manager_r = manager.get();
     QObject::connect(manager_r, &nmofono::Manager::flightModeUpdated, switch_r, [manager_r, switch_r](bool value) {
-        switch_r->setEnabled(!value && manager_r->simForMobileData());
+        switch_r->setEnabled(!value && manager_r->simForMobileData() && manager_r->simForMobileData()->present());
     });
     QObject::connect(manager_r, &nmofono::Manager::simForMobileDataChanged, switch_r, [manager_r, switch_r]() {
-        switch_r->setEnabled(!manager_r->flightMode() && manager_r->simForMobileData());
+        switch_r->setEnabled(!manager_r->flightMode() && manager_r->simForMobileData() && manager_r->simForMobileData()->present());
     });
 
     return s;
 
=== modified file 'src/indicator/nmofono/connectivity-service-settings.cpp'
--- src/indicator/nmofono/connectivity-service-settings.cpp	2016-06-22 09:42:47 +0000
+++ src/indicator/nmofono/connectivity-service-settings.cpp	2016-06-22 09:42:47 +0000
@@ -19,6 +19,7 @@
 
 #include <nmofono/connectivity-service-settings.h>
 
+using namespace std;
 using namespace nmofono;
 
 class ConnectivityServiceSettings::Private : public QObject
@@ -27,16 +28,11 @@
 public:
 
     ConnectivityServiceSettings &p;
-    QSettings *m_settings;
+    unique_ptr<QSettings> m_settings;
 
     Private(ConnectivityServiceSettings &parent)
         : p(parent)
     {
-        m_settings = new QSettings(QSettings::IniFormat,
-                                   QSettings::UserScope,
-                                   "Ubuntu",
-                                   "connectivityservice",
-                                   this);
     }
 
     virtual ~Private()
@@ -54,7 +50,19 @@
     : QObject(parent),
       d{new Private(*this)}
 {
-
+    if (qEnvironmentVariableIsSet("INDICATOR_NETWORK_SETTINGS_PATH"))
+    {
+        // For testing only
+        QString path = QString::fromUtf8(qgetenv("INDICATOR_NETWORK_SETTINGS_PATH")) + "/config.ini";
+        d->m_settings = make_unique<QSettings>(path, QSettings::IniFormat);
+    }
+    else
+    {
+        d->m_settings = make_unique<QSettings>(QSettings::IniFormat,
+                                               QSettings::UserScope,
+                                               "connectivity-service",
+                                               "config");
+    }
 }
 
 ConnectivityServiceSettings::~ConnectivityServiceSettings()
@@ -66,20 +74,20 @@
 {
     return d->m_settings->value("MobileDataEnabled");
 }
+
 void ConnectivityServiceSettings::setMobileDataEnabled(bool value)
 {
     d->m_settings->setValue("MobileDataEnabled", value);
-    d->m_settings->sync();
 }
 
 QVariant ConnectivityServiceSettings::simForMobileData()
 {
     return d->m_settings->value("SimForMobileData");
 }
-void ConnectivityServiceSettings::setSimForMobileData(const QString &imsi)
+
+void ConnectivityServiceSettings::setSimForMobileData(const QString &iccid)
 {
-    d->m_settings->setValue("SimForMobileData", imsi);
-    d->m_settings->sync();
+    d->m_settings->setValue("SimForMobileData", iccid);
 }
 
 QStringList ConnectivityServiceSettings::knownSims()
@@ -100,12 +108,12 @@
 void ConnectivityServiceSettings::setKnownSims(const QStringList &list)
 {
     d->m_settings->setValue("KnownSims", QVariant(list));
-    d->m_settings->sync();
 }
 
-wwan::Sim::Ptr ConnectivityServiceSettings::createSimFromSettings(const QString &imsi)
+wwan::Sim::Ptr ConnectivityServiceSettings::createSimFromSettings(const QString &iccid)
 {
-    d->m_settings->beginGroup(QString("Sims/%1/").arg(imsi));
+    d->m_settings->beginGroup(QString("Sims/%1/").arg(iccid));
+    QVariant imsi_var = d->m_settings->value("Imsi");
     QVariant primaryPhoneNumber_var = d->m_settings->value("PrimaryPhoneNumber");
     QVariant mcc_var = d->m_settings->value("Mcc");
     QVariant mnc_var = d->m_settings->value("Mnc");
@@ -113,19 +121,21 @@
     QVariant dataRoamingEnabled_var = d->m_settings->value("DataRoamingEnabled");
     d->m_settings->endGroup();
 
-    if (imsi.isNull() ||
+    if (iccid.isNull() ||
+            imsi_var.isNull() ||
             primaryPhoneNumber_var.isNull() ||
             mcc_var.isNull() ||
             mnc_var.isNull() ||
             preferredLanguages_var.isNull() ||
             dataRoamingEnabled_var.isNull())
     {
-        qWarning() << "Corrupt settings for SIM: " << imsi;
-        d->m_settings->remove(QString("Sims/%1/").arg(imsi));
+        qWarning() << "Corrupt settings for SIM: " << iccid;
+        d->m_settings->remove(QString("Sims/%1/").arg(iccid));
         return wwan::Sim::Ptr();
     }
 
-    return wwan::Sim::Ptr(new wwan::Sim(imsi,
+    return wwan::Sim::Ptr(new wwan::Sim(iccid,
+                                        imsi_var.toString(),
                                         primaryPhoneNumber_var.toString(),
                                         mcc_var.toString(),
                                         mnc_var.toString(),
@@ -135,14 +145,14 @@
 
 void ConnectivityServiceSettings::saveSimToSettings(wwan::Sim::Ptr sim)
 {
-    d->m_settings->beginGroup(QString("Sims/%1/").arg(sim->imsi()));
-    d->m_settings->setValue("PrimaryPhoneNumber", QVariant(sim->primaryPhoneNumber()));
+    d->m_settings->beginGroup(QString("Sims/%1/").arg(sim->iccid()));
+    d->m_settings->setValue("Imsi", sim->imsi());
+    d->m_settings->setValue("PrimaryPhoneNumber", sim->primaryPhoneNumber());
     d->m_settings->setValue("Mcc", sim->mcc());
     d->m_settings->setValue("Mnc", sim->mnc());
     d->m_settings->setValue("PreferredLanguages", QVariant(sim->preferredLanguages()));
     d->m_settings->setValue("DataRoamingEnabled", sim->dataRoamingEnabled());
     d->m_settings->endGroup();
-    d->m_settings->sync();
 }
 
 #include "connectivity-service-settings.moc"
 
=== modified file 'src/indicator/nmofono/connectivity-service-settings.h'
--- src/indicator/nmofono/connectivity-service-settings.h	2016-06-22 09:42:47 +0000
+++ src/indicator/nmofono/connectivity-service-settings.h	2016-06-22 09:42:47 +0000
@@ -50,12 +50,12 @@
     void setMobileDataEnabled(bool value);
 
     QVariant simForMobileData();
-    void setSimForMobileData(const QString &imsi);
+    void setSimForMobileData(const QString &iccid);
 
     QStringList knownSims();
     void setKnownSims(const QStringList &list);
 
-    wwan::Sim::Ptr createSimFromSettings(const QString &imsi);
+    wwan::Sim::Ptr createSimFromSettings(const QString &iccid);
     void saveSimToSettings(wwan::Sim::Ptr sim);
 
 public Q_SLOTS:
 
=== modified file 'src/indicator/nmofono/manager-impl.cpp'
--- src/indicator/nmofono/manager-impl.cpp	2016-06-22 09:42:47 +0000
+++ src/indicator/nmofono/manager-impl.cpp	2016-06-22 09:42:47 +0000
@@ -96,58 +96,11 @@
     Private(Manager& parent) :
         p(parent)
     {
-        m_settings = std::make_shared<ConnectivityServiceSettings>();
-
-        m_simManager = make_shared<wwan::SimManager>(m_settings);
-        m_sims = m_simManager->knownSims();
-        connect(m_simManager.get(), &wwan::SimManager::simAdded, this, &Private::simAdded);
-
-        QVariant ret = m_settings->mobileDataEnabled();
-        if (ret.isNull())
-        {
-            /* This is the first time we are running on a system.
-             *
-             * We need to figure out the status of mobile data from looking
-             * at the individual modems.
-             */
-            m_mobileDataEnabledPending = true;
-            m_settings->setMobileDataEnabled(false);
-        }
-        else
-        {
-            m_mobileDataEnabled = ret.toBool();
-        }
-
-        ret = m_settings->simForMobileData();
-        if (ret.isNull())
-        {
-            /* This is the first time we are running on a system.
-             *
-             * We need to figure out the SIM used for mobile data
-             * from the individual modems.
-             */
-            m_simForMobileDataPending = true;
-            m_settings->setSimForMobileData(QString());
-        }
-        else
-        {
-            QString imsi = ret.toString();
-            wwan::Sim::Ptr sim;
-            for(auto i = m_sims.begin(); i != m_sims.end(); i++)
-            {
-                if ((*i)->imsi() == imsi) {
-                    sim = *i;
-                    break;
-                }
-            }
-            m_simForMobileData = sim;
-        }
-
     }
 
     void matchModemsAndSims()
     {
-        for (wwan::Modem::Ptr modem: m_modems)
+        for (wwan::Modem::Ptr modem: m_ofonoLinks)
         {
             bool match = false;
             for(wwan::Sim::Ptr sim : m_sims)
@@ -169,8 +122,31 @@
     void simAdded(wwan::Sim::Ptr sim)
     {
         m_sims.append(sim);
-        matchModemsAndSims();
+        connect(sim.get(), &wwan::Sim::presentChanged, this, &Private::matchModemsAndSims);
         Q_EMIT p.simsChanged();
+        matchModemsAndSims();
+    }
+
+    void initialDataOnSet()
+    {
+        wwan::Sim *sim_raw = qobject_cast<wwan::Sim*>(sender());
+        if (!sim_raw)
+        {
+            Q_ASSERT(0);
+            return;
+        }
+        wwan::Sim::Ptr sim = sim_raw->shared_from_this();
+
+        if (!m_mobileDataEnabledPending && !m_simForMobileDataPending)
+        {
+            return;
+        }
+
+        if (sim->initialDataOn())
+        {
+            setMobileDataEnabled(true);
+            setSimForMobileData(sim);
+        }
     }
 
     void modemReady()
@@ -181,8 +157,21 @@
             Q_ASSERT(0);
             return;
         }
-        m_modems.append(m_ofonoLinks[modem_raw->name()]);
-        matchModemsAndSims();
+        auto modem = m_ofonoLinks[modem_raw->name()];
+        if (!modem->sim())
+        {
+            matchModemsAndSims();
+        }
+
+        if (m_mobileDataEnabledPending || m_simForMobileDataPending)
+        {
+            connect(modem->sim().get(), &wwan::Sim::initialDataOnSet, this, &Private::initialDataOnSet);
+            if (modem->sim()->initialDataOn())
+            {
+                modem->sim()->initialDataOnSet();
+            }
+        }
+        m_modems.append(modem);
         Q_EMIT p.modemsChanged();
     }
 
@@ -197,6 +186,50 @@
         Q_EMIT p.unstoppableOperationHappeningUpdated(m_unstoppableOperationHappening);
     }
 
+    void loadSettings()
+    {
+        QVariant ret = m_settings->mobileDataEnabled();
+        if (ret.isNull())
+        {
+            /* This is the first time we are running on a system.
+             *
+             * We need to figure out the status of mobile data from looking
+             * at the individual modems.
+             */
+            m_mobileDataEnabledPending = true;
+            m_settings->setMobileDataEnabled(false);
+        }
+        else
+        {
+            setMobileDataEnabled(ret.toBool());
+        }
+
+        ret = m_settings->simForMobileData();
+        if (ret.isNull())
+        {
+            /* This is the first time we are running on a system.
+             *
+             * We need to figure out the SIM used for mobile data
+             * from the individual modems.
+             */
+            m_simForMobileDataPending = true;
+            m_settings->setSimForMobileData(QString());
+        }
+        else
+        {
+            QString iccid = ret.toString();
+            wwan::Sim::Ptr sim;
+            for(auto i = m_sims.begin(); i != m_sims.end(); i++)
+            {
+                if ((*i)->iccid() == iccid) {
+                    sim = *i;
+                    break;
+                }
+            }
+            setSimForMobileData(sim);
+        }
+    }
+
 public Q_SLOTS:
     void updateHasWifi()
     {
@@ -316,7 +349,6 @@
             m_ofonoLinks[path] = modem;
             connect(modem.get(), &wwan::Modem::readyToUnlock, this, &Private::modemReadyToUnlock);
             connect(modem.get(), &wwan::Modem::ready, this, &Private::modemReady);
-            matchModemsAndSims();
         }
 
         Q_EMIT p.linksUpdated();
@@ -326,10 +358,11 @@
     }
 
     void setMobileDataEnabled(bool value) {
-        if (m_mobileDataEnabled == value)
+        if (m_mobileDataEnabled == value && !m_mobileDataEnabledPending)
         {
             return;
         }
+        m_mobileDataEnabledPending = false;
 
         m_settings->setMobileDataEnabled(value);
         m_mobileDataEnabled = value;
@@ -357,10 +390,14 @@
     }
 
     void setSimForMobileData(wwan::Sim::Ptr sim) {
-        if (m_simForMobileData == sim)
+        if (m_simForMobileData == sim && !m_simForMobileDataPending)
         {
             return;
         }
+        if (m_simForMobileDataPending) {
+            m_simForMobileDataPending = false;
+            setMobileDataEnabled(m_mobileDataEnabled);
+        }
 
         if (m_simForMobileData)
         {
@@ -373,14 +410,14 @@
         }
         else
         {
-            m_settings->setSimForMobileData(sim->imsi());
+            m_settings->setSimForMobileData(sim->iccid());
         }
 
 
         m_simForMobileData = sim;
         if (m_simForMobileData)
         {
-            m_simForMobileData->setMobileDataEnabled(p.mobileDataEnabled());
+            m_simForMobileData->setMobileDataEnabled(m_mobileDataEnabled);
         }
 
         Q_EMIT p.simForMobileDataChanged();
@@ -428,6 +465,17 @@
     connect(d->m_unlockDialog.get(), &SimUnlockDialog::ready, d.get(), &Private::sim_unlock_ready);
 
     d->m_ofono = make_shared<QOfonoManager>();
+
+    // Load the SIM manager before we connect to the signals
+    d->m_settings = make_shared<ConnectivityServiceSettings>();
+    d->m_simManager = make_shared<wwan::SimManager>(d->m_ofono, d->m_settings);
+    connect(d->m_simManager.get(), &wwan::SimManager::simAdded, d.get(), &Private::simAdded);
+    d->m_sims = d->m_simManager->knownSims();
+    for (auto sim : d->m_sims)
+    {
+        connect(sim.get(), &wwan::Sim::presentChanged, d.get(), &Private::matchModemsAndSims);
+    }
+
     connect(d->m_ofono.get(), &QOfonoManager::modemsChanged, d.get(), &Private::modems_changed);
     d->modems_changed(d->m_ofono->modems());
 
@@ -460,6 +508,8 @@
     /// @todo set by the default connections.
     d->m_characteristics = Link::Characteristics::empty;
 
+    d->loadSettings();
+
     d->updateHasWifi();
 }
 
 
=== modified file 'src/indicator/nmofono/wwan/modem.cpp'
--- src/indicator/nmofono/wwan/modem.cpp	2016-06-22 09:42:47 +0000
+++ src/indicator/nmofono/wwan/modem.cpp	2016-06-22 09:42:47 +0000
@@ -99,6 +99,8 @@
 
     QString m_serial;
     bool m_serialSet = false;
+    bool m_presentSet = false;
+    bool m_present = false;
     bool m_readyFired = false;
 
     QString m_operatorName;
@@ -169,6 +171,19 @@
 
         if (m_serialSet && !m_readyFired)
         {
+            if (!m_simManager)
+            {
+                return;
+            }
+
+            if (!m_sim)
+            {
+                if (!m_presentSet)
+                {
+                    return;
+                }
+            }
+
             m_readyFired = true;
             Q_EMIT p.ready();
         }
@@ -267,11 +282,22 @@
             connect(m_simManager.get(),
                     &QOfonoSimManager::resetPinComplete, this,
                     &Private::resetPinComplete);
+
+            connect(m_simManager.get(),
+                    &QOfonoSimManager::presenceChanged, this,
+                    &Private::presentChanged);
         }
 
         update();
     }
 
+    void presentChanged()
+    {
+        m_presentSet = true;
+        m_present = m_simManager->present();
+        update();
+    }
+
     void update()
     {
         setOnline(m_ofonoModem->online());
@@ -781,6 +807,7 @@
     }
     d->m_sim = sim;
     Q_EMIT simUpdated();
+    d->update();
 }
 
 QString
 
=== modified file 'src/indicator/nmofono/wwan/qofono-sim-wrapper.cpp'
--- src/indicator/nmofono/wwan/qofono-sim-wrapper.cpp	2016-06-22 09:42:47 +0000
+++ src/indicator/nmofono/wwan/qofono-sim-wrapper.cpp	2016-06-22 09:42:47 +0000
@@ -41,18 +41,12 @@
     QOfonoSimWrapper& p;
     shared_ptr<QOfonoSimManager> m_simManager;
 
-    QString m_imsi;
-    QStringList m_phoneNumbers;
-    QString m_mcc;
-    QString m_mnc;
+    QString m_iccid;
     QStringList m_preferredLanguages;
 
     bool m_present = false;
 
-    bool m_imsiSet = false;
-    bool m_phoneNumbersSet = false;
-    bool m_mccSet = false;
-    bool m_mncSet = false;
+    bool m_iccidSet = false;
     bool m_preferredLanguagesSet = false;
 
 
@@ -60,10 +54,7 @@
         : p(parent), m_simManager{simmgr}
     {
         connect(simmgr.get(), &QOfonoSimManager::presenceChanged, this, &Private::presentChanged);
-        connect(simmgr.get(), &QOfonoSimManager::subscriberIdentityChanged, this, &Private::imsiChanged);
-        connect(simmgr.get(), &QOfonoSimManager::mobileCountryCodeChanged, this, &Private::mccChanged);
-        connect(simmgr.get(), &QOfonoSimManager::mobileNetworkCodeChanged, this, &Private::mncChanged);
-        connect(simmgr.get(), &QOfonoSimManager::subscriberNumbersChanged, this, &Private::phoneNumbersChanged);
+        connect(simmgr.get(), &QOfonoSimManager::cardIdentifierChanged, this, &Private::iccidChanged);
         connect(simmgr.get(), &QOfonoSimManager::preferredLanguagesChanged, this, &Private::preferredLanguagesChanged);
     }
 
@@ -78,92 +69,27 @@
         m_present = value;
         if (!m_present)
         {
-            m_imsiSet = false;
-            m_phoneNumbersSet = false;
-            m_mccSet = false;
-            m_mncSet = false;
+            m_iccidSet = false;
             m_preferredLanguagesSet = false;
             Q_EMIT p.readyChanged(false);
         }
         Q_EMIT p.presentChanged(value);
     }
 
-    void imsiChanged(const QString &value)
-    {
-        if (value.isEmpty())
-        {
-            return;
-        }
-
-        if (m_imsiSet)
-        {
-            qWarning() << "Unexpected update on IMSI: " << m_imsi << ", " << value;
-        }
-
-        m_imsi = value;
-        m_imsiSet = true;
-        if (p.ready())
-        {
-            Q_EMIT p.readyChanged(true);
-        }
-    }
-
-    void mccChanged(const QString &value)
-    {
-        if (value.isEmpty())
-        {
-            return;
-        }
-
-        if (m_mccSet)
-        {
-            qWarning() << "Unexpected update on MCC: " << m_mcc << ", " << value;
-        }
-
-
-        m_mcc = value;
-        m_mccSet = true;
-        if (p.ready())
-        {
-            Q_EMIT p.readyChanged(true);
-        }
-    }
-
-    void mncChanged(const QString &value)
-    {
-        if (value.isEmpty())
-        {
-            return;
-        }
-
-        if (m_mncSet)
-        {
-            qWarning() << "Unexpected update on MNC: " << m_mnc << ", " << value;
-        }
-
-        m_mnc = value;
-        m_mncSet = true;
-        if (p.ready())
-        {
-            Q_EMIT p.readyChanged(true);
-        }
-    }
-
-    void phoneNumbersChanged(const QStringList &value)
-    {
-        if (value.isEmpty())
-        {
-            return;
-        }
-
-        if (m_phoneNumbersSet)
-        {
-            qWarning() << "Unexpected update on Phone Numbers: " << m_phoneNumbers << ", " << value;
-        }
-
-
-        m_phoneNumbers = value;
-        m_phoneNumbersSet = true;
+    void iccidChanged(const QString &value)
+    {
+        if (value.isEmpty())
+        {
+            return;
+        }
+
+        if (m_iccidSet)
+        {
+            qWarning() << "Unexpected update on ICCID: " << m_iccid << ", " << value;
+        }
+
+        m_iccid = value;
+        m_iccidSet = true;
         if (p.ready())
         {
             Q_EMIT p.readyChanged(true);
@@ -202,9 +128,9 @@
 QOfonoSimWrapper::~QOfonoSimWrapper()
 {}
 
-QString QOfonoSimWrapper::imsi() const
+QString QOfonoSimWrapper::iccid() const
 {
-    return d->m_imsi;
+    return d->m_iccid;
 }
 
 bool QOfonoSimWrapper::present() const
@@ -212,20 +138,6 @@
     return d->m_present;
 }
 
-QString QOfonoSimWrapper::mcc() const
-{
-    return d->m_mcc;
-}
-
-QString QOfonoSimWrapper::mnc() const
-{
-    return d->m_mnc;
-}
-
-QStringList QOfonoSimWrapper::phoneNumbers() const
-{
-    return d->m_phoneNumbers;
-}
 
 QStringList QOfonoSimWrapper::preferredLanguages() const
 {
@@ -233,10 +145,7 @@
 }
 
 bool QOfonoSimWrapper::ready() const {
-    return d->m_imsiSet &&
-            d->m_phoneNumbersSet &&
-            d->m_mccSet &&
-            d->m_mncSet &&
+    return d->m_iccidSet &&
             d->m_preferredLanguagesSet;
 }
 
 
=== modified file 'src/indicator/nmofono/wwan/qofono-sim-wrapper.h'
--- src/indicator/nmofono/wwan/qofono-sim-wrapper.h	2016-06-22 09:42:47 +0000
+++ src/indicator/nmofono/wwan/qofono-sim-wrapper.h	2016-06-22 09:42:47 +0000
@@ -56,11 +56,8 @@
     QOfonoSimWrapper(std::shared_ptr<QOfonoSimManager> simmgr);
     ~QOfonoSimWrapper();
 
-    QString imsi() const;
+    QString iccid() const;
     bool present() const;
-    QString mcc() const;
-    QString mnc() const;
-    QStringList phoneNumbers() const;
     QStringList preferredLanguages() const;
     bool ready() const;
 
 
=== modified file 'src/indicator/nmofono/wwan/sim-manager.cpp'
--- src/indicator/nmofono/wwan/sim-manager.cpp	2016-06-22 09:42:47 +0000
+++ src/indicator/nmofono/wwan/sim-manager.cpp	2016-06-22 09:42:47 +0000
@@ -55,24 +55,9 @@
 
     ConnectivityServiceSettings::Ptr m_settings;
 
-    Private(SimManager& parent, ConnectivityServiceSettings::Ptr settings)
-        : p(parent),
-          m_settings(settings)
+    Private(SimManager& parent)
+        : p(parent)
     {
-        QStringList imsis = m_settings->knownSims();
-        for(auto imsi : imsis) {
-            auto sim = m_settings->createSimFromSettings(imsi);
-            connect(sim.get(), &Sim::dataRoamingEnabledChanged, this, &Private::simDataRoamingEnabledChanged);
-            if (!sim)
-            {
-                continue;
-            }
-            m_knownSims[sim->imsi()] = sim;
-        }
-
-        m_ofono = make_shared<QOfonoManager>();
-        connect(m_ofono.get(), &QOfonoManager::modemsChanged, this, &Private::modemsChanged);
-        modemsChanged(m_ofono->modems());
     }
 
 public Q_SLOTS:
@@ -99,9 +84,9 @@
             if (m_wrappers.contains(path))
             {
                 auto wrapper = m_wrappers[path];
-                if (m_knownSims.contains(wrapper->imsi()))
+                if (m_knownSims.contains(wrapper->iccid()))
                 {
-                    auto sim = m_knownSims[wrapper->imsi()];
+                    auto sim = m_knownSims[wrapper->iccid()];
                     sim->setOfonoSimManager(std::shared_ptr<QOfonoSimManager>());
                 }
                 m_wrappers.remove(path);
@@ -153,9 +138,9 @@
             if (m_wrappers.contains(modem->modemPath()))
             {
                 auto wrapper = m_wrappers[modem->modemPath()];
-                if (m_knownSims.contains(wrapper->imsi()))
+                if (m_knownSims.contains(wrapper->iccid()))
                 {
-                    auto sim = m_knownSims[wrapper->imsi()];
+                    auto sim = m_knownSims[wrapper->iccid()];
                     sim->setOfonoSimManager(std::shared_ptr<QOfonoSimManager>());
                 }
                 m_wrappers.remove(modem->modemPath());
@@ -174,9 +159,9 @@
 
         if (!present)
         {
-            if (m_knownSims.contains(wrapper->imsi()))
+            if (m_knownSims.contains(wrapper->iccid()))
             {
-                auto sim = m_knownSims[wrapper->imsi()];
+                auto sim = m_knownSims[wrapper->iccid()];
                 sim->setOfonoSimManager(std::shared_ptr<QOfonoSimManager>());
             }
         }
@@ -200,7 +185,7 @@
         bool found = false;
         for (auto i : m_knownSims.values())
         {
-            if (wrapper->imsi() == i->imsi())
+            if (wrapper->iccid() == i->iccid())
             {
                 found = true;
                 i->setOfonoSimManager(wrapper->ofonoSimManager());
@@ -212,7 +197,7 @@
             auto sim = Sim::fromQOfonoSimWrapper(wrapper);
             connect(sim.get(), &Sim::dataRoamingEnabledChanged, this, &Private::simDataRoamingEnabledChanged);
             m_settings->saveSimToSettings(sim);
-            m_knownSims[sim->imsi()] = sim;
+            m_knownSims[sim->iccid()] = sim;
             m_settings->setKnownSims(m_knownSims.keys());
             Q_EMIT p.simAdded(sim);
         }
@@ -228,22 +213,37 @@
             Q_ASSERT(0);
             return;
         }
-        auto sim = m_knownSims[sim_raw->imsi()];
+        if (!m_knownSims.contains(sim_raw->iccid()))
+        {
+            Q_ASSERT(0);
+            return;
+        }
+        m_settings->saveSimToSettings(m_knownSims[sim_raw->iccid()]);
+    }
+
+};
+
+
+
+SimManager::SimManager(shared_ptr<QOfonoManager> ofono, ConnectivityServiceSettings::Ptr settings)
+    : d{new Private(*this)}
+{
+    d->m_ofono = ofono;
+    d->m_settings = settings;
+
+    QStringList iccids = d->m_settings->knownSims();
+    for(auto iccid : iccids) {
+        auto sim = d->m_settings->createSimFromSettings(iccid);
+        connect(sim.get(), &Sim::dataRoamingEnabledChanged, d.get(), &Private::simDataRoamingEnabledChanged);
         if (!sim)
         {
-            Q_ASSERT(0);
-            return;
+            continue;
         }
-        m_settings->saveSimToSettings(sim);
+        d->m_knownSims[sim->iccid()] = sim;
     }
 
-};
-
-
-
-SimManager::SimManager(ConnectivityServiceSettings::Ptr settings)
-    : d{new Private(*this, settings)}
-{
+    connect(d->m_ofono.get(), &QOfonoManager::modemsChanged, d.get(), &Private::modemsChanged);
+    d->modemsChanged(d->m_ofono->modems());
 }
 
 SimManager::~SimManager()
 
=== modified file 'src/indicator/nmofono/wwan/sim-manager.h'
--- src/indicator/nmofono/wwan/sim-manager.h	2016-06-22 09:42:47 +0000
+++ src/indicator/nmofono/wwan/sim-manager.h	2016-06-22 09:42:47 +0000
@@ -27,6 +27,8 @@
 #include "sim.h"
 #include <nmofono/connectivity-service-settings.h>
 
+class QOfonoManager;
+
 namespace nmofono
 {
 namespace wwan
@@ -44,7 +46,7 @@
     typedef std::shared_ptr<SimManager> Ptr;
     typedef std::weak_ptr<SimManager> WeakPtr;
 
-    SimManager(ConnectivityServiceSettings::Ptr settings);
+    SimManager(std::shared_ptr<QOfonoManager> ofono, ConnectivityServiceSettings::Ptr settings);
     ~SimManager();
 
     QList<Sim::Ptr> knownSims() const;
 
=== modified file 'src/indicator/nmofono/wwan/sim.cpp'
--- src/indicator/nmofono/wwan/sim.cpp	2016-06-22 09:42:47 +0000
+++ src/indicator/nmofono/wwan/sim.cpp	2016-06-22 09:42:47 +0000
@@ -38,10 +38,11 @@
 
 Sim::Ptr Sim::fromQOfonoSimWrapper(const QOfonoSimWrapper *wrapper)
 {
-    auto sim = Sim::Ptr(new Sim(wrapper->imsi(),
-                                wrapper->phoneNumbers().first(), // default to the first number
-                                wrapper->mcc(),
-                                wrapper->mnc(),
+    auto sim = Sim::Ptr(new Sim(wrapper->iccid(),
+                                "",
+                                "",
+                                "",
+                                "",
                                 wrapper->preferredLanguages(),
                                 false));
     sim->setOfonoSimManager(wrapper->ofonoSimManager());
@@ -65,16 +66,21 @@
 
     QSet<QString> m_interfaces;
 
+    QString m_iccid;
     QString m_imsi;
+    QStringList m_phoneNumbers;
     QString m_primaryPhoneNumber;
     QString m_mcc;
     QString m_mnc;
     QStringList m_preferredLanguages;
-    bool m_dataRoamingEnabled;
+    bool m_dataRoamingEnabled = false;
     bool m_mobileDataEnabled = false;
 
     bool m_locked = false;
 
+    bool m_initialData = false;
+    bool m_initialDataSet = false;
+
     Private(Sim &parent)
         : p(parent)
     {
@@ -104,12 +110,81 @@
         }
 
         m_simManager = simmgr;
+
+        if (simmgr)
+        {
+            connect(simmgr.get(), &QOfonoSimManager::subscriberIdentityChanged, this, &Private::imsiChanged);
+            connect(simmgr.get(), &QOfonoSimManager::subscriberNumbersChanged, this, &Private::phoneNumbersChanged);
+            connect(simmgr.get(), &QOfonoSimManager::mobileCountryCodeChanged, this, &Private::mccChanged);
+            connect(simmgr.get(), &QOfonoSimManager::mobileNetworkCodeChanged, this, &Private::mncChanged);
+            imsiChanged(simmgr->subscriberIdentity());
+            phoneNumbersChanged(simmgr->subscriberNumbers());
+            mccChanged(simmgr->mobileCountryCode());
+            mncChanged(simmgr->mobileNetworkCode());
+        }
         update();
 
         Q_EMIT p.presentChanged(m_simManager.get() != nullptr);
     }
 
-    void connManagerChanged(shared_ptr<QOfonoConnectionManager> connmgr)
+    void phoneNumbersChanged(const QStringList &value)
+    {
+        if (value.isEmpty())
+        {
+            return;
+        }
+
+        m_phoneNumbers = value;
+        m_primaryPhoneNumber = value[0];
+        Q_EMIT p.primaryPhoneNumberChanged(m_primaryPhoneNumber);
+    }
+
+    void imsiChanged(const QString &value)
+    {
+        if (value.isEmpty())
+        {
+            return;
+        }
+
+        m_imsi = value;
+        Q_EMIT p.imsiChanged(m_imsi);
+    }
+
+    void mccChanged(const QString &value)
+    {
+        if (value.isEmpty())
+        {
+            return;
+        }
+
+        m_mcc = value;
+        Q_EMIT p.mccChanged(m_mcc);
+    }
+
+    void mncChanged(const QString &value)
+    {
+        if (value.isEmpty())
+        {
+            return;
+        }
+
+        m_mnc = value;
+        Q_EMIT p.mncChanged(m_mnc);
+    }
+
+    void poweredChanged()
+    {
+        if (!m_initialDataSet)
+        {
+            m_initialDataSet = true;
+            m_initialData = m_connManager->powered();
+            Q_EMIT p.initialDataOnSet();
+            m_connManager->setPowered(m_mobileDataEnabled);
+        }
+        update();
+    }
+
+    void setConnManager(shared_ptr<QOfonoConnectionManager> connmgr)
     {
         if (m_connManager == connmgr)
         {
@@ -121,7 +196,7 @@
         {
             connect(m_connManager.get(),
                     &QOfonoConnectionManager::poweredChanged, this,
-                    &Private::update);
+                    &Private::poweredChanged);
             connect(m_connManager.get(),
                     &QOfonoConnectionManager::roamingAllowedChanged, this,
                     &Private::update);
@@ -170,26 +245,26 @@
         Q_EMIT p.simIdentifierUpdated(m_simIdentifier);
     }
 
-    void setOfono(std::shared_ptr<QOfonoSimManager> simmgr)
+    void setOfono(shared_ptr<QOfonoSimManager> simmgr)
     {
         simManagerChanged(simmgr);
         if (simmgr)
         {
-            m_connManager = std::make_shared<QOfonoConnectionManager>(this);
-            m_connManager->setModemPath(simmgr->modemPath());
-            connManagerChanged(m_connManager);
+            auto connManager = make_shared<QOfonoConnectionManager>(this);
+            connManager->setModemPath(simmgr->modemPath());
+            setConnManager(connManager);
         }
         else
         {
-            m_connManager = std::shared_ptr<QOfonoConnectionManager>();
-            connManagerChanged(m_connManager);
+            setConnManager(shared_ptr<QOfonoConnectionManager>());
         }
     }
 
 
 };
 
-Sim::Sim(const QString &imsi,
+Sim::Sim(const QString &iccid,
+         const QString &imsi,
          const QString &primaryPhoneNumber,
          const QString &mcc,
          const QString &mnc,
@@ -197,6 +272,7 @@
          bool dataRoamingEnabled)
     : d{new Private(*this)}
 {
+    d->m_iccid = iccid;
     d->m_imsi = imsi;
     d->m_primaryPhoneNumber = primaryPhoneNumber;
     d->m_mcc = mcc;
@@ -214,6 +290,11 @@
     return d->m_simIdentifier;
 }
 
+QString Sim::iccid() const
+{
+    return d->m_iccid;
+}
+
 QString Sim::imsi() const
 {
     return d->m_imsi;
@@ -261,6 +342,10 @@
         return;
     }
     d->m_dataRoamingEnabled = value;
+    if (d->m_connManager)
+    {
+        d->m_connManager->setRoamingAllowed(d->m_dataRoamingEnabled);
+    }
     Q_EMIT dataRoamingEnabledChanged(value);
 }
 
@@ -302,6 +387,11 @@
     d->setOfono(simmgr);
 }
 
+bool Sim::initialDataOn() const
+{
+    return d->m_initialData;
+}
+
 
 }
 }
 
=== modified file 'src/indicator/nmofono/wwan/sim.h'
--- src/indicator/nmofono/wwan/sim.h	2016-06-22 09:42:47 +0000
+++ src/indicator/nmofono/wwan/sim.h	2016-06-22 09:42:47 +0000
@@ -41,7 +41,7 @@
 namespace wwan
 {
 
-class Sim : public QObject
+class Sim : public QObject, public std::enable_shared_from_this<Sim>
 {
     Q_OBJECT
 
@@ -60,7 +60,8 @@
     static Sim::Ptr fromQOfonoSimWrapper(const QOfonoSimWrapper *wrapper);
 
 private:
-    Sim(const QString &imsi,
+    Sim(const QString &iccid,
+        const QString &imsi,
         const QString &primaryPhoneNumber,
         const QString &mcc,
         const QString &mnc,
@@ -74,10 +75,13 @@
     Q_PROPERTY(QString simIdentifier READ simIdentifier NOTIFY simIdentifierUpdated)
     const QString &simIdentifier() const;
 
-    Q_PROPERTY(QString imsi READ imsi CONSTANT)
+    Q_PROPERTY(QString iccid READ iccid CONSTANT)
+    QString iccid() const;
+
+    Q_PROPERTY(QString imsi READ imsi NOTIFY imsiChanged)
     QString imsi() const;
 
-    Q_PROPERTY(QString primaryPhoneNumber READ primaryPhoneNumber CONSTANT)
+    Q_PROPERTY(QString primaryPhoneNumber READ primaryPhoneNumber NOTIFY primaryPhoneNumberChanged)
     QString primaryPhoneNumber() const;
 
     Q_PROPERTY(bool locked READ locked NOTIFY lockedChanged)
@@ -86,10 +90,10 @@
     Q_PROPERTY(bool present READ present NOTIFY presentChanged)
     bool present() const;
 
-    Q_PROPERTY(QString mcc READ mcc CONSTANT)
+    Q_PROPERTY(QString mcc READ mcc NOTIFY mccChanged)
     QString mcc() const;
 
-    Q_PROPERTY(QString mnc READ mnc CONSTANT)
+    Q_PROPERTY(QString mnc READ mnc NOTIFY mncChanged)
     QString mnc() const;
 
     Q_PROPERTY(QList<QString> preferredLanguages READ preferredLanguages CONSTANT)
@@ -105,6 +109,8 @@
 
     QString ofonoPath() const;
 
+    bool initialDataOn() const;
+
 public Q_SLOTS:
     void unlock();
 
@@ -112,6 +118,14 @@
 
     void simIdentifierUpdated(const QString &);
 
+    void imsiChanged(const QString &);
+
+    void primaryPhoneNumberChanged(const QString &);
+
+    void mccChanged(const QString &);
+
+    void mncChanged(const QString &);
+
     void lockedChanged(bool value);
 
     void presentChanged(bool value);
@@ -119,6 +133,8 @@
     void dataRoamingEnabledChanged(bool value);
 
     void mobileDataEnabledChanged(bool value);
+
+    void initialDataOnSet();
 };
 
 }
 
=== modified file 'src/qdbus-stubs/dbus-types.h'
--- src/qdbus-stubs/dbus-types.h	2016-06-22 09:42:47 +0000
+++ src/qdbus-stubs/dbus-types.h	2016-06-22 09:42:47 +0000
@@ -47,16 +47,18 @@
         return path.arg(counter++);
     }
 
-    inline QString modemPath(const QString &serial)
+    inline QString modemPath()
     {
+        static int counter {0};
         static QString path{"/com/ubuntu/connectivity1/modem/%1"};
-        return path.arg(serial);
+        return path.arg(counter++);
     }
 
-    inline QString simPath(const QString &imsi)
+    inline QString simPath()
     {
+        static int counter {0};
         static QString path{"/com/ubuntu/connectivity1/sim/%1"};
-        return path.arg(imsi);
+        return path.arg(counter++);
     }
 
 
 
=== modified file 'tests/integration/CMakeLists.txt'
--- tests/integration/CMakeLists.txt	2015-10-20 10:20:17 +0000
+++ tests/integration/CMakeLists.txt	2016-06-22 09:42:47 +0000
@@ -13,6 +13,8 @@
     test-indicator.cpp
     test-indicator-vpn.cpp
     test-connectivity-api.cpp
+    test-connectivity-api-modem.cpp
+    test-connectivity-api-sim.cpp
     test-connectivity-api-vpn.cpp
 )
 
 
=== modified file 'tests/integration/indicator-network-test-base.cpp'
--- tests/integration/indicator-network-test-base.cpp	2015-11-20 13:14:50 +0000
+++ tests/integration/indicator-network-test-base.cpp	2016-06-22 09:42:47 +0000
@@ -42,14 +42,16 @@
 
 void IndicatorNetworkTestBase::SetUp()
 {
+    qputenv("INDICATOR_NETWORK_SETTINGS_PATH", temporaryDir.path().toUtf8().constData());
+
     if (qEnvironmentVariableIsSet("TEST_WITH_BUSTLE"))
     {
+        QDir::temp().mkpath("indicator-network-tests");
+        QDir testDir(QDir::temp().filePath("indicator-network-tests"));
+
         const TestInfo* const test_info =
                 UnitTest::GetInstance()->current_test_info();
 
-        QDir::temp().mkpath("indicator-network-tests");
-        QDir testDir(QDir::temp().filePath("indicator-network-tests"));
-
         dbusTestRunner.registerService(
                 DBusServicePtr(
                         new QProcessDBusService(
@@ -67,7 +69,7 @@
     dbusMock.registerNetworkManager();
     dbusMock.registerNotificationDaemon();
     // By default the ofono mock starts with one modem
-    dbusMock.registerOfono();
+    dbusMock.registerOfono({{"no_modem", true}});
     dbusMock.registerURfkill();
 
     dbusMock.registerCustomMock(
@@ -142,11 +144,8 @@
                         ""
                      ).waitForFinished();
 
-    // mock service creates ril_0 automatically
-    // Initial ConnectionManager properties are insane, fix them here
-    setConnectionManagerProperty(firstModem(), "Bearer", "none");
-    setConnectionManagerProperty(firstModem(), "Powered", false);
-    setConnectionManagerProperty(firstModem(), "Attached", false);
+
+    modem = createModem("ril_0");
 
     // Identify the test when looking at Bustle logs
     QDBusConnection systemConnection = dbusTestRunner.systemConnection();
@@ -422,6 +421,17 @@
     }
 }
 
+QVariantMap IndicatorNetworkTestBase::getConnectionManagerProperties(const QString& path)
+{
+    auto& ofono(dbusMock.ofonoConnectionManagerInterface(path));
+    auto reply = ofono.GetProperties();
+    reply.waitForFinished();
+    if (reply.isError()) {
+        EXPECT_FALSE(reply.isError()) << reply.error().message().toStdString();
+    }
+    return reply;
+}
+
 void IndicatorNetworkTestBase::setNetworkRegistrationProperty(const QString& path, const QString& propertyName, const QVariant& value)
 {
     auto& ofono(dbusMock.ofonoNetworkRegistrationInterface(path));
@@ -483,6 +493,14 @@
         .toggled(toggled);
 }
 
+mh::MenuItemMatcher IndicatorNetworkTestBase::mobileDataSwitch(bool toggled)
+{
+    return mh::MenuItemMatcher::checkbox()
+        .label("Cellular data")
+        .action("indicator.mobiledata.enabled")
+        .toggled(toggled);
+}
+
 mh::MenuItemMatcher IndicatorNetworkTestBase::accessPoint(const string& ssid, Secure secure,
             ApMode apMode, ConnectionStatus connectionStatus, uchar strength)
 {
@@ -637,3 +655,16 @@
         .themed_icon("icon", {"network-vpn"})
         .toggled(connected == ConnectionStatus::connected);
 }
+
+unique_ptr<QSortFilterProxyModel> IndicatorNetworkTestBase::getSortedModems(Connectivity& connectivity)
+{
+    auto modems = connectivity.modems();
+
+    auto sortedModems = make_unique<QSortFilterProxyModel>();
+    sortedModems->setSortRole(ModemsListModel::RoleIndex);
+    sortedModems->sort(0);
+
+    sortedModems->setSourceModel(modems);
+
+    return sortedModems;
+}
 
=== modified file 'tests/integration/indicator-network-test-base.h'
--- tests/integration/indicator-network-test-base.h	2015-11-20 13:14:50 +0000
+++ tests/integration/indicator-network-test-base.h	2016-06-22 09:42:47 +0000
@@ -19,6 +19,8 @@
 #pragma once
 
 #include <connectivityqt/connectivity.h>
+#include <connectivityqt/modems-list-model.h>
+
 
 #include <dbus-types.h>
 
@@ -77,9 +79,18 @@
 {\
     while (signalSpy.size() < signalsExpected)\
     {\
-        ASSERT_TRUE(signalSpy.wait());\
-    }\
-    ASSERT_EQ(signalsExpected, signalSpy.size());\
+        ASSERT_TRUE(signalSpy.wait()) << "Waiting for " << signalsExpected << " signals, got " << signalSpy.size();\
+    }\
+    ASSERT_EQ(signalsExpected, signalSpy.size()) << "Waiting for " << signalsExpected << " signals, got " << signalSpy.size();\
+}
+
+#define WAIT_FOR_ROW_COUNT(signalSpy, model, expectedRowCount)\
+{\
+    while (model->rowCount() < expectedRowCount)\
+    {\
+        ASSERT_TRUE(signalSpy.wait()) << "Waiting for model to have " << expectedRowCount << " rows, got " << model->rowCount();\
+    }\
+    ASSERT_EQ(expectedRowCount, model->rowCount()) << "Waiting for model to have " << expectedRowCount << " rows, got " << model->rowCount();\
 }
 
 #define CHECK_METHOD_CALL(signalSpy, signalIndex, methodName, ...)\
@@ -168,6 +179,8 @@
 
     void setConnectionManagerProperty(const QString& path, const QString& propertyName, const QVariant& value);
 
+    QVariantMap getConnectionManagerProperties(const QString& path);
+
     void setNetworkRegistrationProperty(const QString& path, const QString& propertyName, const QVariant& value);
 
     OrgFreedesktopDBusMockInterface& notificationsMockInterface();
@@ -200,6 +213,7 @@
     static QString firstModem();
 
     static unity::gmenuharness::MenuItemMatcher flightModeSwitch(bool toggled = false);
+    static unity::gmenuharness::MenuItemMatcher mobileDataSwitch(bool toggled = false);
 
     static unity::gmenuharness::MenuItemMatcher accessPoint(const std::string& ssid, Secure secure,
                 ApMode apMode, ConnectionStatus connectionStatus, uchar strength = 100);
@@ -220,9 +234,24 @@
 
     static unity::gmenuharness::MenuItemMatcher vpnConnection(const std::string& name, ConnectionStatus connected = ConnectionStatus::disconnected);
 
+    static connectivityqt::Sim* getModemSim(const QAbstractItemModel& model, int idx)
+    {
+        auto sim = model.data(model.index(idx,0),
+                              connectivityqt::ModemsListModel::RoleSim)
+                .value<connectivityqt::Sim*>();
+        EXPECT_TRUE(sim);
+        return sim;
+    }
+
+    static std::unique_ptr<QSortFilterProxyModel> getSortedModems(connectivityqt::Connectivity& connectivity);
+
     QtDBusTest::DBusTestRunner dbusTestRunner;
 
     QtDBusMock::DBusMock dbusMock;
 
     QtDBusTest::DBusServicePtr indicator;
+
+    QString modem;
+
+    QTemporaryDir temporaryDir;
 };
 
=== added directory 'tests/integration/qml'
=== added file 'tests/integration/test-connectivity-api-modem.cpp'
--- tests/integration/test-connectivity-api-modem.cpp	1970-01-01 00:00:00 +0000
+++ tests/integration/test-connectivity-api-modem.cpp	2016-06-22 09:42:47 +0000
@@ -0,0 +1,322 @@
+/*
+ * 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/>.
+ *
+ * Authors:
+ *   Antti Kaijanmäki <[e-mail]>
+ *   Pete Woods <[e-mail]>
+ */
+
+#include <connectivityqt/modem.h>
+#include <connectivityqt/modems-list-model.h>
+#include <indicator-network-test-base.h>
+#include <dbus-types.h>
+#include <NetworkManagerSettingsInterface.h>
+
+#include <QDebug>
+#include <QTestEventLoop>
+
+#define DEFINE_MODEL_LISTENERS \
+    QSignalSpy rowsAboutToBeRemovedSpy(modems.get(), SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)));\
+    QSignalSpy rowsRemovedSpy(modems.get(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)));\
+    QSignalSpy rowsAboutToBeInsertedSpy(modems.get(), SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)));\
+    QSignalSpy rowsInsertedSpy(modems.get(), SIGNAL(rowsInserted(const QModelIndex &, int, int)));\
+    QSignalSpy dataChangedSpy(modems.get(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &, const QVector<int> &)));\
+
+#define CLEAR_MODEL_LISTENERS \
+    rowsAboutToBeRemovedSpy.clear();\
+    rowsRemovedSpy.clear();\
+    rowsAboutToBeInsertedSpy.clear();\
+    rowsInsertedSpy.clear();\
+    dataChangedSpy.clear();
+
+struct SS {
+    QString iccid;
+    QString imsi;
+    QString primaryPhoneNumber;
+    bool locked;
+    bool present;
+    QString mcc;
+    QString mnc;
+    QList<QString> preferredLanguages;
+
+    bool operator==(const SS& other) const
+    {
+        return iccid == other.iccid
+                && imsi == other.imsi
+                && primaryPhoneNumber == other.primaryPhoneNumber
+                && locked == other.locked && present == other.present
+                && mcc == other.mcc && mnc == other.mnc
+                && preferredLanguages == other.preferredLanguages;
+    }
+};
+typedef QPair<int, SS> MS;
+typedef QList<MS> MSL;
+
+inline void PrintTo (const SS& simState, std::ostream* os)
+{
+    *os << "SS("
+            << "ICCID: " << simState.iccid.toStdString () << ", "
+            << "IMSI: " << simState.imsi.toStdString () << ", "
+            << "Phone #: " << simState.primaryPhoneNumber.toStdString () << ", "
+            << "Locked: " << (simState.locked ? "y" : "n") << ", "
+            << "Present: " << (simState.present ? "y" : "n") << ", "
+            << "MCC: " << simState.mcc.toStdString () << ", "
+            << "MNC: " << simState.mnc.toStdString () << ", "
+            << "Langs: " << QStringList(simState.preferredLanguages).join (",").toStdString () << ")";
+}
+
+inline void PrintTo(const MS& modemState, std::ostream* os) {
+    *os << "MS(" << modemState.first << ", " ;
+    PrintTo(modemState.second, os);
+    *os << ")";
+}
+
+using namespace std;
+using namespace testing;
+using namespace connectivityqt;
+
+namespace
+{
+
+class TestConnectivityApiModem: public IndicatorNetworkTestBase
+{
+protected:
+    static void SetUpTestCase()
+    {
+        Connectivity::registerMetaTypes();
+    }
+
+    MSL modemList(QAbstractItemModel& model)
+    {
+        MSL modemStates;
+        int rowCount(model.rowCount());
+        for (int i = 0; i < rowCount; ++i)
+        {
+            auto idx = model.index(i, 0);
+            MS modemState;
+            modemState.first = model.data(idx, ModemsListModel::Roles::RoleIndex).toInt();
+            EXPECT_FALSE(model.data(idx, ModemsListModel::Roles::RoleSerial).toString().isEmpty());
+
+            SS simState;
+            auto sim = qvariant_cast<Sim*>(model.data(idx, ModemsListModel::Roles::RoleSim));
+
+            if (sim)
+            {
+                simState.iccid = sim->iccid ();
+                simState.imsi = sim->imsi();
+                simState.primaryPhoneNumber = sim->primaryPhoneNumber ();
+                simState.locked = sim->locked ();
+                simState.present = sim->present ();
+                simState.mcc = sim->mcc ();
+                simState.mnc = sim->mnc ();
+                simState.preferredLanguages = sim->preferredLanguages ();
+
+                modemState.second = simState;
+            }
+            else
+            {
+                EXPECT_TRUE(sim) << "Could not get a SIM at index " << i
+                        << " from ModemModel";
+            }
+
+            modemStates << modemState;
+        }
+        return modemStates;
+    }
+};
+
+TEST_F(TestConnectivityApiModem, SingleModemAtStartup)
+{
+    // Add a physical device to use for the connection
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+    createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
+
+    // Start the indicator
+    ASSERT_NO_THROW(startIndicator());
+
+    // Connect the the service
+    auto connectivity(newConnectivity());
+
+    // Get the modems model
+    auto modems = getSortedModems(*connectivity);
+
+    DEFINE_MODEL_LISTENERS
+
+    WAIT_FOR_ROW_COUNT(rowsInsertedSpy, modems, 1)
+    EXPECT_TRUE(rowsAboutToBeRemovedSpy.isEmpty ());
+    EXPECT_TRUE(rowsRemovedSpy.isEmpty ());
+    EXPECT_TRUE(dataChangedSpy.isEmpty ());
+
+    EXPECT_EQ(MSL({
+        MS{1, SS{
+            "893581234000000000000",
+            "310150000000000",
+            "123456789",
+            false,
+            true,
+            "310",
+            "150",
+            {"en"}
+        }}
+    }), modemList(*modems));
+}
+
+TEST_F(TestConnectivityApiModem, TwoModemsAtStartup)
+{
+    createModem("ril_1");
+
+    // Add a physical device to use for the connection
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+    createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
+
+    // Start the indicator
+    ASSERT_NO_THROW(startIndicator());
+
+    // Connect the the service
+    auto connectivity(newConnectivity());
+
+    // Get the modems model
+    auto modems = getSortedModems(*connectivity);
+
+    DEFINE_MODEL_LISTENERS
+
+    WAIT_FOR_ROW_COUNT(rowsInsertedSpy, modems, 2)
+    EXPECT_TRUE(rowsAboutToBeRemovedSpy.isEmpty ());
+    EXPECT_TRUE(rowsRemovedSpy.isEmpty ());
+    EXPECT_TRUE(dataChangedSpy.isEmpty ());
+
+    EXPECT_EQ(MSL({
+        MS{1, SS{
+            "893581234000000000000",
+            "310150000000000",
+            "123456789",
+            false,
+            true,
+            "310",
+            "150",
+            {"en"}
+        }},
+        MS{2, SS{
+            "893581234000000000001",
+            "310150000000001",
+            "123456789",
+            false,
+            true,
+            "310",
+            "150",
+            {"en"}
+        }}
+    }), modemList(*modems));
+}
+
+TEST_F(TestConnectivityApiModem, AddAModem)
+{
+    // Add a physical device to use for the connection
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+    createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
+
+    // Start the indicator
+    ASSERT_NO_THROW(startIndicator());
+
+    // Connect the the service
+    auto connectivity(newConnectivity());
+
+    // Get the modems model
+    auto modems = getSortedModems(*connectivity);
+
+    DEFINE_MODEL_LISTENERS
+
+    WAIT_FOR_ROW_COUNT(rowsInsertedSpy, modems, 1)
+    EXPECT_TRUE(rowsAboutToBeRemovedSpy.isEmpty ());
+    EXPECT_TRUE(rowsRemovedSpy.isEmpty ());
+    EXPECT_TRUE(dataChangedSpy.isEmpty ());
+
+    EXPECT_EQ(MSL({
+        MS{1, SS{
+            "893581234000000000000",
+            "310150000000000",
+            "123456789",
+            false,
+            true,
+            "310",
+            "150",
+            {"en"}
+        }}
+    }), modemList(*modems));
+
+    CLEAR_MODEL_LISTENERS
+
+    createModem("ril_1");
+
+    WAIT_FOR_ROW_COUNT(rowsInsertedSpy, modems, 2)
+    EXPECT_TRUE(rowsAboutToBeRemovedSpy.isEmpty ());
+    EXPECT_TRUE(rowsRemovedSpy.isEmpty ());
+    EXPECT_TRUE(dataChangedSpy.isEmpty ());
+
+    EXPECT_EQ(MSL({
+        MS{1, SS{
+            "893581234000000000000",
+            "310150000000000",
+            "123456789",
+            false,
+            true,
+            "310",
+            "150",
+            {"en"}
+        }},
+        MS{2, SS{
+            "893581234000000000001",
+            "310150000000001",
+            "123456789",
+            false,
+            true,
+            "310",
+            "150",
+            {"en"}
+        }}
+    }), modemList(*modems));
+
+    CLEAR_MODEL_LISTENERS
+}
+
+TEST_F(TestConnectivityApiModem, ModemProperties)
+{
+    // Add a physical device to use for the connection
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+    createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
+
+    // Start the indicator
+    ASSERT_NO_THROW(startIndicator());
+
+    // Connect the the service
+    auto connectivity(newConnectivity());
+
+    // Get the modems model
+    auto modems = getSortedModems(*connectivity);
+
+    DEFINE_MODEL_LISTENERS
+
+    WAIT_FOR_ROW_COUNT(rowsInsertedSpy, modems, 1)
+    EXPECT_TRUE(rowsAboutToBeRemovedSpy.isEmpty ());
+    EXPECT_TRUE(rowsRemovedSpy.isEmpty ());
+
+    auto modem = qvariant_cast<Modem*>(modems->data(modems->index(0, 0), ModemsListModel::Roles::RoleModem));
+
+    EXPECT_EQ(1, modem->index());
+    EXPECT_EQ("12345678-1234-1234-1234-000000000000", modem->serial().toStdString());
+    EXPECT_TRUE(modem->sim());
+}
+
+}
 
=== added file 'tests/integration/test-connectivity-api-sim.cpp'
--- tests/integration/test-connectivity-api-sim.cpp	1970-01-01 00:00:00 +0000
+++ tests/integration/test-connectivity-api-sim.cpp	2016-06-22 09:42:47 +0000
@@ -0,0 +1,375 @@
+/*
+ * 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/>.
+ *
+ * Authors:
+ *   Antti Kaijanmäki <[e-mail]>
+ *   Pete Woods <[e-mail]>
+ */
+
+#include <connectivityqt/sim.h>
+#include <connectivityqt/sims-list-model.h>
+#include <indicator-network-test-base.h>
+#include <dbus-types.h>
+#include <NetworkManagerSettingsInterface.h>
+
+#include <QDebug>
+#include <QTestEventLoop>
+
+#define DEFINE_MODEL_LISTENERS \
+    QSignalSpy rowsAboutToBeRemovedSpy(sims.get(), SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)));\
+    QSignalSpy rowsRemovedSpy(sims.get(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)));\
+    QSignalSpy rowsAboutToBeInsertedSpy(sims.get(), SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)));\
+    QSignalSpy rowsInsertedSpy(sims.get(), SIGNAL(rowsInserted(const QModelIndex &, int, int)));\
+    QSignalSpy dataChangedSpy(sims.get(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &, const QVector<int> &)));\
+
+#define CLEAR_MODEL_LISTENERS \
+    rowsAboutToBeRemovedSpy.clear();\
+    rowsRemovedSpy.clear();\
+    rowsAboutToBeInsertedSpy.clear();\
+    rowsInsertedSpy.clear();\
+    dataChangedSpy.clear();
+
+struct SS {
+    QString iccid;
+    QString imsi;
+    QString primaryPhoneNumber;
+    bool locked;
+    bool present;
+    QString mcc;
+    QString mnc;
+    QList<QString> preferredLanguages;
+    bool dataRoamingEnabled;
+
+    bool operator==(const SS& other) const
+    {
+        return iccid == other.iccid
+                && imsi == other.imsi
+                && primaryPhoneNumber == other.primaryPhoneNumber
+                && locked == other.locked && present == other.present
+                && mcc == other.mcc && mnc == other.mnc
+                && preferredLanguages == other.preferredLanguages
+                && dataRoamingEnabled == other.dataRoamingEnabled;
+    }
+};
+typedef QList<SS> SSL;
+
+inline void PrintTo (const SS& simState, std::ostream* os)
+{
+    *os << "SS("
+            << "ICCID: " << simState.iccid.toStdString () << ", "
+            << "IMSI: " << simState.imsi.toStdString () << ", "
+            << "Phone #: " << simState.primaryPhoneNumber.toStdString () << ", "
+            << "Locked: " << (simState.locked ? "y" : "n") << ", "
+            << "Present: " << (simState.present ? "y" : "n") << ", "
+            << "MCC: " << simState.mcc.toStdString () << ", "
+            << "MNC: " << simState.mnc.toStdString () << ", "
+            << "Langs: " << QStringList(simState.preferredLanguages).join (",").toStdString ()
+            << "Roaming: " << (simState.dataRoamingEnabled ? "y" : "n")
+            << ")";
+}
+
+using namespace std;
+using namespace testing;
+using namespace connectivityqt;
+
+namespace
+{
+
+class TestConnectivityApiSim: public IndicatorNetworkTestBase
+{
+protected:
+    static void SetUpTestCase()
+    {
+        Connectivity::registerMetaTypes();
+    }
+
+    unique_ptr<QSortFilterProxyModel> getSortedSims(Connectivity& connectivity)
+    {
+        auto sims = connectivity.sims();
+
+        auto sortedSims = make_unique<QSortFilterProxyModel>();
+        sortedSims->setSortRole(SimsListModel::RoleIccid);
+        sortedSims->sort(0);
+
+        sortedSims->setSourceModel(sims);
+
+        return sortedSims;
+    }
+
+    connectivityqt::Sim* getSim(const QAbstractItemModel& model, int idx)
+    {
+        auto sim = model.data(model.index(idx,0),
+                              connectivityqt::SimsListModel::RoleSim)
+                .value<connectivityqt::Sim*>();
+        EXPECT_TRUE(sim);
+        return sim;
+    }
+
+    SSL simList(QAbstractItemModel& model)
+    {
+        SSL simStates;
+        int rowCount(model.rowCount());
+        for (int i = 0; i < rowCount; ++i)
+        {
+            auto idx = model.index(i, 0);
+
+            SS simState;
+            simState.iccid = model.data(idx, SimsListModel::RoleIccid).toString();
+            simState.imsi = model.data(idx, SimsListModel::RoleImsi).toString();
+            simState.primaryPhoneNumber = model.data(idx, SimsListModel::RolePrimaryPhoneNumber).toString();
+            simState.locked = model.data(idx, SimsListModel::RoleLocked).toBool();
+            simState.present = model.data(idx, SimsListModel::RolePresent).toBool();
+            simState.mcc = model.data(idx, SimsListModel::RoleMcc).toString();
+            simState.mnc = model.data(idx, SimsListModel::RoleMnc).toString();
+            simState.preferredLanguages = model.data(idx, SimsListModel::RolePreferredLanguages).toStringList();
+            simState.dataRoamingEnabled = model.data(idx, SimsListModel::RoleDataRoamingEnabled).toBool();
+
+            simStates << simState;
+        }
+        return simStates;
+    }
+};
+
+TEST_F(TestConnectivityApiSim, SingleSimAtStartup)
+{
+    // Add a physical device to use for the connection
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+    auto device = createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
+
+    // Start the indicator
+    ASSERT_NO_THROW(startIndicator());
+
+    // Connect the the service
+    auto connectivity(newConnectivity());
+
+    // Get the SIMs model
+    auto sims = getSortedSims(*connectivity);
+
+    DEFINE_MODEL_LISTENERS
+
+    WAIT_FOR_ROW_COUNT(rowsInsertedSpy, sims, 1)
+    EXPECT_TRUE(rowsAboutToBeRemovedSpy.isEmpty ());
+    EXPECT_TRUE(rowsRemovedSpy.isEmpty ());
+
+    auto sim = getSim(*sims, 0);
+    while (sim->imsi().isEmpty() || sim->primaryPhoneNumber().isEmpty())
+    {
+        EXPECT_TRUE(dataChangedSpy.wait());
+    }
+
+    EXPECT_EQ(SSL({
+        SS{
+            "893581234000000000000",
+            "310150000000000",
+            "123456789",
+            false,
+            true,
+            "310",
+            "150",
+            {"en"},
+            false
+        }
+    }), simList(*sims));
+}
+
+TEST_F(TestConnectivityApiSim, TwoSimsAtStartup)
+{
+    createModem("ril_1");
+
+    // Add a physical device to use for the connection
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+    auto device = createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
+
+    // Start the indicator
+    ASSERT_NO_THROW(startIndicator());
+
+    // Connect the the service
+    auto connectivity(newConnectivity());
+
+    // Get the SIMs model
+    auto sims = getSortedSims(*connectivity);
+
+    DEFINE_MODEL_LISTENERS
+
+    WAIT_FOR_ROW_COUNT(rowsInsertedSpy, sims, 2)
+    EXPECT_TRUE(rowsAboutToBeRemovedSpy.isEmpty ());
+    EXPECT_TRUE(rowsRemovedSpy.isEmpty ());
+    EXPECT_TRUE(dataChangedSpy.isEmpty ());
+
+    auto sim = getSim(*sims, 0);
+    while (sim->imsi().isEmpty() || sim->primaryPhoneNumber().isEmpty())
+    {
+        EXPECT_TRUE(dataChangedSpy.wait());
+    }
+    auto sim2 = getSim(*sims, 1);
+    while (sim2->imsi().isEmpty() || sim2->primaryPhoneNumber().isEmpty())
+    {
+        EXPECT_TRUE(dataChangedSpy.wait());
+    }
+
+    EXPECT_EQ(SSL({
+        SS{
+            "893581234000000000000",
+            "310150000000000",
+            "123456789",
+            false,
+            true,
+            "310",
+            "150",
+            {"en"},
+            false
+        },
+        SS{
+            "893581234000000000001",
+            "310150000000001",
+            "123456789",
+            false,
+            true,
+            "310",
+            "150",
+            {"en"},
+            false
+        }
+    }), simList(*sims));
+}
+
+TEST_F(TestConnectivityApiSim, AddASim)
+{
+    // Add a physical device to use for the connection
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+    auto device = createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
+
+    // Start the indicator
+    ASSERT_NO_THROW(startIndicator());
+
+    // Connect the the service
+    auto connectivity(newConnectivity());
+
+    // Get the SIMs model
+    auto sims = getSortedSims(*connectivity);
+
+    DEFINE_MODEL_LISTENERS
+
+    WAIT_FOR_ROW_COUNT(rowsInsertedSpy, sims, 1)
+    EXPECT_TRUE(rowsAboutToBeRemovedSpy.isEmpty ());
+    EXPECT_TRUE(rowsRemovedSpy.isEmpty ());
+    EXPECT_TRUE(dataChangedSpy.isEmpty ());
+
+    auto sim = getSim(*sims, 0);
+    while (sim->imsi().isEmpty() || sim->primaryPhoneNumber().isEmpty())
+    {
+        EXPECT_TRUE(dataChangedSpy.wait());
+    }
+
+    EXPECT_EQ(SSL({
+        SS{
+            "893581234000000000000",
+            "310150000000000",
+            "123456789",
+            false,
+            true,
+            "310",
+            "150",
+            {"en"},
+            false
+        }
+    }), simList(*sims));
+
+    CLEAR_MODEL_LISTENERS
+
+    createModem("ril_1");
+
+    WAIT_FOR_ROW_COUNT(rowsInsertedSpy, sims, 2)
+    EXPECT_TRUE(rowsAboutToBeRemovedSpy.isEmpty ());
+    EXPECT_TRUE(rowsRemovedSpy.isEmpty ());
+
+    auto sim2 = getSim(*sims, 1);
+    while (sim2->imsi().isEmpty() || sim2->primaryPhoneNumber().isEmpty())
+    {
+        EXPECT_TRUE(dataChangedSpy.wait());
+    }
+
+    EXPECT_EQ(SSL({
+        SS{
+            "893581234000000000000",
+            "310150000000000",
+            "123456789",
+            false,
+            true,
+            "310",
+            "150",
+            {"en"},
+            false
+        },
+        SS{
+            "893581234000000000001",
+            "310150000000001",
+            "123456789",
+            false,
+            true,
+            "310",
+            "150",
+            {"en"},
+            false
+        }
+    }), simList(*sims));
+}
+
+TEST_F(TestConnectivityApiSim, SimProperties)
+{
+    // Add a physical device to use for the connection
+    setGlobalConnectedState(NM_STATE_CONNECTED_GLOBAL);
+    auto device = createWiFiDevice(NM_DEVICE_STATE_ACTIVATED);
+
+    // Start the indicator
+    ASSERT_NO_THROW(startIndicator());
+
+    // Connect the the service
+    auto connectivity(newConnectivity());
+
+    // Get the SIMs model
+    auto sims = getSortedSims(*connectivity);
+
+    DEFINE_MODEL_LISTENERS
+
+    WAIT_FOR_ROW_COUNT(rowsInsertedSpy, sims, 1)
+    EXPECT_TRUE(rowsAboutToBeRemovedSpy.isEmpty ());
+    EXPECT_TRUE(rowsRemovedSpy.isEmpty ());
+    EXPECT_TRUE(dataChangedSpy.isEmpty ());
+
+    auto sim = qvariant_cast<Sim*>(sims->data(sims->index(0, 0), SimsListModel::Roles::RoleSim));
+    ASSERT_TRUE(sim);
+    while (sim->imsi().isEmpty() || sim->primaryPhoneNumber().isEmpty())
+    {
+        EXPECT_TRUE(dataChangedSpy.wait());
+    }
+
+    EXPECT_EQ("893581234000000000000", sim->iccid().toStdString());
+    EXPECT_EQ("310150000000000", sim->imsi().toStdString());
+    EXPECT_EQ("123456789", sim->primaryPhoneNumber().toStdString());
+    EXPECT_FALSE(sim->locked());
+    EXPECT_TRUE(sim->present());
+    EXPECT_EQ("310", sim->mcc().toStdString());
+    EXPECT_EQ("150", sim->mnc().toStdString());
+    EXPECT_EQ(QStringList{"en"}, sim->preferredLanguages());
+}
+
+TEST_F(TestConnectivityApiSim, RoamingAllowed)
+{
+//   test that roaming allowed has an effect.
+}
+
+
+}
 
=== modified file 'tests/integration/test-connectivity-api.cpp'
--- tests/integration/test-connectivity-api.cpp	2016-01-14 13:38:38 +0000
+++ tests/integration/test-connectivity-api.cpp	2016-06-22 09:42:47 +0000
@@ -764,4 +764,128 @@
 
     EXPECT_TRUE(connectivity->modemAvailable());
 }
+
+TEST_F(TestConnectivityApi, MobileDataDisablePowersOffAllSims)
+{
+    auto modem2 = createModem("ril_1");
+    setConnectionManagerProperty(modem2, "Powered", true);
+
+    setGlobalConnectedState(NM_STATE_DISCONNECTED);
+    auto device = createWiFiDevice(NM_DEVICE_STATE_DISCONNECTED);
+
+    // Start the indicator
+    ASSERT_NO_THROW(startIndicator());
+
+    // Connect the the service
+    auto connectivity(newConnectivity());
+
+    QSignalSpy mobileDataEnabledSpy(connectivity.get(), SIGNAL(mobileDataEnabledUpdated(bool)));
+    QSignalSpy simForMobileDataSpy(connectivity.get(), SIGNAL(simForMobileDataUpdated(Sim*)));
+
+    // One of the modems was started and we had no settings.
+    // So we start by assuming mobile data was enabled.
+    if (!connectivity->mobileDataEnabled())
+    {
+        WAIT_FOR_SIGNALS(mobileDataEnabledSpy, 1)
+    }
+    mobileDataEnabledSpy.clear();
+    EXPECT_TRUE(connectivity->mobileDataEnabled());
+
+    if (!connectivity->simForMobileData())
+    {
+        WAIT_FOR_SIGNALS(simForMobileDataSpy, 1)
+    }
+    simForMobileDataSpy.clear();
+    EXPECT_TRUE(connectivity->simForMobileData() != nullptr);
+
+
+    QSignalSpy simsModelRowsInsertedSpy(connectivity->sims(), SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+    QSignalSpy modemsModelRowsInsertedSpy(connectivity->modems(), SIGNAL(rowsInserted(const QModelIndex &, int, int)));
+    WAIT_FOR_ROW_COUNT(simsModelRowsInsertedSpy, connectivity->sims(), 2)
+    WAIT_FOR_ROW_COUNT(modemsModelRowsInsertedSpy, connectivity->modems(), 2)
+
+    auto modems = getSortedModems(*connectivity);
+    auto simForMobileData = connectivity->simForMobileData();
+    auto secondSim = getModemSim(*modems, 1);
+
+    ASSERT_TRUE(simForMobileData);
+    ASSERT_TRUE(secondSim);
+    // These should be the exact same object.
+    EXPECT_TRUE(simForMobileData == secondSim);
+
+    // Only the second modem should be powered
+    EXPECT_FALSE(getConnectionManagerProperties(modem)["Powered"].toBool());
+    EXPECT_TRUE(getConnectionManagerProperties(modem2)["Powered"].toBool());
+
+    auto& connectionManager(dbusMock.ofonoConnectionManagerInterface(modem2));
+    QSignalSpy connectionManagerPropertyChangedSpy(
+                               &connectionManager,
+                               SIGNAL(PropertyChanged(const QString &, const QDBusVariant &)));
+
+    // Disable all mobile data.
+    connectivity->setMobileDataEnabled(false);
+
+    WAIT_FOR_SIGNALS(connectionManagerPropertyChangedSpy, 1)
+
+    // Both modems should by un-powered
+    EXPECT_FALSE(getConnectionManagerProperties(modem)["Powered"].toBool());
+    EXPECT_FALSE(getConnectionManagerProperties(modem2)["Powered"].toBool());
+
+    if (connectivity->mobileDataEnabled())
+    {
+        WAIT_FOR_SIGNALS(mobileDataEnabledSpy, 1)
+    }
+    EXPECT_FALSE(connectivity->mobileDataEnabled());
+}
+
+TEST_F(TestConnectivityApi, SettingsRestoredOnStartup)
+{
+
+    QString path = temporaryDir.path() + "/config.ini";
+    auto settings = make_unique<QSettings>(path, QSettings::IniFormat);
+
+    settings->beginGroup("Sims/893581234000000000000/");
+    settings->setValue("Imsi", "310150000000000");
+    settings->setValue("PrimaryPhoneNumber", "123456789");
+    settings->setValue("Mcc", "310");
+    settings->setValue("Mnc", "150");
+    settings->setValue("PreferredLanguages", QVariant(QList<QString>({"en"})));
+    settings->setValue("DataRoamingEnabled", true);
+    settings->endGroup();
+
+    settings->beginGroup("Sims/893581234000000000001/");
+    settings->setValue("Imsi", "310150000000001");
+    settings->setValue("PrimaryPhoneNumber", "123456789");
+    settings->setValue("Mcc", "310");
+    settings->setValue("Mnc", "150");
+    settings->setValue("PreferredLanguages", QVariant(QList<QString>({"en"})));
+    settings->setValue("DataRoamingEnabled", false);
+    settings->endGroup();
+
+    settings->setValue("KnownSims", QVariant(QList<QString>({"893581234000000000000", "893581234000000000001"})));
+    settings->setValue("SimForMobileData", "893581234000000000001");
+    settings->setValue("MobileDataEnabled", true);
+    settings->sync();
+
+    setConnectionManagerProperty(modem, "Powered", true);
+    setConnectionManagerProperty(modem, "RoamingAllowed", false);
+
+    auto modem2 = createModem("ril_1");
+    setConnectionManagerProperty(modem2, "Powered", false);
+    setConnectionManagerProperty(modem2, "RoamingAllowed", true);
+
+
+    // Start the indicator
+    ASSERT_NO_THROW(startIndicator());
+
+
+    // Check that settings are restored on startup
+
+    EXPECT_FALSE(getConnectionManagerProperties(modem)["Powered"].toBool());
+    EXPECT_TRUE(getConnectionManagerProperties(modem)["RoamingAllowed"].toBool());
+
+    EXPECT_TRUE(getConnectionManagerProperties(modem2)["Powered"].toBool());
+    EXPECT_FALSE(getConnectionManagerProperties(modem2)["RoamingAllowed"].toBool());
+}
+
 }
 
=== modified file 'tests/integration/test-indicator.cpp'
--- tests/integration/test-indicator.cpp	2015-11-20 10:25:10 +0000
+++ tests/integration/test-indicator.cpp	2016-06-22 09:42:47 +0000
@@ -24,6 +24,7 @@
 
 using namespace std;
 using namespace testing;
+using namespace connectivityqt;
 namespace mh = unity::gmenuharness;
 
 namespace
@@ -44,9 +45,10 @@
             .state_icons({"gsm-3g-full", "nm-no-connection"})
             .mode(mh::MenuItemMatcher::Mode::all)
             .submenu()
-            .item(flightModeSwitch())
+            .item(flightModeSwitch())            
             .item(mh::MenuItemMatcher()
                 .section()
+                .item(mobileDataSwitch(false))
                 .item(modemInfo("", "fake.tel", "gsm-3g-full"))
                 .item(cellularSettings())
             )
@@ -195,6 +197,7 @@
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
                 .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-full"))
                 .item(modemInfo("SIM 2", "fake.tel", "gsm-3g-full"))
                 .item(cellularSettings())
@@ -285,6 +288,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch(false))
                 .item(modemInfo("", "No SIM", "no-simcard"))
                 .item(cellularSettings())
             )
@@ -311,6 +316,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch(false))
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-full"))
                 .item(modemInfo("SIM 2", "No SIM", "no-simcard"))
                 .item(cellularSettings())
@@ -338,6 +345,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch(false))
                 .item(modemInfo("", "SIM Locked", "simcard-locked", true)
                       .string_attribute("x-canonical-modem-locked-action", "indicator.modem.1::locked")
                 )
@@ -356,6 +365,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "fake.tel", "gsm-3g-full"))
                 .item(cellularSettings())
             )
@@ -383,6 +394,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-full"))
                 .item(modemInfo("SIM 2", "SIM Locked", "simcard-locked", true))
                 .item(cellularSettings())
@@ -400,6 +413,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-full"))
                 .item(modemInfo("SIM 2", "fake.tel", "gsm-3g-full"))
                 .item(cellularSettings())
@@ -426,6 +441,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "No Signal", "gsm-3g-no-service"))
                 .item(cellularSettings())
             )
@@ -442,6 +459,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "Searching", "gsm-3g-disabled"))
                 .item(cellularSettings())
             )
@@ -461,6 +480,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "fake.tel", "gsm-3g-none"))
                 .item(cellularSettings())
             )
@@ -477,6 +498,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "fake.tel", "gsm-3g-low"))
                 .item(cellularSettings())
             )
@@ -493,6 +516,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "fake.tel", "gsm-3g-medium"))
                 .item(cellularSettings())
             )
@@ -509,6 +534,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "fake.tel", "gsm-3g-high"))
                 .item(cellularSettings())
             )
@@ -525,6 +552,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "fake.tel", "gsm-3g-full"))
                 .item(cellularSettings())
             )
@@ -551,6 +580,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-full"))
                 .item(modemInfo("SIM 2", "No Signal", "gsm-3g-no-service"))
                 .item(cellularSettings())
@@ -568,6 +599,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-full"))
                 .item(modemInfo("SIM 2", "Searching", "gsm-3g-disabled"))
                 .item(cellularSettings())
@@ -588,6 +621,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-full"))
                 .item(modemInfo("SIM 2", "fake.tel", "gsm-3g-none"))
                 .item(cellularSettings())
@@ -605,6 +640,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-full"))
                 .item(modemInfo("SIM 2", "fake.tel", "gsm-3g-low"))
                 .item(cellularSettings())
@@ -622,6 +659,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-full"))
                 .item(modemInfo("SIM 2", "fake.tel", "gsm-3g-medium"))
                 .item(cellularSettings())
@@ -639,6 +678,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-full"))
                 .item(modemInfo("SIM 2", "fake.tel", "gsm-3g-high"))
                 .item(cellularSettings())
@@ -656,6 +697,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-full"))
                 .item(modemInfo("SIM 2", "fake.tel", "gsm-3g-full"))
                 .item(cellularSettings())
@@ -688,6 +731,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "No SIM", "no-simcard"))
                 .item(cellularSettings())
             )
@@ -728,6 +773,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(true))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "No SIM", "no-simcard"))
                 .item(cellularSettings())
             )
@@ -761,6 +808,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "No SIM", "no-simcard"))
                 .item(cellularSettings())
             )
@@ -793,6 +842,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "SIM Locked", "simcard-locked", true))
                 .item(cellularSettings())
             )
@@ -832,6 +883,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(true))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "SIM Locked", "simcard-locked", true))
                 .item(cellularSettings())
             )
@@ -865,6 +918,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "SIM Locked", "simcard-locked", true))
                 .item(cellularSettings())
             )
@@ -908,6 +963,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch(false))
                 .item(modemInfo("", "fake.tel", "gsm-3g-high"))
                 .item(cellularSettings())
             )
@@ -959,6 +1016,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch(false))
                 .item(modemInfo("", "fake.tel", "gsm-3g-high"))
                 .item(cellularSettings())
             )
@@ -988,6 +1047,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(true))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch(false))
                 .item(modemInfo("", "Offline", "gsm-3g-disabled"))
                 .item(cellularSettings())
             )
@@ -1022,6 +1083,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch(true))
                 .item(modemInfo("", "fake.tel", "gsm-3g-high", false, "network-cellular-pre-edge"))
                 .item(cellularSettings())
             )
@@ -1068,6 +1131,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "fake.tel", "gsm-3g-low"))
                 .item(cellularSettings())
             )
@@ -1116,6 +1181,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(true))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "Offline", "gsm-3g-disabled"))
                 .item(cellularSettings())
             )
@@ -1162,6 +1229,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(true))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "Offline", "gsm-3g-disabled"))
                 .item(cellularSettings())
             )
@@ -1199,6 +1268,8 @@
               .mode(mh::MenuItemMatcher::Mode::starts_with)
               .item(flightModeSwitch(false))
               .item(mh::MenuItemMatcher()
+                  .section()
+                  .item(mobileDataSwitch())
                   .item(modemInfo("", "fake.tel", "gsm-3g-low"))
                   .item(cellularSettings())
             )
@@ -1347,6 +1418,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "fake.tel", "gsm-3g-full"))
                 .item(cellularSettings())
             )
@@ -1392,6 +1465,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "No SIM", "no-simcard"))
                 .item(cellularSettings())
             )
@@ -1431,6 +1506,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "No SIM", "no-simcard"))
                 .item(cellularSettings())
             )
@@ -1607,6 +1684,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "No SIM", "no-simcard"))
                 .item(cellularSettings())
             )
@@ -1764,6 +1843,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "No SIM", "no-simcard"))
                 .item(cellularSettings())
             )
@@ -1792,6 +1873,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "No SIM", "no-simcard"))
                 .item(cellularSettings())
             )
@@ -1821,6 +1904,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "No SIM", "no-simcard"))
                 .item(cellularSettings())
             )
@@ -1849,6 +1934,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "No SIM", "no-simcard"))
                 .item(cellularSettings())
             )
@@ -1897,6 +1984,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch(false))
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "No SIM", "no-simcard"))
                 .item(cellularSettings())
             )
@@ -1954,6 +2043,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch(true))
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-high", false, "network-cellular-hspa"))
                 .item(modemInfo("SIM 2", "fake.tel", "gsm-3g-low"))
                 .item(cellularSettings())
@@ -1971,6 +2062,8 @@
                 .mode(mh::MenuItemMatcher::Mode::starts_with)
                 .item(flightModeSwitch())
                 .item(mh::MenuItemMatcher()
+                    .section()
+                    .item(mobileDataSwitch(true))
                     .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-high", false, "network-cellular-edge"))
                     .item(modemInfo("SIM 2", "fake.tel", "gsm-3g-low"))
                     .item(cellularSettings())
@@ -1979,8 +2072,10 @@
             ).match());
 
     // Set second SIM as the active data connection
-    setConnectionManagerProperty(firstModem(), "Powered", false);
-    setConnectionManagerProperty(secondModem, "Powered", true);
+    auto connectivity = newConnectivity();
+    auto modems = getSortedModems(*connectivity);
+    auto sim2 = getModemSim(*modems, 1);
+    connectivity->setSimForMobileData(sim2);
 
     // Now we should have a 3G icon
     EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
@@ -1989,6 +2084,8 @@
                 .mode(mh::MenuItemMatcher::Mode::starts_with)
                 .item(flightModeSwitch())
                 .item(mh::MenuItemMatcher()
+                    .section()
+                    .item(mobileDataSwitch(true))
                     .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-high"))
                     .item(modemInfo("SIM 2", "fake.tel", "gsm-3g-low", false, "network-cellular-3g"))
                     .item(cellularSettings())
@@ -2028,6 +2125,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch(false))
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-low"))
                 .item(modemInfo("SIM 2", "fake.tel", "gsm-3g-high"))
                 .item(cellularSettings())
@@ -2048,6 +2147,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch(true))
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-low"))
                 .item(modemInfo("SIM 2", "fake.tel", "gsm-3g-high", false, "network-cellular-3g"))
                 .item(cellularSettings())
@@ -2071,6 +2172,8 @@
            .mode(mh::MenuItemMatcher::Mode::starts_with)
            .item(flightModeSwitch())
            .item(mh::MenuItemMatcher()
+               .section()
+               .item(mobileDataSwitch(true))
                .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-low"))
                .item(modemInfo("SIM 2", "fake.tel", "gsm-3g-high", false, "network-cellular-3g"))
                .item(cellularSettings())
@@ -2110,6 +2213,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
                 )
@@ -2201,6 +2306,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
                 )
@@ -2256,6 +2363,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
                 )
@@ -2322,6 +2431,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
                 )
@@ -2378,6 +2489,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "SIM Locked", "simcard-locked", true))
                 .item(modemInfo("SIM 2", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
@@ -2444,6 +2557,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
                 )
@@ -2527,6 +2642,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
                 )
@@ -2809,6 +2926,8 @@
             .mode(mh::MenuItemMatcher::Mode::starts_with)
             .item(flightModeSwitch())
             .item(mh::MenuItemMatcher()
+                .section()
+                .item(mobileDataSwitch())
                 .item(modemInfo("SIM 1", "fake.tel", "gsm-3g-full"))
                 .item(modemInfo("SIM 2", "SIM Locked", "simcard-locked", true)
                       .pass_through_activate("x-canonical-modem-locked-action")
@@ -3068,4 +3187,144 @@
     notificationsSpy.clear();
 }
 
+TEST_F(TestIndicator, CellularData_1)
+{
+    auto con = newConnectivity();
+
+    ASSERT_NO_THROW(startIndicator());
+
+    // Check that the indicator switch is enabled when we are not in flightmode
+    // and there is a SIM for mobile data set.
+
+    con->setMobileDataEnabled(true);
+    con->setFlightMode(false);
+    con->setSimForMobileData(getModemSim(*con->modems(), 0));
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .mode(mh::MenuItemMatcher::Mode::starts_with)
+            .submenu()
+              .item(flightModeSwitch())
+              .item(mh::MenuItemMatcher()
+                  .mode(mh::MenuItemMatcher::Mode::starts_with)
+                  .section()
+                  .item(mobileDataSwitch(true)
+                    .enabled(true)
+                  )
+            )
+        ).match());
+
+    // Check that the indicator switch is disabled when we are in flightmode
+    con->setFlightMode(true);
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .mode(mh::MenuItemMatcher::Mode::starts_with)
+            .submenu()
+              .item(flightModeSwitch())
+              .item(mh::MenuItemMatcher()
+                  .mode(mh::MenuItemMatcher::Mode::starts_with)
+                  .section()
+                  .item(mobileDataSwitch(true)
+                    .enabled(false)
+                  )
+            )
+        ).match());
+
+    // Check that the indicator switch is disabled when there is no SIM for mobile data set.
+    con->setFlightMode(false);
+    con->setSimForMobileData(nullptr);
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .mode(mh::MenuItemMatcher::Mode::starts_with)
+            .submenu()
+              .item(flightModeSwitch())
+              .item(mh::MenuItemMatcher()
+                  .mode(mh::MenuItemMatcher::Mode::starts_with)
+                  .section()
+                  .item(mobileDataSwitch(true)
+                    .enabled(false)
+                  )
+            )
+        ).match());
+}
+
+TEST_F(TestIndicator, CellularData_2)
+{
+    auto con = newConnectivity();
+
+    ASSERT_NO_THROW(startIndicator());
+
+    // Check that Connectivity::mobileDataEnabled follows the indicator switch
+
+    con->setMobileDataEnabled(true);
+    con->setFlightMode(false);
+    con->setSimForMobileData(getModemSim(*con->modems(), 0));
+    QTest::qWait(250);
+    QSignalSpy spy(con.get(), SIGNAL(mobileDataEnabledUpdated(bool)));
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .mode(mh::MenuItemMatcher::Mode::starts_with)
+            .submenu()
+              .item(flightModeSwitch())
+              .item(mh::MenuItemMatcher()
+                  .mode(mh::MenuItemMatcher::Mode::starts_with)
+                  .section()
+                  .item(mobileDataSwitch(true)
+                    .activate()
+                  )
+            )
+        ).match());
+
+    WAIT_FOR_SIGNALS(spy, 1);
+    EXPECT_EQ(spy[0], QVariantList() << QVariant(false));
+    spy.clear();
+
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .mode(mh::MenuItemMatcher::Mode::starts_with)
+            .submenu()
+              .item(flightModeSwitch())
+              .item(mh::MenuItemMatcher()
+                  .mode(mh::MenuItemMatcher::Mode::starts_with)
+                  .section()
+                  .item(mobileDataSwitch(false)
+                    .activate()
+                  )
+            )
+        ).match());
+
+    WAIT_FOR_SIGNALS(spy, 1);
+    EXPECT_EQ(spy[0], QVariantList() << QVariant(true));
+
+
+    // Check that indicator switch follows the Connectivity::mobileDataEnabled
+
+    con->setMobileDataEnabled(true);
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .mode(mh::MenuItemMatcher::Mode::starts_with)
+            .submenu()
+              .item(flightModeSwitch())
+              .item(mh::MenuItemMatcher()
+                  .mode(mh::MenuItemMatcher::Mode::starts_with)
+                  .section()
+                  .item(mobileDataSwitch(true))
+            )
+        ).match());
+
+    con->setMobileDataEnabled(false);
+    EXPECT_MATCHRESULT(mh::MenuMatcher(phoneParameters())
+        .item(mh::MenuItemMatcher()
+            .mode(mh::MenuItemMatcher::Mode::starts_with)
+            .submenu()
+              .item(flightModeSwitch())
+              .item(mh::MenuItemMatcher()
+                  .mode(mh::MenuItemMatcher::Mode::starts_with)
+                  .section()
+                  .item(mobileDataSwitch(false))
+            )
+        ).match());
+}
+
 } // namespace