LayoutTests/http/tests/xmlhttprequest/readystatechange-and-abort.html - Issue 60203010: XHR.abort(): no event dispatching in completed/non-started states.

Unified Diff: LayoutTests/http/tests/xmlhttprequest/readystatechange-and-abort.html

Issue 60203010: XHR.abort(): no event dispatching in completed/non-started states. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 7 years, 1 month 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 | « LayoutTests/http/tests/xmlhttprequest/onloadend-event-after-sync-requests-expected.txt ('k') | LayoutTests/http/tests/xmlhttprequest/readystatechange-and-abort-expected.txt » ('j') | LayoutTests/http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: LayoutTests/http/tests/xmlhttprequest/readystatechange-and-abort.html

diff --git a/LayoutTests/http/tests/xmlhttprequest/readystatechange-and-abort.html b/LayoutTests/http/tests/xmlhttprequest/readystatechange-and-abort.html

index 1047c2afbcd2c40124b511b453dc99d85c67f9d6..812ef3d13eb46d591642486d11b5c4d160a1fde0 100644

--- a/LayoutTests/http/tests/xmlhttprequest/readystatechange-and-abort.html

+++ b/LayoutTests/http/tests/xmlhttprequest/readystatechange-and-abort.html

@@ -4,15 +4,22 @@

+// Interval prepared to wait until deciding if 'abort' has been delivered (or not.)

+var TIME_DELAY_ABORT_DELIVERY = 200;

test(function()

{

var xhr = new XMLHttpRequest;

xhr.onreadystatechange = this.step_func(function() {

assert_unreached("Received readystatechange event unexpectedly: readyState=" + xhr.readyState)

});

+ xhr.onabort = this.step_func(function () {

+ assert_unreached("Unexpected 'abort' event in state UNSENT.");

+ });

xhr.abort();

assert_equals(xhr.readyState, xhr.UNSENT, "xhr.readyState after abort() call");

-}, "Test onreadystatechange invocation when abort()-ed in UNSENT state.");

+}, "Test onreadystatechange + onabort invocation when abort()-ed in UNSENT state.");

test(function()

{

@@ -34,13 +41,17 @@ test(function()

return;

}

});

+ xhr.onabort = this.step_func(function () {

+ assert_unreached("Unexpected 'abort' event in state OPENED.");

+ });

xhr.open("GET", "resources/test.ogv", true);

xhr.abort();

assert_equals(xhr.readyState, xhr.UNSENT, "xhr.readyState after abort() call");

assert_array_equals(seenStates, [xhr.OPENED]);

-}, "Test onreadystatechange invocation when abort()-ed in OPENED state.");

+}, "Test onreadystatechange + onabort invocation when abort()-ed in OPENED state.");

-test(function()

+var abortAfterSendTest = async_test("Test onreadystatechange + onabort invocation when abort()-ed right after calling send().");

+abortAfterSendTest.step(function()

{

var xhr = new XMLHttpRequest;

var seenStates = [];

@@ -60,14 +71,22 @@ test(function()

return;

}

});

+ var abortFired = false;

+ xhr.onabort = function () {

+ abortFired = true;

+ };

xhr.open("GET", "resources/test.ogv", true);

xhr.send();

xhr.abort();

assert_equals(xhr.readyState, xhr.UNSENT, "xhr.readyState after abort() call");

assert_array_equals(seenStates, [xhr.OPENED, xhr.DONE]);

-}, "Test onreadystatechange invocation when abort()-ed right after calling send().");

+ setTimeout(abortAfterSendTest.step_func(function () {

+ assert_true(abortFired, "Expected 'abort' event to have fired in sent request.");

+ abortAfterSendTest.done();

+ }), TIME_DELAY_ABORT_DELIVERY);

+});

-var abortInHeadersReceivedTest = async_test("Test onreadystatechange invocation when abort()-ed in HEADERS_RECEIVED state.");

+var abortInHeadersReceivedTest = async_test("Test onreadystatechange + onabort invocation when abort()-ed in HEADERS_RECEIVED state.");

abortInHeadersReceivedTest.step(function()

{

var xhr = new XMLHttpRequest;

@@ -82,9 +101,14 @@ abortInHeadersReceivedTest.step(function()

case xhr.HEADERS_RECEIVED:

xhr.abort();

- assert_equals(xhr.readyState, xhr.UNSENT, "xhr.readyState after abort() call");

- assert_array_equals(seenStates, [xhr.OPENED, xhr.HEADERS_RECEIVED, xhr.DONE]);

- abortInHeadersReceivedTest.done();

+ abortInHeadersReceivedTest.step(function () {

tyoshino (SeeGerritForStatus) 2013/11/07 13:38:05 step() is unnecessary. we're in step_func. i'll se

+ assert_equals(xhr.readyState, xhr.UNSENT, "xhr.readyState after abort() call");

+ assert_array_equals(seenStates, [xhr.OPENED, xhr.HEADERS_RECEIVED, xhr.DONE]);

+ });

+ setTimeout(abortInHeadersReceivedTest.step_func(function() {

+ assert_true(abortFired, "Expected 'abort' event to have fired in HEADERS_RECEIVED state.");

+ abortInHeadersReceivedTest.done();

+ }), TIME_DELAY_ABORT_DELIVERY);

return;

case xhr.UNSENT:

@@ -94,11 +118,15 @@ abortInHeadersReceivedTest.step(function()

return;

}

});

+ var abortFired = false;

+ xhr.onabort = function () {

+ abortFired = true;

+ };

xhr.open("GET", "resources/test.ogv", true);

xhr.send();

});

-var abortInLoadingTest = async_test("Test onreadystatechange invocation when abort()-ed in LOADING state.");

+var abortInLoadingTest = async_test("Test onreadystatechange + onabort invocation when abort()-ed in LOADING state.");

abortInLoadingTest.step(function()

{

var xhr = new XMLHttpRequest;

@@ -114,9 +142,14 @@ abortInLoadingTest.step(function()

case xhr.LOADING:

xhr.abort();

- assert_equals(xhr.readyState, xhr.UNSENT, "xhr.readyState after abort() call");

- assert_array_equals(seenStates, [xhr.OPENED, xhr.HEADERS_RECEIVED, xhr.LOADING, xhr.DONE]);

- abortInLoadingTest.done();

+ abortInLoadingTest.step(function () {

+ assert_equals(xhr.readyState, xhr.UNSENT, "xhr.readyState after abort() call");

+ assert_array_equals(seenStates, [xhr.OPENED, xhr.HEADERS_RECEIVED, xhr.LOADING, xhr.DONE]);

+ });

+ setTimeout(abortInLoadingTest.step_func(function() {

+ assert_true(abortFired, "Expected 'abort' event to have fired in LOADING state.");

+ abortInLoadingTest.done();

+ }), TIME_DELAY_ABORT_DELIVERY);

return;

case xhr.UNSENT:

@@ -125,11 +158,15 @@ abortInLoadingTest.step(function()

return;

}

});

+ var abortFired = false;

+ xhr.onabort = function () {

+ abortFired = true;

+ };

xhr.open("GET", "resources/test.ogv", true);

xhr.send();

});

-var abortInDoneTest = async_test("Test onreadystatechange invocation when abort()-ed in DONE state.");

+var abortInDoneTest = async_test("Test onreadystatechange + onabort invocation when abort()-ed in DONE state.");

abortInDoneTest.step(function()

{

var xhr = new XMLHttpRequest;

@@ -145,9 +182,14 @@ abortInDoneTest.step(function()

case xhr.DONE:

xhr.abort();

- assert_equals(xhr.readyState, xhr.UNSENT, "xhr.readyState after abort() call");

- assert_array_equals(seenStates, [xhr.OPENED, xhr.HEADERS_RECEIVED, xhr.LOADING, xhr.DONE]);

- abortInDoneTest.done();

+ abortInDoneTest.step(function () {

+ assert_equals(xhr.readyState, xhr.UNSENT, "xhr.readyState after abort() call");

+ assert_array_equals(seenStates, [xhr.OPENED, xhr.HEADERS_RECEIVED, xhr.LOADING, xhr.DONE]);

+ });

+ setTimeout(abortInDoneTest.step_func(function() {

+ abortInDoneTest.done();

+ }), TIME_DELAY_ABORT_DELIVERY);

return;

case xhr.UNSENT:

@@ -156,6 +198,9 @@ abortInDoneTest.step(function()

return;

}

});

+ xhr.onabort = abortInDoneTest.step_func(function () {

+ assert_unreached("abort() should not cause the abort event to fire");

+ });

xhr.open("GET", "resources/test.ogv", true);

xhr.send();

});