| OLD | NEW | 
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> | 
| 2 <script src="../resources/testharness.js"></script> | 2 <script src="../resources/testharness.js"></script> | 
| 3 <script src="../resources/testharnessreport.js"></script> | 3 <script src="../resources/testharnessreport.js"></script> | 
| 4 <script src="resources/bluetooth-helpers.js"></script> | 4 <script src="resources/bluetooth-helpers.js"></script> | 
| 5 <script> | 5 <script> | 
| 6 'use strict'; | 6 'use strict'; | 
| 7 | 7 | 
| 8 test(t => { assert_true(window.testRunner instanceof Object); t.done(); }, | 8 test(t => { assert_true(window.testRunner instanceof Object); t.done(); }, | 
| 9      'window.testRunner is required for the following tests.'); | 9      'window.testRunner is required for the following tests.'); | 
| 10 // Tests that we are handling values returned from the underlying platform | 10 // Tests that we are handling values returned from the underlying platform | 
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 58   rssi: 0, | 58   rssi: 0, | 
| 59   expected_rssi: 0 | 59   expected_rssi: 0 | 
| 60 }, { | 60 }, { | 
| 61   name: 'RSSI too high must result in nulled rssi.', | 61   name: 'RSSI too high must result in nulled rssi.', | 
| 62   tx_power: 0, | 62   tx_power: 0, | 
| 63   expected_tx_power: 0, | 63   expected_tx_power: 0, | 
| 64   rssi: 127, | 64   rssi: 127, | 
| 65   expected_rssi: null | 65   expected_rssi: null | 
| 66 }].forEach(power_test => { | 66 }].forEach(power_test => { | 
| 67   promise_test(() => { | 67   promise_test(() => { | 
| 68     testRunner.setBluetoothMockDataSet('PowerValueAdapter:' + | 68     return setBluetoothFakeAdapter('PowerValueAdapter:' + | 
| 69                                        power_test.tx_power +  ':' + | 69                                    power_test.tx_power +  ':' + | 
| 70                                        power_test.rssi); | 70                                    power_test.rssi) | 
| 71     return requestDeviceWithKeyDown({filters: [{services: ['heart_rate']}]}) | 71       .then(() => requestDeviceWithKeyDown({ | 
|  | 72         filters: [{services: ['heart_rate']}]})) | 
| 72       .then(device => { | 73       .then(device => { | 
| 73         let adv_data = device.adData; | 74         let adv_data = device.adData; | 
| 74         assert_equals(adv_data.txPower, power_test.expected_tx_power); | 75         assert_equals(adv_data.txPower, power_test.expected_tx_power); | 
| 75         assert_equals(adv_data.rssi, power_test.expected_rssi); | 76         assert_equals(adv_data.rssi, power_test.expected_rssi); | 
| 76       }); | 77       }); | 
| 77   }, power_test.name); | 78   }, power_test.name); | 
| 78 }); | 79 }); | 
| 79 | 80 | 
| 80 // Tests for all platforms. | 81 // Tests for all platforms. | 
| 81 [{ | 82 [{ | 
| 82   name: 'TxPower not present, RSSI not present.', | 83   name: 'TxPower not present, RSSI not present.', | 
| 83   tx_power_present: false, | 84   tx_power_present: false, | 
| 84   rssi_present: false | 85   rssi_present: false | 
| 85 }, { | 86 }, { | 
| 86   name: 'TxPower not present, RSSI present.', | 87   name: 'TxPower not present, RSSI present.', | 
| 87   tx_power_present: false, | 88   tx_power_present: false, | 
| 88   rssi_present: true | 89   rssi_present: true | 
| 89 }, { | 90 }, { | 
| 90   name: 'TxPower present, RSSI not present.', | 91   name: 'TxPower present, RSSI not present.', | 
| 91   tx_power_present: true, | 92   tx_power_present: true, | 
| 92   rssi_present: false, | 93   rssi_present: false, | 
| 93 }, { | 94 }, { | 
| 94   name: 'TxPower present, RSSI present.', | 95   name: 'TxPower present, RSSI present.', | 
| 95   tx_power_present: true, | 96   tx_power_present: true, | 
| 96   rssi_present: true | 97   rssi_present: true | 
| 97 }].forEach(power_test => { | 98 }].forEach(power_test => { | 
| 98   promise_test(() => { | 99   promise_test(() => { | 
| 99     testRunner.setBluetoothMockDataSet('PowerPresenceAdapter:' + | 100     return setBluetoothFakeAdapter('PowerPresenceAdapter:' + | 
| 100                                        power_test.tx_power_present + ':' + | 101                                    power_test.tx_power_present + ':' + | 
| 101                                        power_test.rssi_present); | 102                                    power_test.rssi_present) | 
| 102     return requestDeviceWithKeyDown({filters: [{services: ['heart_rate']}]}) | 103       .then(() => requestDeviceWithKeyDown({ | 
|  | 104         filters: [{services: ['heart_rate']}]})) | 
| 103       .then(device => { | 105       .then(device => { | 
| 104         let adv_data = device.adData; | 106         let adv_data = device.adData; | 
| 105         let expected_tx_power = power_test.tx_power_present ? | 107         let expected_tx_power = power_test.tx_power_present ? | 
| 106                               -10 /* broadcasting at 0.1mW */ | 108                               -10 /* broadcasting at 0.1mW */ | 
| 107                               : null; | 109                               : null; | 
| 108         let expected_rssi = power_test.rssi_present ? | 110         let expected_rssi = power_test.rssi_present ? | 
| 109                           -51 /* power at 1m from device broadcasting at 0.1mW *
     / | 111                           -51 /* power at 1m from device broadcasting at 0.1mW *
     / | 
| 110                           : null; | 112                           : null; | 
| 111         assert_equals(adv_data.txPower, expected_tx_power); | 113         assert_equals(adv_data.txPower, expected_tx_power); | 
| 112         assert_equals(adv_data.rssi, expected_rssi); | 114         assert_equals(adv_data.rssi, expected_rssi); | 
| 113       }); | 115       }); | 
| 114   }, power_test.name) | 116   }, power_test.name) | 
| 115 }); | 117 }); | 
| 116 </script> | 118 </script> | 
| OLD | NEW | 
|---|