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

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

Index: third_party/WebKit/LayoutTests/battery-status/api-defined.html

diff --git a/third_party/WebKit/LayoutTests/battery-status/api-defined.html b/third_party/WebKit/LayoutTests/battery-status/api-defined.html

index 3dfb9ae309eb839e17d4f213d2a2c0a9e33e69cf..29343a225bef63fee73841cdf7c183d8b50dad2d 100644

--- a/third_party/WebKit/LayoutTests/battery-status/api-defined.html

+++ b/third_party/WebKit/LayoutTests/battery-status/api-defined.html

@@ -2,28 +2,19 @@

<html>

<body>

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

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

description("Test basic API definitions.");

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

var battery;

function batteryStatusSuccess(batteryManager) {

debug('batteryStatusSuccess invoked');

@@ -36,10 +27,7 @@ function batteryStatusSuccess(batteryManager) {

shouldBeDefined("battery.dischargingTime");

shouldBeDefined("battery.level");

- shouldBe('battery.charging', 'mockBatteryInfo.charging');

- shouldBe('battery.chargingTime', 'mockBatteryInfo.chargingTime');

- shouldBe('battery.dischargingTime', 'mockBatteryInfo.dischargingTime');

- shouldBe('battery.level', 'mockBatteryInfo.level');

+ testIfBatteryStatusIsUpToDate(batteryManager);

shouldBeTrue("typeof battery.onchargingchange == 'object'");

shouldBeTrue("typeof battery.onchargingtimechange == 'object'");

@@ -54,16 +42,14 @@ function batteryStatusSuccess(batteryManager) {

setTimeout(finishJSTest, 0);

}

-function batteryStatusFailure() {

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

- setTimeout(finishJSTest, 0);

-promise = navigator.getBattery();

-shouldBeDefined("promise");

-shouldBeDefined("promise.then");

-promise.then(batteryStatusSuccess, batteryStatusFailure);

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

+var promise;

+mockBatteryMonitorReady.then(() => {

+ promise = navigator.getBattery();

+ shouldBeDefined("promise");

+ shouldBeDefined("promise.then");

+ promise.then(batteryStatusSuccess, batteryStatusFailure);

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

+});

</script>

</body>

</html>