Merge pull request #12253 from nullaus/agps-unit-tests

bug 891732 - AGPS/SUPL Operator Variant Unit Tests. r=jaoo
mozilla-b2g · Sep 18, 2013 · 602e128 · 602e128
2 parents e3b8995 + 6cb358e
commit 602e128
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 0 deletions.
diff --git a/apps/system/test/unit/operator_variant_test.js b/apps/system/test/unit/operator_variant_test.js
@@ -18,6 +18,12 @@ suite('operator variant', function() {
     mnc: EXPECTED_DATA_MNC
   };
 
+  const EXPECTED_SUPL_MNC = 4;
+  const EXPECTED_SUPL_ICC_INFO = {
+    mcc: TEST_NETWORK_MCC,
+    mnc: EXPECTED_SUPL_MNC
+  };
+
   const EXPECTED_MMS_MNC = 2;
   const EXPECTED_MMS_ICC_INFO = {
     mcc: TEST_NETWORK_MCC,
@@ -57,6 +63,16 @@ suite('operator variant', function() {
     { key: 'ril.data.authtype', value: 'none' }
   ];
 
+  const SUPL_KEYS_VALUES = [
+    { key: 'ril.supl.carrier', value: 'Test Network with SUPL' },
+    { key: 'ril.supl.apn', value: 'supl.internet' },
+    { key: 'ril.supl.user', value: 'user' },
+    { key: 'ril.supl.passwd', value: 'password' },
+    { key: 'ril.supl.httpProxyHost', value: '127.0.0.1' },
+    { key: 'ril.supl.httpProxyPort', value: '8080' },
+    { key: 'ril.supl.authtype', value: 'none' }
+  ];
+
   const MMS_KEYS_VALUES = [
     { key: 'ril.mms.carrier', value: 'Test Network with MMS' },
     { key: 'ril.mms.apn', value: 'mms.internet' },
@@ -151,6 +167,37 @@ suite('operator variant', function() {
     MockIccHelper.mTriggerEventListeners('iccinfochange', {});
   });
 
+  test('operator variant agps / supl apn', function(done) {
+    var observer = {
+      bound: null,
+      expected: SUPL_KEYS_VALUES.length,
+      seen: 0,
+      func: function(event) {
+        SUPL_KEYS_VALUES.forEach(function(data) {
+
+          if (data.key == event.settingName) {
+            assert.equal(
+              event.settingValue,
+              data.value,
+              'Wrong AGPS/SUPL setting value'
+            );
+            ++this.seen;
+          }
+        }, this);
+
+        if (this.seen == this.expected) {
+          setObservers(SUPL_KEYS_VALUES, this, true);
+          done();
+        }
+      }
+    };
+
+    setObservers(SUPL_KEYS_VALUES, observer);
+
+    MockIccHelper.mProps.iccInfo = EXPECTED_SUPL_ICC_INFO;
+    MockIccHelper.mTriggerEventListeners('iccinfochange', {});
+  });
+
   test('operator variant mms apn', function(done) {
     var observer = {
       bound: null,

diff --git a/shared/resources/apn.json b/shared/resources/apn.json
@@ -3186,6 +3186,9 @@
   "03": [
     {"carrier":"Test Network with Operator Variant Settings","apn":"mms.internet","user":"user","password":"password","proxy":"127.0.0.1","port":"8080","authtype":"0","type":["default","supl"]},
     {"voicemail":"999999","cellBroadcastSearchList":"0,1,2,3","type":["operatorvariant"]}
+  ],
+  "04": [
+    {"carrier":"Test Network with SUPL","apn":"supl.internet","user":"user","password":"password","proxy":"127.0.0.1","port":"8080","authtype":"0","type":["default","supl"]}
   ]
 }
 }
diff --git a/shared/resources/apn/apns_conf_local.xml b/shared/resources/apn/apns_conf_local.xml
@@ -3,6 +3,8 @@
 <!-- use empty string to specify no proxy or port -->
 <!-- This version must agree with that in apps/common/res/apns.xml -->
 <apns version="7">
+
+  <!-- Test Networks -->
   <apn carrier="Test Network"
       mcc="001"
       mnc="01"
@@ -42,6 +44,19 @@
       type="default,supl"
   />
 
+    <apn carrier="Test Network with SUPL"
+      mcc="001"
+      mnc="04"
+      apn="supl.internet"
+      user="user"
+      password="password"
+      proxy="127.0.0.1"
+      port="8080"
+      authtype="0"
+      type="default,supl"
+  />
+  <!-- /Test Networks -->
+
   <apn carrier="SpeakOut"
       mcc="302"
       mnc="720"