Bug 991445 - Part 2: Align wbxml_data_array for better understanding. r=vyang, a=1.3+
authorBevis Tseng <btseng@mozilla.com>
Thu, 24 Apr 2014 10:43:10 +0800
changeset 192073 c04fa70ed442f89ca1055f5086065f99c34b93b0
parent 192072 436884f12e4545eef16ce25cf0c60f5c5da496e5
child 192074 03d3f45128907ddcc10be0246761fc74cc99cb7f
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvyang, 1
bugs991445
milestone30.0a2
Bug 991445 - Part 2: Align wbxml_data_array for better understanding. r=vyang, a=1.3+
dom/wappush/tests/test_cp_pdu_helper.js
--- a/dom/wappush/tests/test_cp_pdu_helper.js
+++ b/dom/wappush/tests/test_cp_pdu_helper.js
@@ -223,60 +223,131 @@ let text_data_array = new Uint8Array([
   0x72, 0x6F, 0x76, 0x69, 0x73, 0x69, 0x6F, 0x6E,
   0x69, 0x6E, 0x67, 0x64, 0x6F, 0x63, 0x3E
 ]);
 
 /*
  * Test data from OMA-TS-WAP_ProvCont-V1_1-20090421-C.pdf, Appendix C
  */
 let wbxml_data_array = new Uint8Array([
-  0x03, 0x0b, 0x6a, 0x05, 0x4e, 0x41, 0x50, 0x31,
-  0x00, 0xC5, 0x46, 0x01, 0xc6, 0x51, 0x01, 0x87,
-  0x15, 0x06, 0x03, 0x31, 0x37, 0x30, 0x2e, 0x31,
-  0x38, 0x37, 0x2e, 0x35, 0x31, 0x2e, 0x34, 0x00,
-  0x01, 0x87, 0x07, 0x06, 0x03, 0x42, 0x61, 0x6e,
-  0x6b, 0x4d, 0x61, 0x69, 0x6e, 0x50, 0x72, 0x6f,
-  0x78, 0x79, 0x00, 0x01, 0x87, 0x1c, 0x06, 0x03,
-  0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77,
-  0x77, 0x77, 0x2e, 0x62, 0x61, 0x6e, 0x6b, 0x2e,
-  0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x74, 0x61, 0x72,
-  0x74, 0x70, 0x61, 0x67, 0x65, 0x2e, 0x77, 0x6d,
-  0x6c, 0x00, 0x01, 0xc6, 0x59, 0x01, 0x87, 0x19,
-  0x06, 0x9c, 0x01, 0x87, 0x1a, 0x06, 0x03, 0x70,
-  0x78, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d,
-  0x65, 0x00, 0x01, 0x87, 0x1b, 0x06, 0x03, 0x70,
-  0x78, 0x75, 0x73, 0x65, 0x72, 0x70, 0x61, 0x73,
-  0x73, 0x77, 0x64, 0x00, 0x01, 0x01, 0xc6, 0x52,
-  0x01, 0x87, 0x2f, 0x06, 0x03, 0x50, 0x52, 0x4f,
-  0x58, 0x59, 0x20, 0x31, 0x00, 0x01, 0x87, 0x17,
-  0x06, 0x03, 0x77, 0x77, 0x77, 0x2e, 0x62, 0x61,
-  0x6e, 0x6b, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x00,
-  0x01, 0x87, 0x20, 0x06, 0x03, 0x31, 0x37, 0x30,
-  0x2e, 0x31, 0x38, 0x37, 0x2e, 0x35, 0x31, 0x2e,
-  0x33, 0x00, 0x01, 0x87, 0x21, 0x06, 0x85, 0x01,
+  // WBXML version 1.3
+  0x03,
+  // The Public Identifier for "-//WAPFORUM//DTD PROV 1.0//EN"
+  0x0b,
+  // Character set UTF-8
+  0x6a,
+  // String table length = 05
+  0x05,
+  // String table: 'N', 'A', 'P', '1', 00
+  0x4e, 0x41, 0x50, 0x31, 0x00,
+  // <wap-provisioningdoc version="1.0">
+  0xc5, 0x46, 0x01,
+  //   <characteristic type="PXLOGICAL">
+  0xc6, 0x51, 0x01,
+  //     <parm name="PROXY-ID" value="170.187.51.4"/>
+  0x87, 0x15, 0x06, 0x03, 0x31, 0x37, 0x30, 0x2e,
+  0x31, 0x38, 0x37, 0x2e, 0x35, 0x31, 0x2e, 0x34,
+  0x00, 0x01,
+  //     <parm name="NAME" value="BankMainProxy"/>
+  0x87, 0x07, 0x06, 0x03, 0x42, 0x61, 0x6e, 0x6b,
+  0x4d, 0x61, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x78,
+  0x79, 0x00, 0x01,
+  //     <parm name="STARTPAGE" value="http://www.bank.com/startpage.wml"/>
+  0x87, 0x1c, 0x06, 0x03, 0x68, 0x74, 0x74, 0x70,
+  0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x62,
+  0x61, 0x6e, 0x6b, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+  0x73, 0x74, 0x61, 0x72, 0x74, 0x70, 0x61, 0x67,
+  0x65, 0x2e, 0x77, 0x6d, 0x6c, 0x00, 0x01,
+  //     <characteristic type="PXAUTHINFO">
+  0xc6, 0x59, 0x01,
+  //       <parm name="PXAUTH-TYPE" value="HTTP-BASIC"/>
+  0x87, 0x19, 0x06, 0x9c, 0x01,
+  //       <parm name="PXAUTH-ID" value="pxusername"/>
+  0x87, 0x1a, 0x06, 0x03, 0x70, 0x78, 0x75, 0x73,
+  0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x00, 0x01,
+  //       <parm name="PXAUTH-PW" value="pxuserpasswd"/>
+  0x87, 0x1b, 0x06, 0x03, 0x70, 0x78, 0x75, 0x73,
+  0x65, 0x72, 0x70, 0x61, 0x73, 0x73, 0x77, 0x64,
+  0x00, 0x01,
+  //     </characteristic>
+  0x01,
+  //     <characteristic type="PXPHYSICAL">
+  0xc6, 0x52, 0x01,
+  //       <parm name="PHYSICAL-PROXY-ID" value="PROXY 1"/>
+  0x87, 0x2f, 0x06, 0x03, 0x50, 0x52, 0x4f, 0x58,
+  0x59, 0x20, 0x31, 0x00, 0x01,
+  //       <parm name="DOMAIN" value="www.bank.com/"/>
+  0x87, 0x17, 0x06, 0x03, 0x77, 0x77, 0x77, 0x2e,
+  0x62, 0x61, 0x6e, 0x6b, 0x2e, 0x63, 0x6f, 0x6d,
+  0x2f, 0x00, 0x01,
+  //       <parm name="PXADDR" value="170.187.51.3"/>
+  0x87, 0x20, 0x06, 0x03, 0x31, 0x37, 0x30, 0x2e,
+  0x31, 0x38, 0x37, 0x2e, 0x35, 0x31, 0x2e, 0x33,
+  0x00, 0x01,
+  //       <parm name="PXADDRTYPE" value="IPV4"/>
+  0x87, 0x21, 0x06, 0x85, 0x01,
+  //       <parm name="TO-NAPID" value="INTERNET"/>
   0x87, 0x22, 0x06, 0x03, 0x49, 0x4e, 0x54, 0x45,
-  0x52, 0x4e, 0x45, 0x54, 0x00, 0x01, 0x87, 0x22,
-  0x06, 0x83, 0x00, 0x01, 0xc6, 0x53, 0x01, 0x87,
-  0x23, 0x06, 0x03, 0x39, 0x32, 0x30, 0x33, 0x00,
-  0x01, 0x01, 0x01, 0x01, 0xc6, 0x55, 0x01, 0x87,
-  0x11, 0x06, 0x83, 0x00, 0x01, 0x87, 0x10, 0x06,
-  0xaa, 0x01, 0x87, 0x07, 0x06, 0x03, 0x4d, 0x59,
-  0x20, 0x49, 0x53, 0x50, 0x20, 0x43, 0x53, 0x44,
-  0x00, 0x01, 0x87, 0x08, 0x06, 0x03, 0x2b, 0x33,
-  0x35, 0x38, 0x30, 0x38, 0x31, 0x32, 0x34, 0x30,
-  0x30, 0x32, 0x00, 0x01, 0x87, 0x09, 0x06, 0x87,
-  0x01, 0x87, 0x0a, 0x06, 0x90, 0x01, 0xc6, 0x5a,
-  0x01, 0x87, 0x0c, 0x06, 0x9a, 0x01, 0x87, 0x0d,
-  0x06, 0x03, 0x77, 0x77, 0x77, 0x6d, 0x6d, 0x6d,
-  0x75, 0x73, 0x65, 0x72, 0x00, 0x01, 0x87, 0x0e,
-  0x06, 0x03, 0x77, 0x77, 0x77, 0x6d, 0x6d, 0x6d,
-  0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x00, 0x01,
-  0x01, 0xc6, 0x54, 0x01, 0x87, 0x12, 0x06, 0x03,
-  0x32, 0x32, 0x38, 0x00, 0x01, 0x87, 0x13, 0x06,
-  0x03, 0x30, 0x30, 0x31, 0x00, 0x01, 0x01, 0x01,
+  0x52, 0x4e, 0x45, 0x54, 0x00, 0x01,
+  //       <parm name="TO-NAPID" value="NAP1"/>
+  0x87, 0x22, 0x06, 0x83, 0x00, 0x01,
+  //       <characteristic type="PORT">
+  0xc6, 0x53, 0x01,
+  //         <parm name="PORTNBR" value="9203"/>
+  0x87, 0x23, 0x06, 0x03, 0x39, 0x32, 0x30, 0x33,
+  0x00, 0x01,
+  //       </characteristic>
+  0x01,
+  //     </characteristic>
+  0x01,
+  //   </characteristic>
+  0x01,
+  //   <characteristic type="NAPDEF">
+  0xc6, 0x55, 0x01,
+  //     <parm name="NAPID" value="NAP1"/>
+  0x87, 0x11, 0x06, 0x83, 0x00, 0x01,
+  //     <parm name="BEARER" value="GSM-CSD"/>
+  0x87, 0x10, 0x06, 0xaa, 0x01,
+  //     <parm name="NAME" value="MY ISP CSD"/>
+  0x87, 0x07, 0x06, 0x03, 0x4d, 0x59, 0x20, 0x49,
+  0x53, 0x50, 0x20, 0x43, 0x53, 0x44, 0x00, 0x01,
+  //     <parm name="NAP-ADDRESS" value="+35808124002"/>
+  0x87, 0x08, 0x06, 0x03, 0x2b, 0x33, 0x35, 0x38,
+  0x30, 0x38, 0x31, 0x32, 0x34, 0x30, 0x30, 0x32,
+  0x00, 0x01,
+  //     <parm name="NAP-ADDRTYPE" value="E164"/>
+  0x87, 0x09, 0x06, 0x87, 0x01,
+  //     <parm name="CALLTYPE" value="ANALOG-MODEM"/>
+  0x87, 0x0a, 0x06, 0x90, 0x01,
+  //     <characteristic type="NAPAUTHINFO">
+  0xc6, 0x5a, 0x01,
+  //       <parm name="AUTHTYPE" value="PAP"/>
+  0x87, 0x0c, 0x06, 0x9a, 0x01,
+  //       <parm name="AUTHNAME" value="wwwmmmuser"/>
+  0x87, 0x0d, 0x06, 0x03, 0x77, 0x77, 0x77, 0x6d,
+  0x6d, 0x6d, 0x75, 0x73, 0x65, 0x72, 0x00, 0x01,
+  //       <parm name="AUTHSECRET" value="wwwmmmsecret"/>
+  0x87, 0x0e, 0x06, 0x03, 0x77, 0x77, 0x77, 0x6d,
+  0x6d, 0x6d, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74,
+  0x00, 0x01,
+  //     </characteristic>
+  0x01,
+  //     <characteristic type="VALIDITY">
+  0xc6, 0x54, 0x01,
+  //       <parm name="COUNTRY" value="228"/>
+  0x87, 0x12, 0x06, 0x03, 0x32, 0x32, 0x38, 0x00,
+  0x01,
+  //       <parm name="NETWORK" value="001"/>
+  0x87, 0x13, 0x06, 0x03, 0x30, 0x30, 0x31, 0x00,
+  0x01,
+  //     </characteristic>
+  0x01,
+  //   </characteristic>
+  0x01,
+  // </wap-provisioningdoc>
   0x01
 ]);
 
 /*
  * Test data from CHT CP, with code page change
  */
 let wbxml_code_page_data_array = new Uint8Array([
   0x03, 0x0B, 0x6A, 0x00, 0x45, 0xC6, 0x56, 0x01,