Implement WebDataConsumerHandle::Reader.

content/child/shared_memory_data_consumer_handle_unittest.cc

 // 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 "content/child/shared_memory_data_consumer_handle.h"
 
 #include <string.h>
 #include <string>
 #include <vector>
 
@@ skipping 89 matching lines @@
 
     void didGetReadable() override { operation_->ReadData(); }
 
    private:
     ReadDataOperation* operation_;
   };
 
   class ReadDataOperation final {
    public:
     typedef WebDataConsumerHandle::Result Result;
-    ReadDataOperation(scoped_ptr<WebDataConsumerHandle> handle,
+    ReadDataOperation(scoped_ptr<SharedMemoryDataConsumerHandle> handle,
                       base::MessageLoop* main_message_loop,
                       const base::Closure& on_done)
         : handle_(handle.Pass()),
           main_message_loop_(main_message_loop),
           on_done_(on_done) {}
 
     const std::string& result() const { return result_; }
 
     void ReadData() {
       if (!client_) {
         client_.reset(new ClientImpl(this));
-        handle_->registerClient(client_.get());
+        reader_ = handle_->obtainReaderImpl(client_.get());
       }
 
       Result rv = kOk;
       size_t read_size = 0;
 
       while (true) {
         char buffer[16];
-        rv = handle_->read(&buffer, sizeof(buffer), kNone, &read_size);
+        rv = reader_->read(&buffer, sizeof(buffer), kNone, &read_size);
         if (rv != kOk)
           break;
         result_.insert(result_.size(), &buffer[0], read_size);
       }
 
       if (rv == kShouldWait) {
         // Wait a while...
         return;
       }
 
       if (rv != kDone) {
         // Something is wrong.
         result_ = "error";
       }
 
       // The operation is done.
+      reader_.reset();
       main_message_loop_->PostTask(FROM_HERE, on_done_);
     }
 
    private:
-    scoped_ptr<WebDataConsumerHandle> handle_;
+    scoped_ptr<SharedMemoryDataConsumerHandle> handle_;
+    scoped_ptr<WebDataConsumerHandle::Reader> reader_;
     scoped_ptr<WebDataConsumerHandle::Client> client_;
     base::MessageLoop* main_message_loop_;
     base::Closure on_done_;
     std::string result_;
   };
 
   void SetUp() override {
     handle_.reset(
         new SharedMemoryDataConsumerHandle(kApplyBackpressure, &writer_));
   }
 
   StrictMock<MockClient> client_;
-  scoped_ptr<WebDataConsumerHandle> handle_;
+  scoped_ptr<SharedMemoryDataConsumerHandle> handle_;
   scoped_ptr<Writer> writer_;
   base::MessageLoop loop_;
 };
 
 class SharedMemoryDataConsumerHandleTest
     : public ::testing::TestWithParam<BackpressureMode> {
  protected:
   void SetUp() override {
     handle_.reset(new SharedMemoryDataConsumerHandle(GetParam(), &writer_));
   }
   scoped_ptr<FixedReceivedData> NewFixedData(const char* s) {
     return make_scoped_ptr(new FixedReceivedData(s, strlen(s), strlen(s)));
   }
 
   StrictMock<MockClient> client_;
   scoped_ptr<SharedMemoryDataConsumerHandle> handle_;
   scoped_ptr<Writer> writer_;
   base::MessageLoop loop_;
 };
 
 TEST_P(SharedMemoryDataConsumerHandleTest, ReadFromEmpty) {
   char buffer[4];
   size_t read = 88;
-  Result result = handle_->read(buffer, 4, kNone, &read);
+  auto reader = handle_->obtainReaderImpl(nullptr);
+  Result result = reader->read(buffer, 4, kNone, &read);
 
   EXPECT_EQ(kShouldWait, result);
   EXPECT_EQ(0u, read);
 }
 
 TEST_P(SharedMemoryDataConsumerHandleTest, AutoClose) {
   char buffer[4];
   size_t read = 88;
 
   writer_.reset();
-  Result result = handle_->read(buffer, 4, kNone, &read);
+  auto reader = handle_->obtainReaderImpl(nullptr);
+  Result result = reader->read(buffer, 4, kNone, &read);
 
   EXPECT_EQ(kDone, result);
   EXPECT_EQ(0u, read);
 }
 
 TEST_P(SharedMemoryDataConsumerHandleTest, ReadSimple) {
   writer_->AddData(NewFixedData("hello"));
 
   char buffer[4] = {};
   size_t read = 88;
-  Result result = handle_->read(buffer, 3, kNone, &read);
+  auto reader = handle_->obtainReaderImpl(nullptr);
+  Result result = reader->read(buffer, 3, kNone, &read);
 
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(3u, read);
   EXPECT_STREQ("hel", buffer);
 
-  result = handle_->read(buffer, 3, kNone, &read);
+  result = reader->read(buffer, 3, kNone, &read);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(2u, read);
   EXPECT_STREQ("lol", buffer);
 
-  result = handle_->read(buffer, 3, kNone, &read);
+  result = reader->read(buffer, 3, kNone, &read);
   EXPECT_EQ(kShouldWait, result);
   EXPECT_EQ(0u, read);
 
   writer_->Close();
 
-  result = handle_->read(buffer, 3, kNone, &read);
+  result = reader->read(buffer, 3, kNone, &read);
   EXPECT_EQ(kDone, result);
   EXPECT_EQ(0u, read);
 }
