Skip to content

GitLab

T
tangled
Commit 0b4f7fef authored by Ken Rockot's avatar Ken Rockot Committed by Chromium LUCI CQ
Browse files
Options

Move Battery Status API tests to wpt_internal 

Minimal set of changes needed to move these tests to WPT. This is in
preparation to have them load JS modules.

Bug: 1004256
Change-Id: I34445236a11c7dffc39ef1ffbe2540566a7dddfa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2639070
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: default avatarTim Volodine <timvolodine@chromium.org>
Cr-Commit-Position: refs/heads/master@{#846425}
parent 40530f34
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 36 deletions
third_party/blink/web_tests/battery-status/api-defined.html → third_party/blink/web_tests/wpt_internal/battery-status/api-defined.html
View file @ 0b4f7fef
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<body> <body>
<script src="../resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> <script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/services/device/public/mojom/battery_monitor.mojom.js"></script> <script src="/gen/services/device/public/mojom/battery_monitor.mojom.js"></script>
<script src="resources/mock-battery-monitor.js"></script> <script src="resources/mock-battery-monitor.js"></script>
<script> <script>
promise_test(async _ => { promise_test(async _ => {
......
third_party/blink/web_tests/battery-status/detached-no-crash.html → third_party/blink/web_tests/wpt_internal/battery-status/detached-no-crash.html
View file @ 0b4f7fef
<!DOCTYPE HTML> <!DOCTYPE HTML>
<body> <body>
<head> <head>
<script src="../resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
</head> </head>
<script> <script>
function waitForMessage(data) { function waitForMessage(data) {
...@@ -17,7 +17,7 @@ function waitForMessage(data) { ...@@ -17,7 +17,7 @@ function waitForMessage(data) {
} }
promise_test(async _ => { promise_test(async _ => {
const w = window.open('../resources/window-postmessage-open-close.html'); const w = window.open('resources/window-postmessage-open-close.html');
await waitForMessage('opened'); await waitForMessage('opened');
const nav = w.navigator; const nav = w.navigator;
......
third_party/blink/web_tests/battery-status/multiple-promises-after-resolve.html → third_party/blink/web_tests/wpt_internal/battery-status/multiple-promises-after-resolve.html
View file @ 0b4f7fef
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<body> <body>
<script src="../resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> <script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/services/device/public/mojom/battery_monitor.mojom.js"></script> <script src="/gen/services/device/public/mojom/battery_monitor.mojom.js"></script>
<script src="resources/mock-battery-monitor.js"></script> <script src="resources/mock-battery-monitor.js"></script>
<script> <script>
promise_test(async _ => { promise_test(async _ => {
......
third_party/blink/web_tests/battery-status/multiple-promises.html → third_party/blink/web_tests/wpt_internal/battery-status/multiple-promises.html
View file @ 0b4f7fef
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<body> <body>
<script src="../resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> <script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/services/device/public/mojom/battery_monitor.mojom.js"></script> <script src="/gen/services/device/public/mojom/battery_monitor.mojom.js"></script>
<script src="resources/mock-battery-monitor.js"></script> <script src="resources/mock-battery-monitor.js"></script>
<script> <script>
promise_test(async _ => { promise_test(async _ => {
......
third_party/blink/web_tests/battery-status/no-gc-with-eventlisteners.html → third_party/blink/web_tests/wpt_internal/battery-status/no-gc-with-eventlisteners.html
View file @ 0b4f7fef
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<body> <body>
<script src="../resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> <script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/services/device/public/mojom/battery_monitor.mojom.js"></script> <script src="/gen/services/device/public/mojom/battery_monitor.mojom.js"></script>
<script src="resources/mock-battery-monitor.js"></script> <script src="resources/mock-battery-monitor.js"></script>
<script> <script>
promise_test(async _ => { promise_test(async _ => {
......
third_party/blink/web_tests/battery-status/no-gc-with-pending-promise.html → third_party/blink/web_tests/wpt_internal/battery-status/no-gc-with-pending-promise.html
View file @ 0b4f7fef
<!DOCTYPE html> <!DOCTYPE html>
<script src="../resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script> <script>
promise_test(async () => { promise_test(async () => {
let batteryManagerPromise = navigator.getBattery(); let batteryManagerPromise = navigator.getBattery();
......
third_party/blink/web_tests/battery-status/no-leak-on-detached-use.html → third_party/blink/web_tests/wpt_internal/battery-status/no-leak-on-detached-use.html
View file @ 0b4f7fef
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<script src="../resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
</head> </head>
<body> <body>
<script> <script>
......
third_party/blink/web_tests/battery-status/page-visibility.html → third_party/blink/web_tests/wpt_internal/battery-status/page-visibility.html
View file @ 0b4f7fef
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<body> <body>
<script src="../resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="../resources/visibility.js"></script> <script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> <script src="/gen/services/device/public/mojom/battery_monitor.mojom.js"></script>
<script src="file:///gen/services/device/public/mojom/battery_monitor.mojom.js"></script>
<script src="resources/mock-battery-monitor.js"></script> <script src="resources/mock-battery-monitor.js"></script>
<script> <script>
function setMainWindowHidden(hidden) {
return new Promise(resolve => {
document.addEventListener('visibilitychange', resolve, {once: true});
testRunner.setMainWindowHidden(hidden);
});
}
promise_test(async _ => { promise_test(async _ => {
setAndFireMockBatteryInfo(false, 10, 20, 0.5); setAndFireMockBatteryInfo(false, 10, 20, 0.5);
const battery = await navigator.getBattery(); const battery = await navigator.getBattery();
......
third_party/blink/web_tests/battery-status/promise-with-eventlisteners.html → third_party/blink/web_tests/wpt_internal/battery-status/promise-with-eventlisteners.html
View file @ 0b4f7fef
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<body> <body>
<script src="../resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> <script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/services/device/public/mojom/battery_monitor.mojom.js"></script> <script src="/gen/services/device/public/mojom/battery_monitor.mojom.js"></script>
<script src="resources/mock-battery-monitor.js"></script> <script src="resources/mock-battery-monitor.js"></script>
<script> <script>
function nextEvent(target, name) { function nextEvent(target, name) {
......
third_party/blink/web_tests/wpt_internal/battery-status/resources/window-postmessage-open-close.html 0 → 100644
View file @ 0b4f7fef
<!DOCTYPE html>
<!-- Used when testing access of a closed/detached window's properties -->
<html>
<body onunload="opener.postMessage('closed', '*');">
<script>
opener.postMessage("opened", "*");
</script>
</body>
</html>
third_party/blink/web_tests/battery-status/restricted-level-precision.html → third_party/blink/web_tests/wpt_internal/battery-status/restricted-level-precision.html
View file @ 0b4f7fef
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<body> <body>
<script src="../resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script> <script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/services/device/public/mojom/battery_monitor.mojom.js"></script> <script src="/gen/services/device/public/mojom/battery_monitor.mojom.js"></script>
<script src="resources/mock-battery-monitor.js"></script> <script src="resources/mock-battery-monitor.js"></script>
<script> <script>
promise_test(async _ => { promise_test(async _ => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment