third_party/WebKit/LayoutTests/battery-status/multiple-windows-page-visibility.html - Issue 1844033004: Revert of Change the battery-status layout tests to use JS mocks.

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

Issue 1844033004: Revert of 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-windows-expected.txt ('k') | third_party/WebKit/LayoutTests/battery-status/multiple-windows-page-visibility-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-page-visibility.html

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

index 9e25ea165d97302c7f65fc208d70a8b4029d7d84..230f148b4d8c8d6ca48c662b0df24f45d403c1f7 100644

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

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

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

<html>

<body>

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

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

description("Test multiple windows with page visibility.");

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,11 +17,36 @@

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);

var battery;

function batteryStatusSuccess(batteryManager) {

battery = batteryManager;

debug('resolution in window');

- testIfBatteryStatusIsUpToDate(battery);

+ checkBatteryInfo(battery);

battery.addEventListener('levelchange', failAndFinish);

firstWindow = window;

@@ -29,7 +54,7 @@

secondWindow.navigator.getBattery().then(

function(battery2) {

debug('resolution in secondWindow');

- testIfBatteryStatusIsUpToDate(battery2);

+ checkBatteryInfo(battery2);

setTimeout(fireNewMockLevel, 0);

}, batteryStatusFailure);

@@ -50,7 +75,7 @@

}

function onLevelChange() {

- testIfBatteryStatusIsUpToDate(battery);

+ checkBatteryInfo(battery);

battery.removeEventListener('levelchange', onLevelChange);

setTimeout(finishJSTest, 0);

}

@@ -61,10 +86,8 @@

}

debug("first window: page is visible");

-mockBatteryMonitorReady.then(() => {

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

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

-});

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

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

</script>

</body>

</html>