+
+TEST_P(SharedMemoryDataConsumerHandleTest, ReadAfterHandleIsGone) {
+  writer_->AddData(NewFixedData("hello"));
+
+  char buffer[8] = {};
+  size_t read = 88;
+  auto reader = handle_->obtainReaderImpl(nullptr);
+
+  handle_.reset();
+
+  Result result = reader->read(buffer, sizeof(buffer), kNone, &read);
+
+  EXPECT_EQ(kOk, result);
+  EXPECT_EQ(5u, read);
+  EXPECT_STREQ("hello", buffer);
+
+  result = reader->read(buffer, 3, kNone, &read);
+  EXPECT_EQ(kShouldWait, result);
+  EXPECT_EQ(0u, read);
+
+  writer_->Close();
+
+  result = reader->read(buffer, 3, kNone, &read);
+  EXPECT_EQ(kDone, result);
+  EXPECT_EQ(0u, read);
+}
+
+TEST_P(SharedMemoryDataConsumerHandleTest, ReobtainReaderImpl) {
+  writer_->AddData(NewFixedData("hello"));
+
+  char buffer[4] = {};
+  size_t read = 88;
+  auto reader = handle_->obtainReaderImpl(nullptr);
+  Result result = reader->read(buffer, 3, kNone, &read);
+
+  EXPECT_EQ(kOk, result);
+  EXPECT_EQ(3u, read);
+  EXPECT_STREQ("hel", buffer);
+
+  reader.reset();
+  reader = handle_->obtainReaderImpl(nullptr);
+
+  result = reader->read(buffer, 3, kNone, &read);
+  EXPECT_EQ(kOk, result);
+  EXPECT_EQ(2u, read);
+  EXPECT_STREQ("lol", buffer);
+
+  result = reader->read(buffer, 3, kNone, &read);
+  EXPECT_EQ(kShouldWait, result);
+  EXPECT_EQ(0u, read);
+
+  writer_->Close();
+
+  result = reader->read(buffer, 3, kNone, &read);
+  EXPECT_EQ(kDone, result);
+  EXPECT_EQ(0u, read);
+}
 
 TEST_P(SharedMemoryDataConsumerHandleTest, CloseBeforeReading) {
   writer_->AddData(NewFixedData("hello"));
   writer_->Close();
 
   char buffer[20] = {};
   size_t read = 88;
-  Result result = handle_->read(buffer, sizeof(buffer), kNone, &read);
+  auto reader = handle_->obtainReaderImpl(nullptr);
+  Result result = reader->read(buffer, sizeof(buffer), kNone, &read);
 
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(5u, read);
   EXPECT_STREQ("hello", buffer);
 
-  result = handle_->read(buffer, sizeof(buffer), kNone, &read);
+  result = reader->read(buffer, sizeof(buffer), kNone, &read);
   EXPECT_EQ(kDone, result);
   EXPECT_EQ(0u, read);
 }
 
 TEST_P(SharedMemoryDataConsumerHandleTest, AddMultipleData) {
   writer_->AddData(NewFixedData("Once "));
   writer_->AddData(NewFixedData("upon "));
   writer_->AddData(NewFixedData("a "));
   writer_->AddData(NewFixedData("time "));
   writer_->AddData(NewFixedData("there "));
   writer_->AddData(NewFixedData("was "));
   writer_->AddData(NewFixedData("a "));
   writer_->Close();
 
   char buffer[20];
   size_t read;
   Result result;
 
+  auto reader = handle_->obtainReaderImpl(nullptr);
   std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
-  result = handle_->read(buffer, 6, kNone, &read);
+  result = reader->read(buffer, 6, kNone, &read);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(6u, read);
   EXPECT_STREQ("Once u", buffer);
 
   std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
-  result = handle_->read(buffer, 2, kNone, &read);
+  result = reader->read(buffer, 2, kNone, &read);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(2u, read);
   EXPECT_STREQ("po", buffer);
 
   std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
-  result = handle_->read(buffer, 9, kNone, &read);
+  result = reader->read(buffer, 9, kNone, &read);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(9u, read);
   EXPECT_STREQ("n a time ", buffer);
 
   std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
-  result = handle_->read(buffer, 3, kNone, &read);
+  result = reader->read(buffer, 3, kNone, &read);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(3u, read);
   EXPECT_STREQ("the", buffer);
 
   std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
-  result = handle_->read(buffer, 20, kNone, &read);
+  result = reader->read(buffer, 20, kNone, &read);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(9u, read);
   EXPECT_STREQ("re was a ", buffer);
 
-  result = handle_->read(buffer, sizeof(buffer), kNone, &read);
+  result = reader->read(buffer, sizeof(buffer), kNone, &read);
   EXPECT_EQ(kDone, result);
   EXPECT_EQ(0u, read);
 }
 
 TEST_P(SharedMemoryDataConsumerHandleTest, AddMultipleDataInteractively) {
   writer_->AddData(NewFixedData("Once "));
   writer_->AddData(NewFixedData("upon "));
 
   char buffer[20];
   size_t read;
   Result result;
 
+  auto reader = handle_->obtainReaderImpl(nullptr);
   std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
-  result = handle_->read(buffer, 6, kNone, &read);
+  result = reader->read(buffer, 6, kNone, &read);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(6u, read);
   EXPECT_STREQ("Once u", buffer);
 
   std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
-  result = handle_->read(buffer, 2, kNone, &read);
+  result = reader->read(buffer, 2, kNone, &read);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(2u, read);
   EXPECT_STREQ("po", buffer);
 
   std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
-  result = handle_->read(buffer, 9, kNone, &read);
+  result = reader->read(buffer, 9, kNone, &read);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(2u, read);
   EXPECT_STREQ("n ", buffer);
 
   writer_->AddData(NewFixedData("a "));
 
   std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
-  result = handle_->read(buffer, 1, kNone, &read);
+  result = reader->read(buffer, 1, kNone, &read);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(1u, read);
   EXPECT_STREQ("a", buffer);
 
   writer_->AddData(NewFixedData("time "));
   writer_->AddData(NewFixedData("there "));
   writer_->AddData(NewFixedData("was "));
   writer_->AddData(NewFixedData("a "));
   writer_->Close();
 
   std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
-  result = handle_->read(buffer, 9, kNone, &read);
+  result = reader->read(buffer, 9, kNone, &read);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(9u, read);
   EXPECT_STREQ(" time the", buffer);
 
   std::fill(&buffer[0], &buffer[arraysize(buffer)], 0);
-  result = handle_->read(buffer, 20, kNone, &read);
+  result = reader->read(buffer, 20, kNone, &read);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(9u, read);
   EXPECT_STREQ("re was a ", buffer);
 
-  result = handle_->read(buffer, sizeof(buffer), kNone, &read);
+  result = reader->read(buffer, sizeof(buffer), kNone, &read);
   EXPECT_EQ(kDone, result);
   EXPECT_EQ(0u, read);
 }
 
 TEST_P(SharedMemoryDataConsumerHandleTest, RegisterClient) {
   Checkpoint checkpoint;
 
   InSequence s;
   EXPECT_CALL(checkpoint, Call(0));
   EXPECT_CALL(checkpoint, Call(1));
   EXPECT_CALL(client_, didGetReadable());
   EXPECT_CALL(checkpoint, Call(2));
 
   checkpoint.Call(0);
-  handle_->registerClient(&client_);
+  auto reader = handle_->obtainReaderImpl(&client_);
   checkpoint.Call(1);
   writer_->Close();
   checkpoint.Call(2);
 }
 
 TEST_P(SharedMemoryDataConsumerHandleTest, RegisterClientWhenDataExists) {
   Checkpoint checkpoint;
 
   InSequence s;
   EXPECT_CALL(checkpoint, Call(0));
   EXPECT_CALL(checkpoint, Call(1));
-  EXPECT_CALL(client_, didGetReadable());
   EXPECT_CALL(checkpoint, Call(2));

[hiroshige, 2015/06/12 10:12:09]

It would be better to test that didGetReadable() is called (or, add TODO).

[yhirano, 2015/06/15 10:23:22]

Done.

 
   checkpoint.Call(0);
   writer_->AddData(NewFixedData("Once "));
   checkpoint.Call(1);
-  handle_->registerClient(&client_);
+  auto reader = handle_->obtainReaderImpl(&client_);
   checkpoint.Call(2);
 }
 
 TEST_P(SharedMemoryDataConsumerHandleTest, AddDataWhenClientIsRegistered) {
   Checkpoint checkpoint;
   char buffer[20];
   Result result;
   size_t size;
 
   InSequence s;
   EXPECT_CALL(checkpoint, Call(0));
   EXPECT_CALL(checkpoint, Call(1));
   EXPECT_CALL(client_, didGetReadable());
   EXPECT_CALL(checkpoint, Call(2));
   EXPECT_CALL(checkpoint, Call(3));
   EXPECT_CALL(checkpoint, Call(4));
   EXPECT_CALL(client_, didGetReadable());
   EXPECT_CALL(checkpoint, Call(5));
 
   checkpoint.Call(0);
-  handle_->registerClient(&client_);
+  auto reader = handle_->obtainReaderImpl(&client_);
   checkpoint.Call(1);
   writer_->AddData(NewFixedData("Once "));
   checkpoint.Call(2);
   writer_->AddData(NewFixedData("upon "));
   checkpoint.Call(3);
-  result = handle_->read(buffer, sizeof(buffer), kNone, &size);
+  result = reader->read(buffer, sizeof(buffer), kNone, &size);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(10u, size);
   checkpoint.Call(4);
   writer_->AddData(NewFixedData("a "));
   checkpoint.Call(5);
 }
 
 TEST_P(SharedMemoryDataConsumerHandleTest, CloseWithClientAndData) {
   Checkpoint checkpoint;
 
   InSequence s;
   EXPECT_CALL(checkpoint, Call(0));
   EXPECT_CALL(checkpoint, Call(1));
   EXPECT_CALL(client_, didGetReadable());
   EXPECT_CALL(checkpoint, Call(2));
   EXPECT_CALL(checkpoint, Call(3));
 
   checkpoint.Call(0);
-  handle_->registerClient(&client_);
+  auto reader = handle_->obtainReaderImpl(&client_);
   checkpoint.Call(1);
   writer_->AddData(NewFixedData("Once "));
   checkpoint.Call(2);
   writer_->Close();
   checkpoint.Call(3);
 }
 
