Bug 1081130 - Fix importing contacts with only a phone number and fetch the correct format. r=abr, a=sledru
authorMike de Boer <mdeboer@mozilla.com>
Wed, 15 Oct 2014 14:04:02 +0200
changeset 225708 1f7f807b6362
parent 225707 ae6317e02f72
child 225709 4f904d9bcff2
push id3987
push userryanvm@gmail.com
push date2014-10-16 14:34 +0000
treeherdermozilla-beta@1f7f807b6362 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersabr, sledru
bugs1081130
milestone34.0
Bug 1081130 - Fix importing contacts with only a phone number and fetch the correct format. r=abr, a=sledru
browser/components/loop/GoogleImporter.jsm
browser/components/loop/test/mochitest/browser_GoogleImporter.js
browser/components/loop/test/mochitest/fixtures/google_contacts.txt
--- a/browser/components/loop/GoogleImporter.jsm
+++ b/browser/components/loop/GoogleImporter.jsm
@@ -446,17 +446,17 @@ this.GoogleImporter.prototype = {
     // Process telephone numbers.
     let phoneNodes = entry.getElementsByTagNameNS(kNS_GD, "phoneNumber");
     if (phoneNodes.length) {
       contact.tel = [];
       for (let [,phoneNode] of Iterator(phoneNodes)) {
         contact.tel.push({
           pref: (phoneNode.getAttribute("primary") == "true"),
           type: [getFieldType(phoneNode)],
-          value: phoneNode.firstChild.nodeValue
+          value: phoneNode.getAttribute("uri").replace("tel:", "")
         });
       }
     }
 
     let orgNodes = entry.getElementsByTagNameNS(kNS_GD, "organization");
     if (orgNodes.length) {
       contact.org = [];
       contact.jobTitle = [];
@@ -496,17 +496,17 @@ this.GoogleImporter.prototype = {
           try {
             email = getPreferred(contact);
           } catch (ex) {}
           if (email) {
             contact.name = [email.value];
           } else {
             let tel;
             try {
-              tel = getPreferred(contact, "phone");
+              tel = getPreferred(contact, "tel");
             } catch (ex) {}
             if (tel) {
               contact.name = [tel.value];
             }
           }
         }
       }
     }
