| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <html> | 2 <html> |
| 3 <body> | 3 <body> |
| 4 <script src="../resources/js-test.js"></script> | 4 <script src="../resources/js-test.js"></script> |
| 5 <script src="../resources/mojo-helpers.js"></script> | 5 <script src="../resources/mojo-helpers.js"></script> |
| 6 <script src="resources/mock-battery-monitor.js"></script> | 6 <script src="resources/mock-battery-monitor.js"></script> |
| 7 <script> | 7 <script> |
| 8 description("Test multiple promise resolution."); | 8 description("Test multiple promise resolution."); |
| 9 | 9 |
| 10 if (!window.testRunner) | 10 if (!window.testRunner) |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 | 28 |
| 29 mockBatteryMonitorReady.then(() => { | 29 mockBatteryMonitorReady.then(() => { |
| 30 promise1 = navigator.getBattery(); | 30 promise1 = navigator.getBattery(); |
| 31 promise1.then( | 31 promise1.then( |
| 32 function(battery) { | 32 function(battery) { |
| 33 debug('first resolution'); | 33 debug('first resolution'); |
| 34 testIfBatteryStatusIsUpToDate(battery); | 34 testIfBatteryStatusIsUpToDate(battery); |
| 35 promise1Count++; | 35 promise1Count++; |
| 36 finishIfReady(); | 36 finishIfReady(); |
| 37 }, batteryStatusFailure); | 37 }, batteryStatusFailure); |
| 38 | 38 gc(); |
| 39 promise2 = navigator.getBattery(); | 39 promise2 = navigator.getBattery(); |
| 40 promise2.then( | 40 promise2.then( |
| 41 function(battery) { | 41 function(battery) { |
| 42 debug('second resolution'); | 42 debug('second resolution'); |
| 43 testIfBatteryStatusIsUpToDate(battery); | 43 testIfBatteryStatusIsUpToDate(battery); |
| 44 promise2Count++; | 44 promise2Count++; |
| 45 finishIfReady(); | 45 finishIfReady(); |
| 46 }, batteryStatusFailure); | 46 }, batteryStatusFailure); |
| 47 gc(); |
| 47 | 48 |
| 48 shouldBeTrue('promise1 === promise2'); | 49 shouldBeTrue('promise1 === promise2'); |
| 49 setAndFireMockBatteryInfo(false, 10, 20, 0.5); | 50 setAndFireMockBatteryInfo(false, 10, 20, 0.5); |
| 50 }); | 51 }); |
| 51 </script> | 52 </script> |
| 52 </body> | 53 </body> |
| 53 </html> | 54 </html> |
| OLD | NEW |