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

Unified Diff: third_party/WebKit/LayoutTests/battery-status/promise-with-eventlisteners.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/page-visibility-expected.txt ('k') | third_party/WebKit/LayoutTests/battery-status/promise-with-eventlisteners-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/battery-status/promise-with-eventlisteners.html

diff --git a/third_party/WebKit/LayoutTests/battery-status/promise-with-eventlisteners.html b/third_party/WebKit/LayoutTests/battery-status/promise-with-eventlisteners.html

index b2f77161054e001fb561ade668effa888bb549b6..196cbf395e8a7ca019b026bbd1af8f57ecafe324 100644

--- a/third_party/WebKit/LayoutTests/battery-status/promise-with-eventlisteners.html

+++ b/third_party/WebKit/LayoutTests/battery-status/promise-with-eventlisteners.html

@@ -2,44 +2,24 @@

<html>

<body>

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

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

description("Test promise resolution and event listeners callbacks.");

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

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

var battery;

function batteryStatusSuccess(batteryManager) {

debug('batteryStatusSuccess invoked');

battery = batteryManager;

- checkBatteryInfo(battery);

+ testIfBatteryStatusIsUpToDate(battery);

battery.addEventListener('chargingchange', onChargingChange);

battery.addEventListener('dischargingtimechange', onDischargingTimeChange);

@@ -61,7 +41,7 @@ var levelChanged = 0;

function onChargingChange() {

debug('chargingchange invoked');

if (this !== battery) { testFailed('this !== battery'); }

- checkBatteryInfo(this);

+ testIfBatteryStatusIsUpToDate(this);

chargingChanged++;

finishIfReady();

}

@@ -69,7 +49,7 @@ function onChargingChange() {

function onChargingTimeChange() {

debug('chargingtimechange invoked');

if (this !== battery) { testFailed('this !== battery'); }

- checkBatteryInfo(this);

+ testIfBatteryStatusIsUpToDate(this);

chargingTimeChanged++;

finishIfReady();

}

@@ -77,7 +57,7 @@ function onChargingTimeChange() {

function onDischargingTimeChange() {

debug('dischargingtimechange invoked');

if (this !== battery) { testFailed('this !== battery'); }

- checkBatteryInfo(this);

+ testIfBatteryStatusIsUpToDate(this);

dischargingTimeChanged++;

finishIfReady();

}

@@ -85,7 +65,7 @@ function onDischargingTimeChange() {

function onLevelChange() {

debug('levelchange invoked');

if (this !== battery) { testFailed('this !== battery'); }

- checkBatteryInfo(this);

+ testIfBatteryStatusIsUpToDate(this);

levelChanged++;

finishIfReady();

}

@@ -100,13 +80,10 @@ function finishIfReady() {

}

-function batteryStatusFailure() {

- testFailed('failed to successfully resolve the promise');

- setTimeout(finishJSTest, 0);

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