| Index: LayoutTests/webmidi/open_close.html
|
| diff --git a/LayoutTests/webmidi/open_close.html b/LayoutTests/webmidi/open_close.html
|
| index 43ca12b69d92292f4441b430a8ec14d305ff8b14..8f6bcb405d0b51b8a41b37dc0e6ae31997a50f1f 100644
|
| --- a/LayoutTests/webmidi/open_close.html
|
| +++ b/LayoutTests/webmidi/open_close.html
|
| @@ -9,28 +9,28 @@ description("Tests MIDIPort.open and MIDIPort.close.");
|
|
|
| function checkStateTransition(options) {
|
| debug("Check state transition for " + options.method + " on " +
|
| - options.initialstate + " state.");
|
| + options.initialconnection + " state.");
|
| debug("- check initial state.");
|
| window.port = options.port;
|
| - shouldBeEqualToString("port.state", options.initialstate);
|
| + shouldBeEqualToString("port.connection", options.initialconnection);
|
| port.onstatechange = function(e) {
|
| debug("- check handler port.");
|
| window.eventport = e.port;
|
| testPassed("handler is called with port " + eventport + ".");
|
| - if (options.initialstate == options.finalstate) {
|
| + if (options.initialconnection == options.finalconnection) {
|
| testFailed("onstatechange handler should not be called here.");
|
| }
|
| shouldBeEqualToString("eventport.id", options.port.id);
|
| - shouldBeEqualToString("eventport.state", options.finalstate);
|
| + shouldBeEqualToString("eventport.connection", options.finalconnection);
|
| };
|
| return port[options.method]().then(function(p) {
|
| window.callbackport = p;
|
| debug("- check callback arguments.");
|
| testPassed("callback is called with port " + callbackport + ".");
|
| shouldBeEqualToString("callbackport.id", options.port.id);
|
| - shouldBeEqualToString("callbackport.state", options.finalstate);
|
| + shouldBeEqualToString("callbackport.connection", options.finalconnection);
|
| debug("- check final state.");
|
| - shouldBeEqualToString("port.state", options.finalstate);
|
| + shouldBeEqualToString("port.connection", options.finalconnection);
|
| }, function(e) {
|
| testFailed("error callback should not be called here.");
|
| throw e;
|
| @@ -41,23 +41,23 @@ function runTests(port) {
|
| return Promise.resolve().then(checkStateTransition.bind(undefined, {
|
| port: port,
|
| method: "close",
|
| - initialstate: "connected",
|
| - finalstate: "connected",
|
| + initialconnection: "closed",
|
| + finalconnection: "closed",
|
| })).then(checkStateTransition.bind(undefined, {
|
| port: port,
|
| method: "open",
|
| - initialstate: "connected",
|
| - finalstate: "opened",
|
| + initialconnection: "closed",
|
| + finalconnection: "open",
|
| })).then(checkStateTransition.bind(undefined, {
|
| port: port,
|
| method: "open",
|
| - initialstate: "opened",
|
| - finalstate: "opened",
|
| + initialconnection: "open",
|
| + finalconnection: "open",
|
| })).then(checkStateTransition.bind(undefined, {
|
| port: port,
|
| method: "close",
|
| - initialstate: "opened",
|
| - finalstate: "connected",
|
| + initialconnection: "open",
|
| + finalconnection: "closed",
|
| }));
|
| }
|
|
|
|
|