third_party/WebKit/LayoutTests/battery-status/multiple-windows.html - Issue 1836203002: Change the battery-status layout tests to use JS mocks.

Unified Diff: third_party/WebKit/LayoutTests/battery-status/multiple-windows.html

Issue 1836203002: Change the battery-status layout tests to use JS mocks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/battery-status/multiple-promises-expected.txt ('k') | third_party/WebKit/LayoutTests/battery-status/multiple-windows-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/battery-status/multiple-windows.html

diff --git a/third_party/WebKit/LayoutTests/battery-status/multiple-windows.html b/third_party/WebKit/LayoutTests/battery-status/multiple-windows.html

index 46a3e66cf1a3386b7e0942c191a32efa05262bd0..8c94af28c676321ae8e1e3cc6fd3a275e9c69b25 100644

--- a/third_party/WebKit/LayoutTests/battery-status/multiple-windows.html

+++ b/third_party/WebKit/LayoutTests/battery-status/multiple-windows.html

@@ -2,13 +2,13 @@

<html>

<body>

+<script src="../resources/mojo-helpers.js"></script>

+<script src="resources/mock-battery-monitor.js"></script>

description("Test battery status API with multiple windows.");

if (!window.testRunner)

debug('This test cannot be run without the TestRunner');

-if (!window.internals)

- debug('This test cannot be run without the window.internals');

// Clean-up any unused battery manager objects from previous tests.

gc();

@@ -17,46 +17,23 @@ testRunner.waitUntilDone();

testRunner.setCanOpenWindows();

testRunner.setCloseRemainingWindowsWhenComplete(true);

-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(finishJSTest, 0);

function batteryStatusSuccess(battery) {

debug('resolution in window');

- checkBatteryInfo(battery);

+ testIfBatteryStatusIsUpToDate(battery);

secondWindow = window.open("");

secondWindow.navigator.getBattery().then(

function(battery2) {

debug('resolution in secondWindow');

- checkBatteryInfo(battery2);

+ testIfBatteryStatusIsUpToDate(battery2);

setTimeout(finishJSTest, 0);

}, batteryStatusFailure);

}

-navigator.getBattery().then(batteryStatusSuccess, batteryStatusFailure);

-setAndFireMockBatteryInfo(false, 10, 20, 0.5);

+mockBatteryMonitorReady.then(() => {

+ navigator.getBattery().then(batteryStatusSuccess, batteryStatusFailure);

+ setAndFireMockBatteryInfo(false, 10, 20, 0.5);

+});

</script>

</body>

</html>