--- a/browser/components/loop/test/mochitest/browser_GoogleImporter.js
+++ b/browser/components/loop/test/mochitest/browser_GoogleImporter.js
@@ -18,60 +18,68 @@ function promiseImport() {
 }
 
 add_task(function* test_GoogleImport() {
   let stats;
   // An error may throw and the test will fail when that happens.
   stats = yield promiseImport();
 
   // Assert the world.
-  Assert.equal(stats.total, 5, "Five contacts should get processed");
-  Assert.equal(stats.success, 5, "Five contacts should be imported");
+  Assert.equal(stats.total, 6, "Five contacts should get processed");
+  Assert.equal(stats.success, 6, "Five contacts should be imported");
 
   yield promiseImport();
-  Assert.equal(Object.keys(mockDb._store).length, 5, "Database should contain only five contact after reimport");
+  Assert.equal(Object.keys(mockDb._store).length, 6, "Database should contain only five contact after reimport");
 
-  let c = mockDb._store[mockDb._next_guid - 5];
+  let c = mockDb._store[mockDb._next_guid - 6];
   Assert.equal(c.name[0], "John Smith", "Full name should match");
   Assert.equal(c.givenName[0], "John", "Given name should match");
   Assert.equal(c.familyName[0], "Smith", "Family name should match");
   Assert.equal(c.email[0].type, "other", "Email type should match");
   Assert.equal(c.email[0].value, "john.smith@example.com", "Email should match");
   Assert.equal(c.email[0].pref, true, "Pref should match");
   Assert.equal(c.category[0], "google", "Category should match");
   Assert.equal(c.id, "http://www.google.com/m8/feeds/contacts/tester%40mochi.com/base/0", "UID should match and be scoped to provider");
 
-  c = mockDb._store[mockDb._next_guid - 4];
+  c = mockDb._store[mockDb._next_guid - 5];
   Assert.equal(c.name[0], "Jane Smith", "Full name should match");
   Assert.equal(c.givenName[0], "Jane", "Given name should match");
   Assert.equal(c.familyName[0], "Smith", "Family name should match");
   Assert.equal(c.email[0].type, "other", "Email type should match");
   Assert.equal(c.email[0].value, "jane.smith@example.com", "Email should match");
   Assert.equal(c.email[0].pref, true, "Pref should match");
   Assert.equal(c.category[0], "google", "Category should match");
   Assert.equal(c.id, "http://www.google.com/m8/feeds/contacts/tester%40mochi.com/base/1", "UID should match and be scoped to provider");
 
-  c = mockDb._store[mockDb._next_guid - 3];
+  c = mockDb._store[mockDb._next_guid - 4];
   Assert.equal(c.name[0], "Davy Randall Jones", "Full name should match");
   Assert.equal(c.givenName[0], "Davy Randall", "Given name should match");
   Assert.equal(c.familyName[0], "Jones", "Family name should match");
   Assert.equal(c.email[0].type, "other", "Email type should match");
   Assert.equal(c.email[0].value, "davy.jones@example.com", "Email should match");
   Assert.equal(c.email[0].pref, true, "Pref should match");
   Assert.equal(c.category[0], "google", "Category should match");
   Assert.equal(c.id, "http://www.google.com/m8/feeds/contacts/tester%40mochi.com/base/2", "UID should match and be scoped to provider");
 
-  c = mockDb._store[mockDb._next_guid - 2];
+  c = mockDb._store[mockDb._next_guid - 3];
   Assert.equal(c.name[0], "noname@example.com", "Full name should match");
   Assert.equal(c.email[0].type, "other", "Email type should match");
   Assert.equal(c.email[0].value, "noname@example.com", "Email should match");
   Assert.equal(c.email[0].pref, true, "Pref should match");
   Assert.equal(c.category[0], "google", "Category should match");
   Assert.equal(c.id, "http://www.google.com/m8/feeds/contacts/tester%40mochi.com/base/3", "UID should match and be scoped to provider");
 
-  c = mockDb._store[mockDb._next_guid - 1];
+  c = mockDb._store[mockDb._next_guid - 2];
   Assert.equal(c.name[0], "lycnix", "Full name should match");
   Assert.equal(c.email[0].type, "other", "Email type should match");
   Assert.equal(c.email[0].value, "lycnix", "Email should match");
   Assert.equal(c.email[0].pref, true, "Pref should match");
   Assert.equal(c.category[0], "google", "Category should match");
   Assert.equal(c.id, "http://www.google.com/m8/feeds/contacts/tester%40mochi.com/base/7", "UID should match and be scoped to provider");
+
+  c = mockDb._store[mockDb._next_guid - 1];
+  Assert.equal(c.name[0], "+31-6-12345678", "Full name should match");
+  Assert.equal(c.tel[0].type, "mobile", "Email type should match");
+  Assert.equal(c.tel[0].value, "+31-6-12345678", "Email should match");
+  Assert.equal(c.tel[0].pref, false, "Pref should match");
+  Assert.equal(c.category[0], "google", "Category should match");
+  Assert.equal(c.id, "http://www.google.com/m8/feeds/contacts/tester%40mochi.com/base/8", "UID should match and be scoped to provider");
 });
--- a/browser/components/loop/test/mochitest/fixtures/google_contacts.txt
+++ b/browser/components/loop/test/mochitest/fixtures/google_contacts.txt
@@ -86,9 +86,20 @@
     <app:edited xmlns:app="http://www.w3.org/2007/app">2007-08-01T05:45:52.203Z</app:edited>
     <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/contact/2008#contact"/>
     <title/>
     <link href="https://www.google.com/m8/feeds/photos/media/tester%40mochi.com/7" rel="http://schemas.google.com/contacts/2008/rel#photo" type="image/*"/>
     <link href="https://www.google.com/m8/feeds/contacts/tester%40mochi.com/full/7" rel="self" type="application/atom+xml"/>
     <link href="https://www.google.com/m8/feeds/contacts/tester%40mochi.com/full/7" rel="edit" type="application/atom+xml"/>
     <gd:email address="lycnix" primary="true" rel="http://schemas.google.com/g/2005#other"/>
   </entry>
+  <entry gd:etag="&quot;RXkzfjVSLit7I2A9XRdRGUgITgA.&quot;">
+    <id>http://www.google.com/m8/feeds/contacts/tester%40mochi.com/base/8</id>
+    <updated>2014-10-10T14:55:44.786Z</updated>
+    <app:edited xmlns:app="http://www.w3.org/2007/app">2014-10-10T14:55:44.786Z</app:edited>
+    <category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/contact/2008#contact"/>
+    <title/>
+    <link href="https://www.google.com/m8/feeds/photos/media/tester%40mochi.com/8" rel="http://schemas.google.com/contacts/2008/rel#photo" type="image/*"/>
+    <link href="https://www.google.com/m8/feeds/contacts/tester%40mochi.com/full/8" rel="self" type="application/atom+xml"/>
+    <link href="https://www.google.com/m8/feeds/contacts/tester%40mochi.com/full/8" rel="edit" type="application/atom+xml"/>
+    <gd:phoneNumber rel="http://schemas.google.com/g/2005#mobile" uri="tel:+31-6-12345678">0612345678</gd:phoneNumber>
+  </entry>
 </feed>