Index: third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp |
diff --git a/third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp b/third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp |
index 7448071a77343e4b304e96e07206c7e56d4881ba..798eeea08dea5ac9ba5adeba4b6f59a316b4ee86 100644 |
--- a/third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp |
+++ b/third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp |
@@ -181,8 +181,8 @@ TEST_F(ReadableStreamReaderTest, Release) |
EXPECT_TRUE(onRejected.isNull()); |
isolate()->RunMicrotasks(); |
- EXPECT_EQ("undefined", onFulfilled); |
- EXPECT_TRUE(onRejected.isNull()); |
+ EXPECT_TRUE(onFulfilled.isNull()); |
+ EXPECT_EQ("AbortError: the reader is already released", onRejected); |
ReadableStreamReader* another = new ReadableStreamReader(executionContext(), m_stream); |
EXPECT_TRUE(another->isActive()); |
@@ -211,10 +211,8 @@ TEST_F(ReadableStreamReaderTest, ReadAfterRelease) |
EXPECT_TRUE(onRejected.isNull()); |
isolate()->RunMicrotasks(); |
- EXPECT_TRUE(result.isSet); |
- EXPECT_TRUE(result.isDone); |
- EXPECT_EQ("undefined", result.valueString); |
- EXPECT_TRUE(onRejected.isNull()); |
+ EXPECT_FALSE(result.isSet); |
+ EXPECT_EQ("TypeError: the reader is already released", onRejected); |
EXPECT_FALSE(exceptionState.hadException()); |
} |
@@ -328,7 +326,7 @@ TEST_F(ReadableStreamReaderTest, ClosedReader) |
m_stream->close(); |
- EXPECT_FALSE(reader->isActive()); |
+ EXPECT_TRUE(reader->isActive()); |
String onClosedFulfilled, onClosedRejected; |
ReadResult result; |
@@ -360,7 +358,7 @@ TEST_F(ReadableStreamReaderTest, ErroredReader) |
m_stream->error(DOMException::create(SyntaxError, "some error")); |
EXPECT_EQ(ReadableStream::Errored, m_stream->stateInternal()); |
- EXPECT_FALSE(reader->isActive()); |
+ EXPECT_TRUE(reader->isActive()); |
String onClosedFulfilled, onClosedRejected; |
String onReadFulfilled, onReadRejected; |
@@ -470,7 +468,7 @@ TEST_F(ReadableStreamReaderTest, PendingReadsShouldBeResolvedWhenCanceled) |
EXPECT_TRUE(onRejected2.isNull()); |
reader->cancel(scriptState(), ScriptValue(scriptState(), v8::Undefined(isolate()))); |
- EXPECT_FALSE(reader->isActive()); |
+ EXPECT_TRUE(reader->isActive()); |
EXPECT_FALSE(result.isSet); |
EXPECT_TRUE(onRejected.isNull()); |
EXPECT_FALSE(result2.isSet); |
@@ -507,8 +505,8 @@ TEST_F(ReadableStreamReaderTest, CancelShouldNotWorkWhenNotActive) |
isolate()->RunMicrotasks(); |
- EXPECT_EQ("undefined", onFulfilled); |
- EXPECT_TRUE(onRejected.isNull()); |
+ EXPECT_TRUE(onFulfilled.isNull()); |
+ EXPECT_EQ("TypeError: the reader is already released", onRejected); |
EXPECT_EQ(ReadableStream::Readable, m_stream->stateInternal()); |
EXPECT_FALSE(exceptionState.hadException()); |
} |