Merge lp:~tiagosh/telepathy-ofono/fakeEmergencyNumber into lp:telepathy-ofono

[Tiago Salem Herrmann]

Add "fakeEmergencyNumber" property for testing.

Add "fakeEmergencyNumber" property for testing.

Usage:
FAKE_NUMBER=123456
mc-tool set ofono/ofono/account0 string:fakeEmergencyNumber=$FAKE_NUMBER

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/telepathy-ofono) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:125
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/149/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/149/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

=== modified file 'connection.cpp'
--- connection.cpp	2014-12-04 13:31:28 +0000
+++ connection.cpp	2015-01-20 16:04:34 +0000
@@ -150,6 +150,7 @@
                      emergencyModeIface.data(), SLOT(setEmergencyNumbers(QStringList)));
     plugInterface(Tp::AbstractConnectionInterfacePtr::dynamicCast(emergencyModeIface));
     emergencyModeIface->setEmergencyNumbers(mOfonoVoiceCallManager->emergencyNumbers());
+    emergencyModeIface->setFakeEmergencyNumber(parameters["fakeEmergencyNumber"].toString());
 
     // init custom voicemail interface (not provided by telepathy)
     voicemailIface = BaseConnectionVoicemailInterface::create();

=== modified file 'emergencymodeiface.cpp'
--- emergencymodeiface.cpp	2014-06-27 13:35:18 +0000
+++ emergencymodeiface.cpp	2015-01-20 16:04:34 +0000
@@ -37,6 +37,7 @@
     }
     EmergencyNumbersCallback emergencyNumbersCB;
     BaseConnectionEmergencyModeInterface::Adaptee *adaptee;
+    QString fakeEmergencyNumber;
 };
 
 BaseConnectionEmergencyModeInterface::Adaptee::~Adaptee()
@@ -55,7 +56,11 @@
         context->setFinishedWithError(error.name(), error.message());
         return;
     }
-    context->setFinished(numbers);
+    if (mInterface->mPriv->fakeEmergencyNumber.isEmpty()) {
+        context->setFinished(numbers);
+    } else {
+        context->setFinished(QStringList() << numbers << mInterface->mPriv->fakeEmergencyNumber);
+    }
 }
 
 BaseConnectionEmergencyModeInterface::BaseConnectionEmergencyModeInterface()
@@ -76,7 +81,18 @@
 
 void BaseConnectionEmergencyModeInterface::setEmergencyNumbers(const QStringList &numbers)
 {
-    Q_EMIT mPriv->adaptee->emergencyNumbersChanged(numbers);
+    QStringList finalEmergencyList(numbers);
+
+    if (!mPriv->fakeEmergencyNumber.isEmpty()) {
+        finalEmergencyList << mPriv->fakeEmergencyNumber;
+    }
+    
+    Q_EMIT mPriv->adaptee->emergencyNumbersChanged(finalEmergencyList);
+}
+
+void BaseConnectionEmergencyModeInterface::setFakeEmergencyNumber(const QString &fakeEmergencyNumber)
+{
+    mPriv->fakeEmergencyNumber = fakeEmergencyNumber;
 }
 
 QVariantMap BaseConnectionEmergencyModeInterface::immutableProperties() const

=== modified file 'emergencymodeiface.h'
--- emergencymodeiface.h	2014-06-27 13:35:18 +0000
+++ emergencymodeiface.h	2015-01-20 16:04:34 +0000
@@ -52,6 +52,7 @@
 
     typedef Tp::Callback1<QStringList, Tp::DBusError*> EmergencyNumbersCallback;
     void setEmergencyNumbersCallback(const EmergencyNumbersCallback &cb);
+    void setFakeEmergencyNumber(const QString &fakeEmergencyNumber);
 
 public Q_SLOTS:
     void setEmergencyNumbers(const QStringList &numbers);

=== modified file 'ofono.manager'
--- ofono.manager	2014-03-06 19:14:41 +0000
+++ ofono.manager	2015-01-20 16:04:34 +0000
@@ -5,4 +5,5 @@
 
 [Protocol ofono]
 param-modem-objpath=s
+param-fakeEmergencyNumber=s