| Index: third_party/WebKit/LayoutTests/battery-status/page-visibility.html
|
| diff --git a/third_party/WebKit/LayoutTests/battery-status/page-visibility.html b/third_party/WebKit/LayoutTests/battery-status/page-visibility.html
|
| index 028a42bcf2feb6d97e16d4d1acba87b989aabb1d..1895bb020b23467977430cd29f2cdddd70f9c274 100644
|
| --- a/third_party/WebKit/LayoutTests/battery-status/page-visibility.html
|
| +++ b/third_party/WebKit/LayoutTests/battery-status/page-visibility.html
|
| @@ -2,6 +2,8 @@
|
| <html>
|
| <body>
|
| <script src="../resources/js-test.js"></script>
|
| +<script src="../resources/mojo-helpers.js"></script>
|
| +<script src="resources/mock-battery-monitor.js"></script>
|
| <script>
|
| description("Test with page visibility.");
|
|
|
| @@ -15,31 +17,6 @@ gc();
|
| jsTestIsAsync = true;
|
| testRunner.waitUntilDone();
|
|
|
| -var mockBatteryInfo;
|
| -function setAndFireMockBatteryInfo(charging, chargingTime, dischargingTime, level) {
|
| - mockBatteryInfo = { charging: charging,
|
| - chargingTime: chargingTime,
|
| - dischargingTime: dischargingTime,
|
| - level: level };
|
| - window.internals.updateBatteryStatus(charging, chargingTime, dischargingTime, level);
|
| -}
|
| -
|
| -// compare obtained battery values with the mock values
|
| -function checkBatteryInfo(batteryManager) {
|
| - batteryInfo = batteryManager;
|
| - shouldBeDefined("batteryInfo");
|
| - shouldBeDefined("mockBatteryInfo");
|
| - shouldBe('batteryInfo.charging', 'mockBatteryInfo.charging');
|
| - shouldBe('batteryInfo.chargingTime', 'mockBatteryInfo.chargingTime');
|
| - shouldBe('batteryInfo.dischargingTime', 'mockBatteryInfo.dischargingTime');
|
| - shouldBe('batteryInfo.level', 'mockBatteryInfo.level');
|
| -}
|
| -
|
| -function batteryStatusFailure() {
|
| - testFailed('failed to successfully resolve the promise');
|
| - setTimeout(cleanupAndFinish, 0);
|
| -}
|
| -
|
| var battery;
|
| function batteryStatusSuccess(batteryManager) {
|
| battery = batteryManager;
|
| @@ -75,8 +52,10 @@ function failAndFinish() {
|
| }
|
|
|
| debug("page is visible");
|
| -navigator.getBattery().then(batteryStatusSuccess, batteryStatusFailure);
|
| -setAndFireMockBatteryInfo(false, 10, 20, 0.5);
|
| +ready.then(() => {
|
| + navigator.getBattery().then(batteryStatusSuccess, batteryStatusFailure);
|
| + setAndFireMockBatteryInfo(false, 10, 20, 0.5);
|
| +});
|
| </script>
|
| </body>
|
| </html>
|
|
|
Chromium Code Reviews
Issue 1836203002:
Change the battery-status layout tests to use JS mocks. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master