Merge lp:~tiagosh/telepathy-ofono/fix-1462090 into lp:telepathy-ofono

[Tiago Salem Herrmann]

Improve phone number normalization.

Improve phone number normalization.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:144
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/168/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-armhf-ci/26/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-vivid-i386-ci/26/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'phoneutils.cpp'
--- phoneutils.cpp	2013-11-11 15:10:00 +0000
+++ phoneutils.cpp	2015-06-17 20:21:04 +0000
@@ -39,7 +39,7 @@
 
 bool PhoneUtils::isPhoneNumber(const QString &identifier) {
     // remove all non diable digits
-    QString finalNumber = QString(identifier).replace(QRegExp("[p+*#(),;-]"),"");
+    QString finalNumber = QString(identifier).replace(QRegExp("[p+*#/(),;-]"),"");
     finalNumber = finalNumber.replace(QRegExp("(\\s+)"), "");
     // if empty, the number is invalid
     if (finalNumber.isEmpty())
@@ -58,7 +58,7 @@
     }
     QRegExp regexp = QRegExp("(\\s+)");
     QString finalNumber = QString(identifier).replace(regexp,"");
-    finalNumber = finalNumber.replace(QRegExp("[()-]"),"");
+    finalNumber = finalNumber.replace(QRegExp("[()/-]"),"");
     return finalNumber;
 }
 

=== modified file 'tests/CallTest.cpp'
--- tests/CallTest.cpp	2014-09-22 21:08:53 +0000
+++ tests/CallTest.cpp	2015-06-17 20:21:04 +0000
@@ -48,6 +48,8 @@
     void testCallIncoming();
     void testCallIncomingPrivateNumber();
     void testCallIncomingUnknownNumber();
+    void testNumberNormalization_data();
+    void testNumberNormalization();
     void testCallOutgoing();
     void testCallHold();
     void testCallDTMF();
@@ -159,6 +161,36 @@
     QTRY_COMPARE(channel->callState(), Tp::CallStateEnded);
 }
 
+void CallTest::testNumberNormalization_data()
+{
+    QTest::addColumn<QString>("number");
+    QTest::addColumn<QString>("expectedNumber");
+
+    QTest::newRow("simple number") << "12345678" << "12345678";
+    QTest::newRow("number with dash") << "1234-5678" << "12345678"; 
+    QTest::newRow("number with area code") << "(123)12345678" << "12312345678";
+    QTest::newRow("number with slash") << "+421 2/123 456 78" << "[phone]";
+}
+
+void CallTest::testNumberNormalization()
+{
+    QFETCH(QString, number);
+    QFETCH(QString, expectedNumber);
+
+    Tp::AccountPtr account = TelepathyHelper::instance()->account();
+    QSignalSpy spy(this, SIGNAL(contactsReceived(QList<Tp::ContactPtr>)));
+
+    connect(account->connection()->contactManager()->contactsForIdentifiers(QStringList() << number),
+            SIGNAL(finished(Tp::PendingOperation*)),
+            SLOT(onPendingContactsFinished(Tp::PendingOperation*)));
+
+    QTRY_COMPARE(spy.count(), 1);
+
+    QList<Tp::ContactPtr> contacts = spy.first().first().value<QList<Tp::ContactPtr> >();
+    QCOMPARE(contacts.count(), 1);
+    QCOMPARE(contacts.first()->id(), QString(expectedNumber));
+}
+
 void CallTest::testCallOutgoing()
 {
     // Request the contact to start chatting to