Cleanup EXPECT/ASSERTs in unit tests in core/fetch and core/loader

Cleanup EXPECT/ASSERTs in unit tests in core/fetch and core/loader

- Use EXPECT_.*() where possible instead of ASSERT_.*()
- Use the argument order of EXPECT_EQ(expected, actual)
- Remove unnecessary casts
- Replace EXPECT_EQ/NE(nullptr) with EXPECT_FALSE/TRUE()
- Replace EXPECT_STREQ() with EXPECT_EQ() using WTF::String comparison

BUG=none

Committed: https://crrev.com/9cda388f3c8f935fefff65703b63b61ff77eefac
Cr-Commit-Position: refs/heads/master@{#417550}

[hiroshige, 2016-09-09 07:16:24]

hiroshige@chromium.org changed reviewers:
+ yhirano@chromium.org

[hiroshige, 2016-09-09 07:16:26]

PTAL.

[yhirano, 2016-09-09 07:34:48]

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
File third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp (right):

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp:164:
ASSERT_TRUE(resource->hasVaryHeader());
expect?

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp:194:
ASSERT_TRUE(resource->hasVaryHeader());
ditto

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp:219:
ASSERT_TRUE(resource->hasVaryHeader());
ditto

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp:240:
ASSERT_EQ(m_resource, resource);
expect?

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
File third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp (right):

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp:189:
EXPECT_STREQ(expectedURL.getString().utf8().data(),
fetchRequest.resourceRequest().url().getString().utf8().data());
You can use EXPECT_EQ.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp:207:
EXPECT_STREQ(shouldPrefer ? "1" : "",
You can use EXPECT_EQ.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp:213:
EXPECT_STREQ("1",
fetchRequest.resourceRequest().httpHeaderField(HTTPNames::Upgrade_Insecure_Requests).utf8().data());
ditto

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp:526:
EXPECT_STREQ("on", resourceRequest.httpHeaderField("Save-Data").utf8().data());
You can use EXPECT_EQ.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp:531:
EXPECT_STREQ("on", resourceRequest.httpHeaderField("Save-Data").utf8().data());
ditto.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp:538:
EXPECT_STREQ("", resourceRequest.httpHeaderField("Save-Data").utf8().data());
ditto (or isEmpty is better?)

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
File third_party/WebKit/Source/core/loader/LinkLoaderTest.cpp (right):

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/LinkLoaderTest.cpp:158: EXPECT_NE(nullptr,
preloads);
[optional] EXPECT_TRUE for consistency?

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/LinkLoaderTest.cpp:160: EXPECT_EQ(nullptr,
preloads);
[optional] ditto

[hiroshige, 2016-09-09 08:07:56]

Description was changed from

==========
Cleanup EXPECT/ASSERTs in unit tests in core/fetch and core/loader

- Use EXPECT_.*() where possible instead of ASSERT_.*()
- Use the argument order of EXPECT_EQ(expected, actual)
- Remove unnecessary casts

BUG=none
==========

to

==========
Cleanup EXPECT/ASSERTs in unit tests in core/fetch and core/loader

- Use EXPECT_.*() where possible instead of ASSERT_.*()
- Use the argument order of EXPECT_EQ(expected, actual)
- Remove unnecessary casts
- Replace EXPECT_EQ/NE(nullptr) with EXPECT_FALSE/TRUE()
- Replace EXPECT_STREQ() with EXPECT_EQ() using WTF::String comparison

BUG=none
==========

[hiroshige, 2016-09-09 08:11:36]

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
File third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp (right):

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp:164:
ASSERT_TRUE(resource->hasVaryHeader());
On 2016/09/09 07:34:47, yhirano wrote:
> expect?

I leave this ASSERT because Vary-related tests would have no meaning if
resource->hasVaryHeader() is false and thus it wouldn't be worth continuing.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp:194:
ASSERT_TRUE(resource->hasVaryHeader());
On 2016/09/09 07:34:47, yhirano wrote:
> ditto

ditto.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp:219:
ASSERT_TRUE(resource->hasVaryHeader());
On 2016/09/09 07:34:47, yhirano wrote:
> ditto

ditto.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp:240:
ASSERT_EQ(m_resource, resource);
On 2016/09/09 07:34:47, yhirano wrote:
> expect?

Done.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
File third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp (right):

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp:189:
EXPECT_STREQ(expectedURL.getString().utf8().data(),
fetchRequest.resourceRequest().url().getString().utf8().data());
On 2016/09/09 07:34:48, yhirano wrote:
> You can use EXPECT_EQ.

Done.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp:207:
EXPECT_STREQ(shouldPrefer ? "1" : "",
On 2016/09/09 07:34:48, yhirano wrote:
> You can use EXPECT_EQ.

Done.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp:213:
EXPECT_STREQ("1",
fetchRequest.resourceRequest().httpHeaderField(HTTPNames::Upgrade_Insecure_Requests).utf8().data());
On 2016/09/09 07:34:48, yhirano wrote:
> ditto

Done.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp:526:
EXPECT_STREQ("on", resourceRequest.httpHeaderField("Save-Data").utf8().data());
On 2016/09/09 07:34:48, yhirano wrote:
> You can use EXPECT_EQ.

Done.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp:531:
EXPECT_STREQ("on", resourceRequest.httpHeaderField("Save-Data").utf8().data());
On 2016/09/09 07:34:48, yhirano wrote:
> ditto.

Done.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp:538:
EXPECT_STREQ("", resourceRequest.httpHeaderField("Save-Data").utf8().data());
On 2016/09/09 07:34:48, yhirano wrote:
> ditto (or isEmpty is better?)

Done.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
File third_party/WebKit/Source/core/loader/LinkLoaderTest.cpp (right):

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/LinkLoaderTest.cpp:158: EXPECT_NE(nullptr,
preloads);
On 2016/09/09 07:34:48, yhirano wrote:
> [optional] EXPECT_TRUE for consistency?

Done.

https://codereview.chromium.org/2324103002/diff/1/third_party/WebKit/Source/c...
third_party/WebKit/Source/core/loader/LinkLoaderTest.cpp:160: EXPECT_EQ(nullptr,
preloads);
On 2016/09/09 07:34:48, yhirano wrote:
> [optional] ditto

Done.

[yhirano, 2016-09-09 09:07:36]

lgtm

[hiroshige, 2016-09-09 09:16:37]

The CQ bit was checked by hiroshige@chromium.org

[commit-bot: I haz the power, 2016-09-09 09:16:52]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-09 10:31:30]

Description was changed from

==========
Cleanup EXPECT/ASSERTs in unit tests in core/fetch and core/loader

- Use EXPECT_.*() where possible instead of ASSERT_.*()
- Use the argument order of EXPECT_EQ(expected, actual)
- Remove unnecessary casts
- Replace EXPECT_EQ/NE(nullptr) with EXPECT_FALSE/TRUE()
- Replace EXPECT_STREQ() with EXPECT_EQ() using WTF::String comparison

BUG=none
==========

to

==========
Cleanup EXPECT/ASSERTs in unit tests in core/fetch and core/loader

- Use EXPECT_.*() where possible instead of ASSERT_.*()
- Use the argument order of EXPECT_EQ(expected, actual)
- Remove unnecessary casts
- Replace EXPECT_EQ/NE(nullptr) with EXPECT_FALSE/TRUE()
- Replace EXPECT_STREQ() with EXPECT_EQ() using WTF::String comparison

BUG=none
==========

[commit-bot: I haz the power, 2016-09-09 10:33:29]

Description was changed from

==========
Cleanup EXPECT/ASSERTs in unit tests in core/fetch and core/loader

- Use EXPECT_.*() where possible instead of ASSERT_.*()
- Use the argument order of EXPECT_EQ(expected, actual)
- Remove unnecessary casts
- Replace EXPECT_EQ/NE(nullptr) with EXPECT_FALSE/TRUE()
- Replace EXPECT_STREQ() with EXPECT_EQ() using WTF::String comparison

BUG=none
==========

to

==========
Cleanup EXPECT/ASSERTs in unit tests in core/fetch and core/loader

- Use EXPECT_.*() where possible instead of ASSERT_.*()
- Use the argument order of EXPECT_EQ(expected, actual)
- Remove unnecessary casts
- Replace EXPECT_EQ/NE(nullptr) with EXPECT_FALSE/TRUE()
- Replace EXPECT_STREQ() with EXPECT_EQ() using WTF::String comparison

BUG=none

Committed: https://crrev.com/9cda388f3c8f935fefff65703b63b61ff77eefac
Cr-Commit-Position: refs/heads/master@{#417550}
==========

[commit-bot: I haz the power, 2016-09-09 10:33:31]

Patchset 5 (id:??) landed as
https://crrev.com/9cda388f3c8f935fefff65703b63b61ff77eefac
Cr-Commit-Position: refs/heads/master@{#417550}