Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "modules/fetch/FetchFormDataConsumerHandle.h" | 5 #include "modules/fetch/FetchFormDataConsumerHandle.h" |
| 6 | 6 |
| 7 #include "core/dom/DOMTypedArray.h" | 7 #include "core/dom/DOMTypedArray.h" |
| 8 #include "core/html/FormData.h" | 8 #include "core/html/FormData.h" |
| 9 #include "core/loader/ThreadableLoader.h" | 9 #include "core/loader/MockThreadableLoader.h" |
| 10 #include "core/loader/ThreadableLoaderClient.h" | 10 #include "core/loader/ThreadableLoaderClient.h" |
| 11 #include "core/testing/DummyPageHolder.h" | 11 #include "core/testing/DummyPageHolder.h" |
| 12 #include "modules/fetch/DataConsumerHandleTestUtil.h" | 12 #include "modules/fetch/DataConsumerHandleTestUtil.h" |
| 13 #include "platform/network/ResourceResponse.h" | 13 #include "platform/network/ResourceResponse.h" |
| 14 #include "platform/testing/UnitTestHelpers.h" | 14 #include "platform/testing/UnitTestHelpers.h" |
| 15 #include "platform/weborigin/KURL.h" | 15 #include "platform/weborigin/KURL.h" |
| 16 #include "testing/gmock/include/gmock/gmock.h" | |
| 16 #include "testing/gtest/include/gtest/gtest.h" | 17 #include "testing/gtest/include/gtest/gtest.h" |
| 17 #include "wtf/PassRefPtr.h" | 18 #include "wtf/PassRefPtr.h" |
| 18 #include "wtf/RefPtr.h" | 19 #include "wtf/RefPtr.h" |
| 19 #include "wtf/Vector.h" | 20 #include "wtf/Vector.h" |
| 20 #include "wtf/text/TextEncoding.h" | 21 #include "wtf/text/TextEncoding.h" |
| 21 #include "wtf/text/WTFString.h" | 22 #include "wtf/text/WTFString.h" |
| 22 #include <string.h> | 23 #include <string.h> |
| 23 | 24 |
| 24 namespace blink { | 25 namespace blink { |
| 25 namespace { | 26 namespace { |
| 26 | 27 |
| 27 using Result = WebDataConsumerHandle::Result; | 28 using Result = WebDataConsumerHandle::Result; |
| 28 const Result kOk = WebDataConsumerHandle::Ok; | 29 const Result kOk = WebDataConsumerHandle::Ok; |
| 29 const Result kDone = WebDataConsumerHandle::Done; | 30 const Result kDone = WebDataConsumerHandle::Done; |
| 30 const Result kShouldWait = WebDataConsumerHandle::ShouldWait; | 31 const Result kShouldWait = WebDataConsumerHandle::ShouldWait; |
| 31 const WebDataConsumerHandle::Flags kNone = WebDataConsumerHandle::FlagNone; | 32 const WebDataConsumerHandle::Flags kNone = WebDataConsumerHandle::FlagNone; |
| 32 using HandleReader = DataConsumerHandleTestUtil::HandleReader; | 33 using HandleReader = DataConsumerHandleTestUtil::HandleReader; |
| 33 using HandleTwoPhaseReader = DataConsumerHandleTestUtil::HandleTwoPhaseReader; | 34 using HandleTwoPhaseReader = DataConsumerHandleTestUtil::HandleTwoPhaseReader; |
| 34 using HandleReadResult = DataConsumerHandleTestUtil::HandleReadResult; | 35 using HandleReadResult = DataConsumerHandleTestUtil::HandleReadResult; |
| 35 template <typename T> | 36 template <typename T> |
| 36 using HandleReaderRunner = DataConsumerHandleTestUtil::HandleReaderRunner<T>; | 37 using HandleReaderRunner = DataConsumerHandleTestUtil::HandleReaderRunner<T>; |
| 37 using ReplayingHandle = DataConsumerHandleTestUtil::ReplayingHandle; | 38 using ReplayingHandle = DataConsumerHandleTestUtil::ReplayingHandle; |
| 38 using Command = DataConsumerHandleTestUtil::Command; | 39 using Command = DataConsumerHandleTestUtil::Command; |
| 39 | 40 |
| 40 String toString(const Vector<char>& data) | 41 String toString(const Vector<char>& data) |
| 41 { | 42 { |
| 42 return String(data.data(), data.size()); | 43 return String(data.data(), data.size()); |
| 43 } | 44 } |
| 44 | 45 |
| 45 class NoopLoader final : public ThreadableLoader { | |
| 46 public: | |
| 47 static PassRefPtr<ThreadableLoader> create() { return adoptRef(new NoopLoade r); } | |
| 48 void overrideTimeout(unsigned long) override {} | |
| 49 void cancel() override {} | |
| 50 }; | |
| 51 | |
| 52 class LoaderFactory : public FetchBlobDataConsumerHandle::LoaderFactory { | 46 class LoaderFactory : public FetchBlobDataConsumerHandle::LoaderFactory { |
| 53 public: | 47 public: |
| 54 explicit LoaderFactory(PassOwnPtr<WebDataConsumerHandle> handle) : m_handle( handle) {} | 48 explicit LoaderFactory(PassOwnPtr<WebDataConsumerHandle> handle) : m_handle( handle) {} |
| 55 PassRefPtr<ThreadableLoader> create(ExecutionContext&, ThreadableLoaderClien t* client, const ResourceRequest&, const ThreadableLoaderOptions&, const Resourc eLoaderOptions&) override | 49 PassRefPtr<ThreadableLoader> create(ExecutionContext&, ThreadableLoaderClien t* client, const ResourceRequest&, const ThreadableLoaderOptions&, const Resourc eLoaderOptions&) override |
| 56 { | 50 { |
| 57 RefPtr<ThreadableLoader> loader = NoopLoader::create(); | 51 RefPtr<MockThreadableLoader> loader = MockThreadableLoader::create(); |
| 58 client->didReceiveResponse(0, ResourceResponse(), m_handle.release()); | 52 client->didReceiveResponse(0, ResourceResponse(), m_handle.release()); |
| 53 EXPECT_CALL(*loader, cancel()).Times(1); | |
|
hiroshige
2016/02/05 05:42:09
nit: perhaps it would be better to place EXPECT_CA
tyoshino (SeeGerritForStatus)
2016/02/05 07:22:10
I see. Fixed
| |
| 59 return loader.release(); | 54 return loader.release(); |
| 60 } | 55 } |
| 61 | 56 |
| 62 private: | 57 private: |
| 63 OwnPtr<WebDataConsumerHandle> m_handle; | 58 OwnPtr<WebDataConsumerHandle> m_handle; |
| 64 }; | 59 }; |
| 65 | 60 |
| 66 class FetchFormDataConsumerHandleTest : public ::testing::Test { | 61 class FetchFormDataConsumerHandleTest : public ::testing::Test { |
| 67 public: | 62 public: |
| 68 FetchFormDataConsumerHandleTest() : m_page(DummyPageHolder::create(IntSize(1 , 1))) {} | 63 FetchFormDataConsumerHandleTest() : m_page(DummyPageHolder::create(IntSize(1 , 1))) {} |
| (...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 428 EXPECT_EQ(kShouldWait, reader->beginRead(&buffer, kNone, &available)); | 423 EXPECT_EQ(kShouldWait, reader->beginRead(&buffer, kNone, &available)); |
| 429 testing::runPendingTasks(); | 424 testing::runPendingTasks(); |
| 430 EXPECT_EQ(kOk, reader->beginRead(&buffer, kNone, &available)); | 425 EXPECT_EQ(kOk, reader->beginRead(&buffer, kNone, &available)); |
| 431 EXPECT_FALSE(reader->drainAsFormData()); | 426 EXPECT_FALSE(reader->drainAsFormData()); |
| 432 reader->endRead(0); | 427 reader->endRead(0); |
| 433 EXPECT_FALSE(reader->drainAsFormData()); | 428 EXPECT_FALSE(reader->drainAsFormData()); |
| 434 } | 429 } |
| 435 | 430 |
| 436 } // namespace | 431 } // namespace |
| 437 } // namespace blink | 432 } // namespace blink |
| OLD | NEW |