-TEST_P(SharedMemoryDataConsumerHandleTest, UnregisterClient) {
+TEST_P(SharedMemoryDataConsumerHandleTest, ReleaseReader) {
   Checkpoint checkpoint;
 
   InSequence s;
   EXPECT_CALL(checkpoint, Call(0));
   EXPECT_CALL(checkpoint, Call(1));
   EXPECT_CALL(checkpoint, Call(2));
 
   checkpoint.Call(0);
-  handle_->registerClient(&client_);
+  auto reader = handle_->obtainReaderImpl(&client_);
   checkpoint.Call(1);
-  handle_->unregisterClient();
+  reader.reset();
   writer_->AddData(NewFixedData("Once "));
   checkpoint.Call(2);
 }
 
 TEST_P(SharedMemoryDataConsumerHandleTest, TwoPhaseReadShouldWait) {
   Result result;
   const void* buffer = &result;
   size_t size = 99;
 
-  result = handle_->beginRead(&buffer, kNone, &size);
+  auto reader = handle_->obtainReaderImpl(nullptr);
+  result = reader->beginRead(&buffer, kNone, &size);
   EXPECT_EQ(kShouldWait, result);
   EXPECT_EQ(nullptr, buffer);
   EXPECT_EQ(0u, size);
 }
 
 TEST_P(SharedMemoryDataConsumerHandleTest, TwoPhaseReadSimple) {
   writer_->AddData(NewFixedData("Once "));
 
   Result result;
   const void* buffer = &result;
   size_t size = 99;
 
-  result = handle_->beginRead(&buffer, kNone, &size);
+  auto reader = handle_->obtainReaderImpl(nullptr);
+  result = reader->beginRead(&buffer, kNone, &size);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(5u, size);
   EXPECT_EQ("Once ", ToString(buffer, 5));
 
-  handle_->endRead(1);
+  reader->endRead(1);
 
-  result = handle_->beginRead(&buffer, kNone, &size);
+  result = reader->beginRead(&buffer, kNone, &size);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(4u, size);
   EXPECT_EQ("nce ", ToString(buffer, 4));
 
-  handle_->endRead(4);
+  reader->endRead(4);
 
-  result = handle_->beginRead(&buffer, kNone, &size);
+  result = reader->beginRead(&buffer, kNone, &size);
   EXPECT_EQ(kShouldWait, result);
   EXPECT_EQ(0u, size);
   EXPECT_EQ(nullptr, buffer);
 
   writer_->Close();
 
-  result = handle_->beginRead(&buffer, kNone, &size);
+  result = reader->beginRead(&buffer, kNone, &size);
   EXPECT_EQ(kDone, result);
   EXPECT_EQ(0u, size);
   EXPECT_EQ(nullptr, buffer);
 }
 
 TEST_P(SharedMemoryDataConsumerHandleTest, TwoPhaseReadWithMultipleData) {
   writer_->AddData(NewFixedData("Once "));
   writer_->AddData(NewFixedData("upon "));
 
   Result result;
   const void* buffer = &result;
   size_t size = 99;
 
-  result = handle_->beginRead(&buffer, kNone, &size);
+  auto reader = handle_->obtainReaderImpl(nullptr);
+  result = reader->beginRead(&buffer, kNone, &size);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(5u, size);
   EXPECT_EQ("Once ", ToString(buffer, 5));
 
-  handle_->endRead(1);
+  reader->endRead(1);
 
-  result = handle_->beginRead(&buffer, kNone, &size);
+  result = reader->beginRead(&buffer, kNone, &size);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(4u, size);
   EXPECT_EQ("nce ", ToString(buffer, 4));
 
-  handle_->endRead(4);
+  reader->endRead(4);
 
-  result = handle_->beginRead(&buffer, kNone, &size);
+  result = reader->beginRead(&buffer, kNone, &size);
   EXPECT_EQ(kOk, result);
   EXPECT_EQ(5u, size);
   EXPECT_EQ("upon ", ToString(buffer, 5));
 
-  handle_->endRead(5);
+  reader->endRead(5);
 
-  result = handle_->beginRead(&buffer, kNone, &size);
+  result = reader->beginRead(&buffer, kNone, &size);
   EXPECT_EQ(kShouldWait, result);
   EXPECT_EQ(0u, size);
   EXPECT_EQ(nullptr, buffer);
 
   writer_->Close();
 
-  result = handle_->beginRead(&buffer, kNone, &size);
+  result = reader->beginRead(&buffer, kNone, &size);
   EXPECT_EQ(kDone, result);
   EXPECT_EQ(0u, size);
   EXPECT_EQ(nullptr, buffer);
 }
 
 TEST(SharedMemoryDataConsumerHandleBackpressureTest, Read) {
   base::MessageLoop loop;
   char buffer[20];
   Result result;
   size_t size;
@@ skipping 140 matching lines @@
       logger->log());
 }
 
 INSTANTIATE_TEST_CASE_P(SharedMemoryDataConsumerHandleTest,
                         SharedMemoryDataConsumerHandleTest,
                         ::testing::Values(kApplyBackpressure,
                                           kDoNotApplyBackpressure));
 }  // namespace
 
 }  // namespace content