Bug 859200 - Part 2 : update xpcshell tests. r=vicamo
authorYoshi Huang <allstars.chh@mozilla.com>
Tue, 09 Apr 2013 14:00:58 +0800
changeset 134910 9aa0ec79f823925828eea09a9a2a5bdeaaf52820
parent 134909 47ca2082e78412660df557e02ed0a9d5265bc543
child 134911 444149388adb00a77008b9d6c69173cab550d81b
push id3752
push userlsblakk@mozilla.com
push dateMon, 13 May 2013 17:21:10 +0000
treeherdermozilla-aurora@1580544aef0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvicamo
bugs859200
milestone23.0a1
Bug 859200 - Part 2 : update xpcshell tests. r=vicamo
dom/system/gonk/tests/test_ril_worker_icc.js
--- a/dom/system/gonk/tests/test_ril_worker_icc.js
+++ b/dom/system/gonk/tests/test_ril_worker_icc.js
@@ -517,31 +517,33 @@ add_test(function test_icc_get_card_lock
   buf.sendParcel = function () {
     // Request Type.
     do_check_eq(this.readUint32(), REQUEST_QUERY_FACILITY_LOCK)
 
     // Token : we don't care.
     this.readUint32();
 
     // String Array Length.
-    do_check_eq(this.readUint32(), 4);
+    do_check_eq(this.readUint32(), worker.RILQUIRKS_V5_LEGACY ? 3 : 4);
 
     // Facility.
     do_check_eq(this.readString(), ICC_CB_FACILITY_FDN);
 
     // Password.
     do_check_eq(this.readString(), "");
 
     // Service class.
     do_check_eq(this.readString(), (ICC_SERVICE_CLASS_VOICE |
                                     ICC_SERVICE_CLASS_DATA  |
                                     ICC_SERVICE_CLASS_FAX).toString());
 
-    // AID. Ignore because it's from modem.
-    this.readUint32();
+    if (!worker.RILQUIRKS_V5_LEGACY) {
+      // AID. Ignore because it's from modem.
+      this.readUint32();
+    }
 
     run_next_test();
   };
 
   ril.iccGetCardLock({lockType: "fdn"});
 });
 
 /**
@@ -1926,18 +1928,20 @@ add_test(function test_update_adn_like()
 
     // pin2.
     if (fileId == ICC_EF_ADN) {
       do_check_eq(this.readString(), "");
     } else {
       do_check_eq(this.readString(), "1111");
     }
 
-    // AID. Ignore because it's from modem.
-    this.readUint32();
+    if (!worker.RILQUIRKS_V5_LEGACY) {
+      // AID. Ignore because it's from modem.
+      this.readUint32();
+    }
 
     if (fileId == ICC_EF_FDN) {
       run_next_test();
     }
   };
 
   fileId = ICC_EF_ADN;
   record.updateADNLike(fileId,