Reflect recent spec changes to V8 Extra ReadableStream impl

third_party/WebKit/Source/core/streams/ReadableStreamOperationsTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/streams/ReadableStreamOperations.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptFunction.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/ScriptValue.h"
@@ skipping 168 matching lines @@
 TEST_F(ReadableStreamOperationsTest, IsReadableStream)
 {
     EXPECT_FALSE(ReadableStreamOperations::isReadableStream(getScriptState(), ScriptValue(getScriptState(), v8::Undefined(isolate()))));
     EXPECT_FALSE(ReadableStreamOperations::isReadableStream(getScriptState(), ScriptValue::createNull(getScriptState())));
     EXPECT_FALSE(ReadableStreamOperations::isReadableStream(getScriptState(), ScriptValue(getScriptState(), v8::Object::New(isolate()))));
     ScriptValue stream = evalWithPrintingError("new ReadableStream()");
     EXPECT_FALSE(stream.isEmpty());
     EXPECT_TRUE(ReadableStreamOperations::isReadableStream(getScriptState(), stream));
 }
 
-TEST_F(ReadableStreamOperationsTest, IsReadableStreamReaderInvalid)
+TEST_F(ReadableStreamOperationsTest, IsReadableStreamDefaultReaderInvalid)
 {
-    EXPECT_FALSE(ReadableStreamOperations::isReadableStreamReader(getScriptState(), ScriptValue(getScriptState(), v8::Undefined(isolate()))));
-    EXPECT_FALSE(ReadableStreamOperations::isReadableStreamReader(getScriptState(), ScriptValue::createNull(getScriptState())));
-    EXPECT_FALSE(ReadableStreamOperations::isReadableStreamReader(getScriptState(), ScriptValue(getScriptState(), v8::Object::New(isolate()))));
+    EXPECT_FALSE(ReadableStreamOperations::isReadableStreamDefaultReader(getScriptState(), ScriptValue(getScriptState(), v8::Undefined(isolate()))));
+    EXPECT_FALSE(ReadableStreamOperations::isReadableStreamDefaultReader(getScriptState(), ScriptValue::createNull(getScriptState())));
+    EXPECT_FALSE(ReadableStreamOperations::isReadableStreamDefaultReader(getScriptState(), ScriptValue(getScriptState(), v8::Object::New(isolate()))));
     ScriptValue stream = evalWithPrintingError("new ReadableStream()");
     EXPECT_FALSE(stream.isEmpty());
 
-    EXPECT_FALSE(ReadableStreamOperations::isReadableStreamReader(getScriptState(), stream));
+    EXPECT_FALSE(ReadableStreamOperations::isReadableStreamDefaultReader(getScriptState(), stream));
 }
 
 TEST_F(ReadableStreamOperationsTest, GetReader)
 {
     ScriptValue stream = evalWithPrintingError("new ReadableStream()");
     EXPECT_FALSE(stream.isEmpty());
 
     EXPECT_FALSE(ReadableStreamOperations::isLocked(getScriptState(), stream));
     ScriptValue reader;
     {
         TrackExceptionState es;
         reader = ReadableStreamOperations::getReader(getScriptState(), stream, es);
         ASSERT_FALSE(es.hadException());
     }
     EXPECT_TRUE(ReadableStreamOperations::isLocked(getScriptState(), stream));
     ASSERT_FALSE(reader.isEmpty());
 
     EXPECT_FALSE(ReadableStreamOperations::isReadableStream(getScriptState(), reader));
-    EXPECT_TRUE(ReadableStreamOperations::isReadableStreamReader(getScriptState(), reader));
+    EXPECT_TRUE(ReadableStreamOperations::isReadableStreamDefaultReader(getScriptState(), reader));
 
     // Already locked!
     {
         TrackExceptionState es;
         reader = ReadableStreamOperations::getReader(getScriptState(), stream, es);
         ASSERT_TRUE(es.hadException());
     }
     ASSERT_TRUE(reader.isEmpty());
 }
 
 TEST_F(ReadableStreamOperationsTest, IsDisturbed)
 {
     ScriptValue stream = evalWithPrintingError("stream = new ReadableStream()");
     EXPECT_FALSE(stream.isEmpty());
 
     EXPECT_FALSE(ReadableStreamOperations::isDisturbed(getScriptState(), stream));
 
     ASSERT_FALSE(evalWithPrintingError("stream.cancel()").isEmpty());
 
     EXPECT_TRUE(ReadableStreamOperations::isDisturbed(getScriptState(), stream));
 }
 
 TEST_F(ReadableStreamOperationsTest, Read)
 {
     ScriptValue reader = evalWithPrintingError(
         "var controller;"
         "function start(c) { controller = c; }"
         "new ReadableStream({start}).getReader()");
     EXPECT_FALSE(reader.isEmpty());
-    ASSERT_TRUE(ReadableStreamOperations::isReadableStreamReader(getScriptState(), reader));
+    ASSERT_TRUE(ReadableStreamOperations::isReadableStreamDefaultReader(getScriptState(), reader));
 
     Iteration* it1 = new Iteration();
     Iteration* it2 = new Iteration();
-    ReadableStreamOperations::read(getScriptState(), reader).then(
+    ReadableStreamOperations::defaultReaderRead(getScriptState(), reader).then(
         Function::createFunction(getScriptState(), it1),
         NotReached::createFunction(getScriptState()));
-    ReadableStreamOperations::read(getScriptState(), reader).then(
+    ReadableStreamOperations::defaultReaderRead(getScriptState(), reader).then(
         Function::createFunction(getScriptState(), it2),
         NotReached::createFunction(getScriptState()));
 
     v8::MicrotasksScope::PerformCheckpoint(isolate());
     EXPECT_FALSE(it1->isSet());
     EXPECT_FALSE(it2->isSet());
 
     ASSERT_FALSE(evalWithPrintingError("controller.enqueue('hello')").isEmpty());
     v8::MicrotasksScope::PerformCheckpoint(isolate());
     EXPECT_TRUE(it1->isSet());
@@ skipping 35 matching lines @@
     {
         TrackExceptionState es;
         reader = ReadableStreamOperations::getReader(getScriptState(), stream, es);
         ASSERT_FALSE(es.hadException());
     }
     ASSERT_FALSE(reader.isEmpty());
 
     Iteration* it1 = new Iteration();
     Iteration* it2 = new Iteration();
     Iteration* it3 = new Iteration();
-    ReadableStreamOperations::read(getScriptState(), reader).then(Function::createFunction(getScriptState(), it1), NotReached::createFunction(getScriptState()));
-    ReadableStreamOperations::read(getScriptState(), reader).then(Function::createFunction(getScriptState(), it2), NotReached::createFunction(getScriptState()));
-    ReadableStreamOperations::read(getScriptState(), reader).then(Function::createFunction(getScriptState(), it3), NotReached::createFunction(getScriptState()));
+    ReadableStreamOperations::defaultReaderRead(getScriptState(), reader).then(Function::createFunction(getScriptState(), it1), NotReached::createFunction(getScriptState()));
+    ReadableStreamOperations::defaultReaderRead(getScriptState(), reader).then(Function::createFunction(getScriptState(), it2), NotReached::createFunction(getScriptState()));
+    ReadableStreamOperations::defaultReaderRead(getScriptState(), reader).then(Function::createFunction(getScriptState(), it3), NotReached::createFunction(getScriptState()));
 
     v8::MicrotasksScope::PerformCheckpoint(isolate());
 
     EXPECT_EQ(10, underlyingSource->desiredSize());
 
     EXPECT_TRUE(it1->isSet());
     EXPECT_TRUE(it1->isValid());
     EXPECT_FALSE(it1->isDone());
     EXPECT_EQ("a", it1->value());
 
@@ skipping 75 matching lines @@
     ASSERT_FALSE(errored.isEmpty());
 
     EXPECT_FALSE(ReadableStreamOperations::isErrored(getScriptState(), readable));
     EXPECT_FALSE(ReadableStreamOperations::isErrored(getScriptState(), closed));
     EXPECT_TRUE(ReadableStreamOperations::isErrored(getScriptState(), errored));
 }
 
 } // namespace
 
 } // namespace blink
-