Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Unified Diff: third_party/WebKit/Source/platform/loader/fetch/RawResourceTest.cpp

Issue 2584423002: Loading: move core/fetch to platform/loader/fetch (Closed)
Patch Set: another try Created 3 years, 11 months 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
Index: third_party/WebKit/Source/platform/loader/fetch/RawResourceTest.cpp
diff --git a/third_party/WebKit/Source/core/fetch/RawResourceTest.cpp b/third_party/WebKit/Source/platform/loader/fetch/RawResourceTest.cpp
similarity index 93%
rename from third_party/WebKit/Source/core/fetch/RawResourceTest.cpp
rename to third_party/WebKit/Source/platform/loader/fetch/RawResourceTest.cpp
index acc22a82e4bd44f72c5a3a69abd8ce99a373dff2..992f7ea246bf0aa74be1592064a8dcbe5d305479 100644
--- a/third_party/WebKit/Source/core/fetch/RawResourceTest.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/RawResourceTest.cpp
@@ -28,13 +28,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "core/fetch/RawResource.h"
+#include "platform/loader/fetch/RawResource.h"
-#include "core/fetch/MemoryCache.h"
-#include "core/fetch/ResourceFetcher.h"
#include "platform/SharedBuffer.h"
#include "platform/heap/Handle.h"
+#include "platform/loader/fetch/MemoryCache.h"
+#include "platform/loader/fetch/ResourceFetcher.h"
#include "platform/network/ResourceTimingInfo.h"
+#include "platform/testing/TestingPlatformSupport.h"
#include "platform/testing/UnitTestHelpers.h"
#include "public/platform/Platform.h"
#include "public/platform/WebScheduler.h"
@@ -50,6 +51,19 @@ using ::testing::InSequence;
using ::testing::_;
using Checkpoint = ::testing::StrictMock<::testing::MockFunction<void(int)>>;
+class RawResourceTest : public ::testing::Test {
+ public:
+ RawResourceTest() {}
+ ~RawResourceTest() override {}
+
+ protected:
+ ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
+ m_platform;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(RawResourceTest);
+};
+
class MockRawResourceClient
: public GarbageCollectedFinalized<MockRawResourceClient>,
public RawResourceClient {
@@ -93,7 +107,7 @@ class MockRawResourceClient
MockRawResourceClient() = default;
};
-TEST(RawResourceTest, DontIgnoreAcceptForCacheReuse) {
+TEST_F(RawResourceTest, DontIgnoreAcceptForCacheReuse) {
ResourceRequest jpegRequest;
jpegRequest.setHTTPAccept("image/jpeg");
@@ -178,7 +192,7 @@ class AddingClient final : public GarbageCollectedFinalized<AddingClient>,
Member<Resource> m_resource;
};
-TEST(RawResourceTest, RevalidationSucceeded) {
+TEST_F(RawResourceTest, RevalidationSucceeded) {
Resource* resource =
RawResource::create(ResourceRequest("data:text/html,"), Resource::Raw);
ResourceResponse response;
@@ -211,7 +225,7 @@ TEST(RawResourceTest, RevalidationSucceeded) {
EXPECT_EQ("abcd", String(client->data().data(), client->data().size()));
}
-TEST(RawResourceTest, RevalidationSucceededForResourceWithoutBody) {
+TEST_F(RawResourceTest, RevalidationSucceededForResourceWithoutBody) {
Resource* resource =
RawResource::create(ResourceRequest("data:text/html,"), Resource::Raw);
ResourceResponse response;
@@ -242,7 +256,7 @@ TEST(RawResourceTest, RevalidationSucceededForResourceWithoutBody) {
EXPECT_EQ(0u, client->data().size());
}
-TEST(RawResourceTest, RevalidationSucceededUpdateHeaders) {
+TEST_F(RawResourceTest, RevalidationSucceededUpdateHeaders) {
Resource* resource =
RawResource::create(ResourceRequest("data:text/html,"), Resource::Raw);
ResourceResponse response;
@@ -315,7 +329,7 @@ TEST(RawResourceTest, RevalidationSucceededUpdateHeaders) {
EXPECT_EQ(0u, client->data().size());
}
-TEST(RawResourceTest, RedirectDuringRevalidation) {
+TEST_F(RawResourceTest, RedirectDuringRevalidation) {
Resource* resource = RawResource::create(
ResourceRequest("https://example.com/1"), Resource::Raw);
ResourceResponse response;
@@ -385,8 +399,8 @@ TEST(RawResourceTest, RedirectDuringRevalidation) {
resource->addClient(client2);
// Because RawResourceClient is added asynchronously,
- // |runPendingTasks()| is called to make |client2| to be notified.
- testing::runPendingTasks();
+ // |runUntilIdle()| is called to make |client2| to be notified.
+ m_platform->runUntilIdle();
EXPECT_TRUE(client2->called());
EXPECT_EQ(1, client2->numberOfRedirectsReceived());
@@ -399,7 +413,7 @@ TEST(RawResourceTest, RedirectDuringRevalidation) {
EXPECT_FALSE(resource->isAlive());
}
-TEST(RawResourceTest, AddClientDuringCallback) {
+TEST_F(RawResourceTest, AddClientDuringCallback) {
Resource* raw =
RawResource::create(ResourceRequest("data:text/html,"), Resource::Raw);
@@ -414,7 +428,7 @@ TEST(RawResourceTest, AddClientDuringCallback) {
Persistent<AddingClient> addingClient =
new AddingClient(dummyClient.get(), raw);
raw->addClient(addingClient);
- testing::runPendingTasks();
+ m_platform->runUntilIdle();
raw->removeClient(addingClient);
EXPECT_FALSE(dummyClient->called());
EXPECT_FALSE(raw->isAlive());
@@ -445,7 +459,7 @@ class RemovingClient : public GarbageCollectedFinalized<RemovingClient>,
Member<DummyClient> m_dummyClient;
};
-TEST(RawResourceTest, RemoveClientDuringCallback) {
+TEST_F(RawResourceTest, RemoveClientDuringCallback) {
Resource* raw =
RawResource::create(ResourceRequest("data:text/html,"), Resource::Raw);
@@ -461,7 +475,7 @@ TEST(RawResourceTest, RemoveClientDuringCallback) {
new RemovingClient(dummyClient.get());
raw->addClient(dummyClient);
raw->addClient(removingClient);
- testing::runPendingTasks();
+ m_platform->runUntilIdle();
EXPECT_FALSE(raw->isAlive());
}
@@ -469,7 +483,7 @@ TEST(RawResourceTest, RemoveClientDuringCallback) {
// ResourceCallback. When revalidation is started after ResourceCallback is
// scheduled and before it is dispatched, ResourceClient's callbacks should be
// called appropriately.
-TEST(RawResourceTest, StartFailedRevalidationWhileResourceCallback) {
+TEST_F(RawResourceTest, StartFailedRevalidationWhileResourceCallback) {
KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
ResourceResponse response;
@@ -505,7 +519,7 @@ TEST(RawResourceTest, StartFailedRevalidationWhileResourceCallback) {
EXPECT_TRUE(resource->isCacheValidator());
// Make the ResourceCallback to be dispatched.
- testing::runPendingTasks();
+ m_platform->runUntilIdle();
checkpoint.Call(1);
@@ -513,7 +527,7 @@ TEST(RawResourceTest, StartFailedRevalidationWhileResourceCallback) {
resource->appendData("newData", 8);
}
-TEST(RawResourceTest, StartSuccessfulRevalidationWhileResourceCallback) {
+TEST_F(RawResourceTest, StartSuccessfulRevalidationWhileResourceCallback) {
KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
ResourceResponse response;
@@ -549,14 +563,15 @@ TEST(RawResourceTest, StartSuccessfulRevalidationWhileResourceCallback) {
EXPECT_TRUE(resource->isCacheValidator());
// Make the ResourceCallback to be dispatched.
- testing::runPendingTasks();
+ m_platform->runUntilIdle();
checkpoint.Call(1);
resource->responseReceived(newResponse, nullptr);
}
-TEST(RawResourceTest, CanReuseDevToolsEmulateNetworkConditionsClientIdHeader) {
+TEST_F(RawResourceTest,
+ CanReuseDevToolsEmulateNetworkConditionsClientIdHeader) {
ResourceRequest request("data:text/html,");
request.setHTTPHeaderField(
HTTPNames::X_DevTools_Emulate_Network_Conditions_Client_Id, "Foo");

Powered by Google App Engine
This is Rietveld 408576698