third_party/WebKit/Source/core/fetch/RawResourceTest.cpp - Issue 2324103002: Cleanup EXPECT/ASSERTs in unit tests in core/fetch and core/loader

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/fetch/RawResourceTest.cpp

Issue 2324103002: Cleanup EXPECT/ASSERTs in unit tests in core/fetch and core/loader (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: EXPECT Created 4 years, 3 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

« no previous file with comments | « third_party/WebKit/Source/core/fetch/MemoryCacheTest.cpp ('k') | third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/RawResourceTest.cpp

diff --git a/third_party/WebKit/Source/core/fetch/RawResourceTest.cpp b/third_party/WebKit/Source/core/fetch/RawResourceTest.cpp

index 26ac26643ac87e812fce90a9e2cb9de9b7bcba8c..bd233a640256039f2349318284815ca6029b4a8e 100644

--- a/third_party/WebKit/Source/core/fetch/RawResourceTest.cpp

+++ b/third_party/WebKit/Source/core/fetch/RawResourceTest.cpp

@@ -54,7 +54,7 @@ TEST(RawResourceTest, DontIgnoreAcceptForCacheReuse)

ResourceRequest pngRequest;

pngRequest.setHTTPAccept("image/png");

- ASSERT_FALSE(jpegResource->canReuse(pngRequest));

+ EXPECT_FALSE(jpegResource->canReuse(pngRequest));

}

class DummyClient final : public GarbageCollectedFinalized<DummyClient>, public RawResourceClient {

@@ -156,7 +156,7 @@ TEST(RawResourceTest, RevalidationSucceeded)

EXPECT_FALSE(resource->isCacheValidator());

EXPECT_EQ(200, resource->response().httpStatusCode());

EXPECT_EQ(4u, resource->resourceBuffer()->size());

- EXPECT_EQ(memoryCache()->resourceForURL(KURL(ParsedURLString, "data:text/html,")), resource);

+ EXPECT_EQ(resource, memoryCache()->resourceForURL(KURL(ParsedURLString, "data:text/html,")));

memoryCache()->remove(resource);

resource->removeClient(client);

@@ -185,8 +185,8 @@ TEST(RawResourceTest, RevalidationSucceededForResourceWithoutBody)

resource->responseReceived(revalidatingResponse, nullptr);

EXPECT_FALSE(resource->isCacheValidator());

EXPECT_EQ(200, resource->response().httpStatusCode());

- EXPECT_EQ(nullptr, resource->resourceBuffer());

- EXPECT_EQ(memoryCache()->resourceForURL(KURL(ParsedURLString, "data:text/html,")), resource);

+ EXPECT_FALSE(resource->resourceBuffer());

+ EXPECT_EQ(resource, memoryCache()->resourceForURL(KURL(ParsedURLString, "data:text/html,")));

memoryCache()->remove(resource);

resource->removeClient(client);

@@ -308,7 +308,7 @@ TEST(RawResourceTest, RedirectDuringRevalidation)

EXPECT_FALSE(resource->isCacheValidator());

EXPECT_EQ(200, resource->response().httpStatusCode());

EXPECT_EQ(3u, resource->resourceBuffer()->size());

- EXPECT_EQ(memoryCache()->resourceForURL(KURL(ParsedURLString, "https://example.com/1")), resource);

+ EXPECT_EQ(resource, memoryCache()->resourceForURL(KURL(ParsedURLString, "https://example.com/1")));

EXPECT_TRUE(client->called());

EXPECT_EQ(1, client->numberOfRedirectsReceived());