Update ConnMan to match latest oFono

diff --git a/lib/ofonoconnman.cpp b/lib/ofonoconnman.cpp
index 43a6984..2d5bcc8 100644 (file)
--- a/lib/ofonoconnman.cpp
+++ b/lib/ofonoconnman.cpp
@@ -157,20 +157,20 @@ void OfonoConnMan::addContext(const QString& type)
     request.setArguments(arg);
 
     QDBusConnection::systemBus().callWithCallback(request, this,
-                                        SLOT(addContextResp()),
+                                        SLOT(addContextResp(const QDBusObjectPath &)),
                                         SLOT(addContextErr(const QDBusError&)),
                                         ADD_TIMEOUT);
 }
 
-void OfonoConnMan::addContextResp()
+void OfonoConnMan::addContextResp(const QDBusObjectPath &path)
 {
-    emit addContextComplete(TRUE);
+    emit addContextComplete(TRUE, path.path());
 }
 
 void OfonoConnMan::addContextErr(const QDBusError& error)
 {
     m_if->setError(error.name(), error.message());
-    emit addContextComplete(FALSE);
+    emit addContextComplete(FALSE, QString());
 }
 
 void OfonoConnMan::removeContext(const QString& contextpath)

diff --git a/lib/ofonoconnman.h b/lib/ofonoconnman.h
index b5abec8..b6ba8c1 100644 (file)
--- a/lib/ofonoconnman.h
+++ b/lib/ofonoconnman.h
@@ -58,6 +58,8 @@ public:
     OfonoConnMan(OfonoModem::SelectionSetting modemSetting, const QString &modemPath, QObject *parent=0);
     ~OfonoConnMan();
 
+    Q_INVOKABLE QStringList getContexts();
+
     /* Properties */
     bool attached() const;
     QString bearer() const;
@@ -65,14 +67,13 @@ public:
     bool roamingAllowed() const;
     bool powered() const;
 
+public slots:
     void setPowered(const bool);
     void setRoamingAllowed(const bool);
     void deactivateAll();
     void addContext(const QString& type);
     void removeContext(const QString& path);
 
-    Q_INVOKABLE QStringList getContexts();
-
 signals:
     void attachedChanged(const bool value);
     void bearerChanged(const QString &bearer);
@@ -83,7 +84,7 @@ signals:
     void contextRemoved(const QString& path);
 
     void deactivateAllComplete(bool success);
-    void addContextComplete(bool success);
+    void addContextComplete(bool success, const QString& path);
     void removeContextComplete(bool success);
 
     void setPoweredFailed();
@@ -97,7 +98,7 @@ private slots:
     void contextRemovedChanged(const QDBusObjectPath &path);
     void deactivateAllResp();
     void deactivateAllErr(const QDBusError& error);
-    void addContextResp();
+    void addContextResp(const QDBusObjectPath &path);
     void addContextErr(const QDBusError& error);
     void removeContextResp();
     void removeContextErr(const QDBusError& error);

diff --git a/tests/test_ofonoconnman.cpp b/tests/test_ofonoconnman.cpp
index b92029f..b70518b 100644 (file)
--- a/tests/test_ofonoconnman.cpp
+++ b/tests/test_ofonoconnman.cpp
@@ -59,7 +59,7 @@ private slots:
         QSignalSpy pow(m,SIGNAL(poweredChanged(const bool)));
         QSignalSpy add(m, SIGNAL(contextAdded(const QString&)));
         QSignalSpy rem(m, SIGNAL(contextRemoved(const QString&)));
-        QSignalSpy cadd(m,SIGNAL(addContextComplete(bool)));
+        QSignalSpy cadd(m,SIGNAL(addContextComplete(bool, const QString&)));
         QSignalSpy crem(m,SIGNAL(removeContextComplete(bool)));
         QSignalSpy deact(m,SIGNAL(deactivateAllComplete(bool)));
 
@@ -83,6 +83,8 @@ private slots:
         QCOMPARE(roam.count(), 2);
         QCOMPARE(add.count(), 1);
         QString path = add.takeFirst().at(0).toString();
+        QString path2 = cadd.takeFirst().at(1).toString();
+       QCOMPARE(path, path2);
         m->removeContext(path);
         QTest::qWait(10000);
         QCOMPARE(rem.count(), 1);

diff --git a/tests/test_ofonoconnmancontext.cpp b/tests/test_ofonoconnmancontext.cpp
index 34e7077..9bac8bd 100644 (file)
--- a/tests/test_ofonoconnmancontext.cpp
+++ b/tests/test_ofonoconnmancontext.cpp
@@ -51,7 +51,7 @@ private slots:
 
     void testOfonoConnmanContext ()
     {
-        QSignalSpy addcon(m,SIGNAL(addContextComplete(bool)));
+        QSignalSpy addcon(m,SIGNAL(addContextComplete(bool, const QString&)));
         QSignalSpy conadd(m, SIGNAL(contextAdded(const QString&)));
         QSignalSpy conrem(m, SIGNAL(contextRemoved(const QString&)));
 
@@ -59,9 +59,11 @@ private slots:
         QTest::qWait(1000);
 
         QCOMPARE(addcon.count(), 1);
-        QCOMPARE(addcon.takeFirst().at(0).toBool(),true);
+       QVariantList list = addcon.takeFirst();
+        QCOMPARE(list.at(0).toBool(),true);
         QCOMPARE(conadd.count(), 1);
         QString contextid = conadd.takeFirst().at(0).toString();
+       QCOMPARE(contextid, list.at(1).toString());
 
         OfonoConnmanContext* context = new OfonoConnmanContext(contextid);