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

Unified Diff: third_party/WebKit/LayoutTests/battery-status/multiple-promises.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/api-defined-expected.txt ('k') | third_party/WebKit/LayoutTests/battery-status/multiple-promises-after-resolve.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 68e58003e39e8cb4d0bdb46da998cd138835bdd3..c1770059b8142ff8f78f5585cd1096f1ab9195d4 100644

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

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

@@ -2,45 +2,18 @@

<html>

<body>

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

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

description("Test multiple promise resolution.");

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

-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 promise1Count = 0;

var promise2Count = 0;

@@ -50,26 +23,31 @@ function finishIfReady() {

setTimeout(finishJSTest, 0);

}

-promise1 = navigator.getBattery();

-promise1.then(

- function(battery) {

- debug('first resolution');

- checkBatteryInfo(battery);

- promise1Count++;

- finishIfReady();

- }, batteryStatusFailure);

-promise2 = navigator.getBattery();

-promise2.then(

- function(battery) {

- debug('second resolution');

- checkBatteryInfo(battery);

- promise2Count++;

- finishIfReady();

- }, batteryStatusFailure);

-shouldBeTrue('promise1 === promise2');

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

+var promise1;

+var promise2;

+mockBatteryMonitorReady.then(() => {

+ promise1 = navigator.getBattery();

+ promise1.then(

+ function(battery) {

+ debug('first resolution');

+ testIfBatteryStatusIsUpToDate(battery);

+ promise1Count++;

+ finishIfReady();

+ }, batteryStatusFailure);

+ promise2 = navigator.getBattery();

+ promise2.then(

+ function(battery) {

+ debug('second resolution');

+ testIfBatteryStatusIsUpToDate(battery);

+ promise2Count++;

+ finishIfReady();

+ }, batteryStatusFailure);

+ shouldBeTrue('promise1 === promise2');

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

+});

</script>

</body>

</html>