Skip to content

GitLab

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

Move webmidi tests to wpt_internal 

Minimal changes are made here to adapt the webmidi tests to WPT and move
them into wpt_internal.

Bug: 1004256
Change-Id: I78fe61ca5885c9896f63472d2b564eae6ec68951
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2638773
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: default avatarTakashi Toyoshima <toyoshim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845277}
parent d7048e08
Show whitespace changes
Inline Side-by-side
Showing with 142 additions and 89 deletions
third_party/blink/web_tests/SmokeTests
View file @ dc38b14b
......@@ -986,5 +986,5 @@ webaudio/WaveShaper/waveshaper-364379.html
webexposed/internal-properties-should-not-be-exposed.html
webexposed/permissions-attribute.html
webexposed/web-animations-api.html
webmidi/permission.html
wpt_internal/geolocation-api/enabled.html
wpt_internal/webmidi/permission.html
third_party/blink/web_tests/TestExpectations
View file @ dc38b14b
......@@ -4481,7 +4481,6 @@ crbug.com/778467 [ Fuchsia ] mhtml/mhtml_in_iframe.html [ Failure ]
# These tests load resources from file:///gen/... .
crbug.com/919639 [ Fuchsia ] fast/speech/scripted/speechrecognition-re-restart.html [ Failure ]
crbug.com/919639 [ Fuchsia ] presentation/presentationconnectionavailableevent-ctor-mock.html [ Failure ]
crbug.com/919639 [ Fuchsia ] webmidi/permission.html [ Failure ]
# These tests timeout when using Scenic ozone platform.
crbug.com/1067477 [ Fuchsia ] fast/media/matchmedium-query-api.html [ Skip ]
......
third_party/blink/web_tests/http/tests/webmidi/midi-default-feature-policy.https.sub.html
View file @ dc38b14b
......@@ -5,7 +5,7 @@
<script src=../resources/feature-policy-permissions-test.js></script>
<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="/gen/media/midi/midi_service.mojom.js"></script>
<script src="mock-midiservice.js"></script>
<script src="/wpt_internal/webmidi/resources/mock-midiservice.js"></script>
<script>
'use strict';
......
third_party/blink/web_tests/webmidi/add-port.html → third_party/blink/web_tests/wpt_internal/webmidi/add-port.https.html
View file @ dc38b14b
<!DOCTYPE html>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../http/tests/resources/permissions-helper.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/media/midi/midi_service.mojom.js"></script>
<script src="../http/tests/webmidi/mock-midiservice.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="/gen/media/midi/midi_service.mojom.js"></script>
<script src="resources/mock-midiservice.js"></script>
<script src="resources/permissions-helper.js"></script>
<script>
async_test(t => {
let noteOn = [ 0x90, 0x45, 0x7f ];
t.step(() => {
Promise.all([
PermissionsHelper.setPermission('midi', 'granted'),
]).then(() => {
setMidiPermission({}, 'granted').then(() => {
return navigator.requestMIDIAccess();
}).then(a => {
var started = false;
......
third_party/blink/web_tests/webmidi/implicit-open.html → third_party/blink/web_tests/wpt_internal/webmidi/implicit-open.https.html
View file @ dc38b14b
<!DOCTYPE html>
<html>
<head>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../http/tests/resources/permissions-helper.js"></script>
<script src="state-check-utils.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/media/midi/midi_service.mojom.js"></script>
<script src="../http/tests/webmidi/mock-midiservice.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="/gen/media/midi/midi_service.mojom.js"></script>
<script src="resources/mock-midiservice.js"></script>
<script src="resources/permissions-helper.js"></script>
<script src="resources/state-check-utils.js"></script>
</head>
<body>
<script>
......@@ -47,7 +47,7 @@ async function checkAccess(access) {
promise_test(async _ => {
// Set default permission behavior that grants non-sysex requests.
await PermissionsHelper.setPermission('midi', 'granted');
await setMidiPermission({}, 'granted');
const access = await navigator.requestMIDIAccess();
await checkAccess(access);
}, 'MIDIPort implicit open');
......
third_party/blink/web_tests/webmidi/loopback-receive.html → third_party/blink/web_tests/wpt_internal/webmidi/loopback-receive.https.html
View file @ dc38b14b
<!DOCTYPE html>
<html>
<head>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../http/tests/resources/permissions-helper.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/media/midi/midi_service.mojom.js"></script>
<script src="../http/tests/webmidi/mock-midiservice.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="/gen/media/midi/midi_service.mojom.js"></script>
<script src="resources/mock-midiservice.js"></script>
<script src="resources/permissions-helper.js"></script>
</head>
<body>
<script>
......@@ -71,8 +71,7 @@ function test(useAddEventListener) {
}
promise_test(async _ => {
await PermissionsHelper.setPermission('midi', 'granted');
await PermissionsHelper.setPermission('midi-sysex', 'granted');
await setMidiPermission({sysex: true}, 'granted');
await test(false);
await test(true);
}, 'midimessage event handling works as expected');
......
third_party/blink/web_tests/webmidi/loopback-with-timestamp.html → third_party/blink/web_tests/wpt_internal/webmidi/loopback-with-timestamp.https.html
View file @ dc38b14b
<!doctype html>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../http/tests/resources/permissions-helper.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/media/midi/midi_service.mojom.js"></script>
<script src="../http/tests/webmidi/mock-midiservice.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="/gen/media/midi/midi_service.mojom.js"></script>
<script src="resources/mock-midiservice.js"></script>
<script src="resources/permissions-helper.js"></script>
<p>Regression test to check if non-zero timestamp works well.</p>
<script>
promise_test(async () => {
await PermissionsHelper.setPermission('midi', 'granted');
await PermissionsHelper.setPermission('midi-sysex', 'granted');
await setMidiPermission({sysex: true}, 'granted');
let access = await navigator.requestMIDIAccess({sysex: true});
let input = access.inputs.values().next().value;
let output = access.outputs.values().next().value;
......
third_party/blink/web_tests/webmidi/open-close.html → third_party/blink/web_tests/wpt_internal/webmidi/open-close.https.html
View file @ dc38b14b
<!DOCTYPE html>
<html>
<head>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../http/tests/resources/permissions-helper.js"></script>
<script src="state-check-utils.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/media/midi/midi_service.mojom.js"></script>
<script src="../http/tests/webmidi/mock-midiservice.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="/gen/media/midi/midi_service.mojom.js"></script>
<script src="resources/mock-midiservice.js"></script>
<script src="resources/permissions-helper.js"></script>
<script src="resources/state-check-utils.js"></script>
</head>
<body>
<script>
......@@ -43,7 +43,7 @@ async function runTests(port) {
promise_test(async _ => {
// Set default permission behavior that grants non-sysex requests.
await PermissionsHelper.setPermission('midi', 'granted');
await setMidiPermission({}, 'granted');
const access = await navigator.requestMIDIAccess();
return runTests(access.inputs.values().next().value);
......
third_party/blink/web_tests/webmidi/permission.html → third_party/blink/web_tests/wpt_internal/webmidi/permission.https.html
View file @ dc38b14b
<!DOCTYPE html>
<html>
<head>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../http/tests/resources/permissions-helper.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/media/midi/midi_service.mojom.js"></script>
<script src="../http/tests/webmidi/mock-midiservice.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="/gen/media/midi/midi_service.mojom.js"></script>
<script src="resources/mock-midiservice.js"></script>
<script src="resources/permissions-helper.js"></script>
</head>
<body>
<script>
promise_test(async _ => {
await PermissionsHelper.setPermission('midi', 'granted');
await PermissionsHelper.setPermission('midi-sysex', 'granted');
await setMidiPermission({sysex: true}, 'granted');
const access = await navigator.requestMIDIAccess({sysex: true});
assert_true(access.sysexEnabled);
}, 'sysex permission grants are properly handled');
promise_test(async t => {
await PermissionsHelper.setPermission('midi', 'granted');
await PermissionsHelper.setPermission('midi-sysex', 'denied');
await setMidiPermission({}, 'granted');
await setMidiPermission({sysex: true}, 'denied');
return promise_rejects_dom(t, 'SecurityError',
navigator.requestMIDIAccess({sysex: true}));
......
third_party/blink/web_tests/webmidi/requestmidiaccess-basic.html → third_party/blink/web_tests/wpt_internal/webmidi/requestmidiaccess-basic.https.html
View file @ dc38b14b
<!DOCTYPE html>
<html>
<head>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
</head>
<body>
<script>
......
third_party/blink/web_tests/webmidi/requestmidiaccess-fail.html → third_party/blink/web_tests/wpt_internal/webmidi/requestmidiaccess-fail.https.html
View file @ dc38b14b
<!DOCTYPE html>
<html>
<head>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../http/tests/resources/permissions-helper.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/media/midi/midi_service.mojom.js"></script>
<script src="../http/tests/webmidi/mock-midiservice.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="/gen/media/midi/midi_service.mojom.js"></script>
<script src="resources/mock-midiservice.js"></script>
<script src="resources/permissions-helper.js"></script>
</head>
<body>
<script>
promise_test(async t => {
await PermissionsHelper.setPermission('midi', 'granted');
await setMidiPermission({}, 'granted');
mockMIDIService.setStartSessionResult(midi.mojom.Result.INITIALIZATION_ERROR);
return promise_rejects_dom(t, 'InvalidStateError',
......
third_party/blink/web_tests/webmidi/requestmidiaccess-in-detached-frame.html → third_party/blink/web_tests/wpt_internal/webmidi/requestmidiaccess-in-detached-frame.https.html
View file @ dc38b14b
<!DOCTYPE html>
<html>
<head>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/media/midi/midi_service.mojom.js"></script>
<script src="../http/tests/webmidi/mock-midiservice.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="/gen/media/midi/midi_service.mojom.js"></script>
<script src="resources/mock-midiservice.js"></script>
</head>
<body>
<script>
......
third_party/blink/web_tests/webmidi/requestmidiaccess-options.html → third_party/blink/web_tests/wpt_internal/webmidi/requestmidiaccess-options.https.html
View file @ dc38b14b
<!DOCTYPE html>
<html>
<head>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../http/tests/resources/permissions-helper.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/media/midi/midi_service.mojom.js"></script>
<script src="../http/tests/webmidi/mock-midiservice.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="/gen/media/midi/midi_service.mojom.js"></script>
<script src="resources/mock-midiservice.js"></script>
<script src="resources/permissions-helper.js"></script>
</head>
<body>
<script>
......@@ -25,8 +25,8 @@ const permissions = [
promise_test(async _ => {
for (const permission of permissions) {
for (const option of options) {
await PermissionsHelper.setPermission('midi', permission.midi);
await PermissionsHelper.setPermission('midi-sysex', permission.sysex);
await setMidiPermission({}, permission.midi);
await setMidiPermission({sysex: true}, permission.sysex);
try {
const access = await navigator.requestMIDIAccess(option);
......
third_party/blink/web_tests/webmidi/requestmidiaccess-upgrade.html → third_party/blink/web_tests/wpt_internal/webmidi/requestmidiaccess-upgrade.https.html
View file @ dc38b14b
<!DOCTYPE html>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../http/tests/resources/permissions-helper.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/media/midi/midi_service.mojom.js"></script>
<script src="../http/tests/webmidi/mock-midiservice.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="/gen/media/midi/midi_service.mojom.js"></script>
<script src="resources/mock-midiservice.js"></script>
<script src="resources/permissions-helper.js"></script>
<script>
promise_test(async () => {
// Obtain the first MIDIAccess instance without a sysex permission.
await PermissionsHelper.setPermission('midi', 'granted');
await setMidiPermission({}, 'granted');
const nosysex_access = await navigator.requestMIDIAccess();
// See if a sysex message can not be sent over the first instance.
......@@ -20,7 +20,7 @@ promise_test(async () => {
});
// Obtain the second MIDIAccess instance with a sysex permission.
await PermissionsHelper.setPermission('midi-sysex', 'granted');
await setMidiPermission({sysex: true}, 'granted');
const sysex_access = await navigator.requestMIDIAccess({sysex: true});
// See if a sysex message can be sent correctly over the second instance.
......
third_party/blink/web_tests/webmidi/requestmidiaccess.html → third_party/blink/web_tests/wpt_internal/webmidi/requestmidiaccess.https.html
View file @ dc38b14b
<!DOCTYPE html>
<html>
<head>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../http/tests/resources/permissions-helper.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/media/midi/midi_service.mojom.js"></script>
<script src="../http/tests/webmidi/mock-midiservice.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="/gen/media/midi/midi_service.mojom.js"></script>
<script src="resources/mock-midiservice.js"></script>
<script src="resources/permissions-helper.js"></script>
</head>
<body>
<script>
......@@ -95,7 +95,7 @@ function checkOutputMap(outputs) {
}
promise_test(async t => {
await PermissionsHelper.setPermission('midi', 'granted');
await setMidiPermission({}, 'granted');
const access = await navigator.requestMIDIAccess();
// Validate the values of the attributes on the access.
......
third_party/blink/web_tests/wpt_internal/webmidi/resources/permissions-helper.js 0 → 100644
View file @ dc38b14b
function setMidiPermission(options, state) {
const sysex = options.sysex ?? false;
return internals.setPermission(
{name: 'midi', sysex: sysex}, state, location.origin, location.origin);
}
third_party/blink/web_tests/webmidi/send-messages.html → third_party/blink/web_tests/wpt_internal/webmidi/send-messages.https.html
View file @ dc38b14b
<!DOCTYPE html>
<html>
<head>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../http/tests/resources/permissions-helper.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/media/midi/midi_service.mojom.js"></script>
<script src="../http/tests/webmidi/mock-midiservice.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="/gen/media/midi/midi_service.mojom.js"></script>
<script src="resources/mock-midiservice.js"></script>
<script src="resources/permissions-helper.js"></script>
</head>
<body>
<script>
promise_test(async _ => {
await PermissionsHelper.setPermission('midi', 'granted');
await PermissionsHelper.setPermission('midi-sysex', 'granted');
await setMidiPermission({sysex: true}, 'granted');
const access = await navigator.requestMIDIAccess({sysex: true});
const output = access.outputs.values().next().value;
......
third_party/blink/web_tests/webmidi/send-system-messages.html → third_party/blink/web_tests/wpt_internal/webmidi/send-system-messages.https.html
View file @ dc38b14b
<!DOCTYPE html>
<html>
<head>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
<script src="../http/tests/resources/permissions-helper.js"></script>
<script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="file:///gen/media/midi/midi_service.mojom.js"></script>
<script src="../http/tests/webmidi/mock-midiservice.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
<script src="/gen/media/midi/midi_service.mojom.js"></script>
<script src="resources/mock-midiservice.js"></script>
<script src="resources/permissions-helper.js"></script>
</head>
<body>
<script>
......@@ -33,7 +33,7 @@ const reservedSystemMessages = [[0xf4], [0xf5]];
const systemExclusiveMessages = [[0xf0, 0xf7], [0xf0, 0x00, 0xf7]];
promise_test(async _ => {
await PermissionsHelper.setPermission('midi', 'granted');
await setMidiPermission({}, 'granted');
const access = await navigator.requestMIDIAccess();
const output = access.outputs.values().next().value;
......
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