Skip to content

Commit

Permalink
test: Replace _TEST_CASE_ with _TEST_SUITE_ in /net.
Browse files Browse the repository at this point in the history 
Googletest is (at last) converging with industry-standard terminology
[1]. We previously called test suites "test cases", which was rather
confusing for folks coming from any other testing framework.

Chrome now has a googletest version that supports _TEST_SUITE_ macros
instead of _TEST_CASE_, so this CL cleans up some of the outdated usage.

[1] https://github.com/google/googletest/blob/master/googletest/docs/primer.md#beware-of-the-nomenclature

Bug: 925652
Change-Id: I78ffd093defe3bf7ee08b3bdd387e00fb9fedc24
Reviewed-on: https://chromium-review.googlesource.com/c/1469370
Commit-Queue: Victor Costan <pwnall@chromium.org>
Auto-Submit: Victor Costan <pwnall@chromium.org>
Reviewed-by: Eric Roman <eroman@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#631895}
  • Loading branch information
@pwnall
pwnall authored and Commit Bot committed Feb 13, 2019
1 parent 4170da4 commit 2309ea0
Show file tree
Hide file tree
Showing 28 changed files with 248 additions and 245 deletions.
48 changes: 24 additions & 24 deletions net/base/mime_sniffer_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,21 +535,21 @@ TEST_P(MimeSnifferBinaryTest, IsBinaryControlCode) {
}

// ::testing::Range(a, b) tests an open-ended range, ie. "b" is not included.
INSTANTIATE_TEST_CASE_P(MimeSnifferBinaryTestRange1,
MimeSnifferBinaryTest,
Range(0x00, 0x09));
INSTANTIATE_TEST_SUITE_P(MimeSnifferBinaryTestRange1,
MimeSnifferBinaryTest,
Range(0x00, 0x09));

INSTANTIATE_TEST_CASE_P(MimeSnifferBinaryTestByte0x0B,
MimeSnifferBinaryTest,
Values(0x0B));
INSTANTIATE_TEST_SUITE_P(MimeSnifferBinaryTestByte0x0B,
MimeSnifferBinaryTest,
Values(0x0B));

INSTANTIATE_TEST_CASE_P(MimeSnifferBinaryTestRange2,
MimeSnifferBinaryTest,
Range(0x0E, 0x1B));
INSTANTIATE_TEST_SUITE_P(MimeSnifferBinaryTestRange2,
MimeSnifferBinaryTest,
Range(0x0E, 0x1B));

INSTANTIATE_TEST_CASE_P(MimeSnifferBinaryTestRange3,
MimeSnifferBinaryTest,
Range(0x1C, 0x20));
INSTANTIATE_TEST_SUITE_P(MimeSnifferBinaryTestRange3,
MimeSnifferBinaryTest,
Range(0x1C, 0x20));

class MimeSnifferPlainTextTest : public ::testing::TestWithParam<int> {};

Expand All @@ -558,13 +558,13 @@ TEST_P(MimeSnifferPlainTextTest, NotBinaryControlCode) {
EXPECT_FALSE(LooksLikeBinary(&param, 1));
}

INSTANTIATE_TEST_CASE_P(MimeSnifferPlainTextTestPlainTextControlCodes,
MimeSnifferPlainTextTest,
Values(0x09, 0x0A, 0x0C, 0x0D, 0x1B));
INSTANTIATE_TEST_SUITE_P(MimeSnifferPlainTextTestPlainTextControlCodes,
MimeSnifferPlainTextTest,
Values(0x09, 0x0A, 0x0C, 0x0D, 0x1B));

INSTANTIATE_TEST_CASE_P(MimeSnifferPlainTextTestNotControlCodeRange,
MimeSnifferPlainTextTest,
Range(0x20, 0x100));
INSTANTIATE_TEST_SUITE_P(MimeSnifferPlainTextTestNotControlCodeRange,
MimeSnifferPlainTextTest,
Range(0x20, 0x100));

class MimeSnifferControlCodesEdgeCaseTest
: public ::testing::TestWithParam<const char*> {};
Expand All @@ -574,12 +574,12 @@ TEST_P(MimeSnifferControlCodesEdgeCaseTest, EdgeCase) {
EXPECT_TRUE(LooksLikeBinary(param, strlen(param)));
}

INSTANTIATE_TEST_CASE_P(MimeSnifferControlCodesEdgeCaseTest,
MimeSnifferControlCodesEdgeCaseTest,
Values("\x01__", // first byte is binary
"__\x03", // last byte is binary
"_\x02_" // a byte in the middle is binary
));
INSTANTIATE_TEST_SUITE_P(MimeSnifferControlCodesEdgeCaseTest,
MimeSnifferControlCodesEdgeCaseTest,
Values("\x01__", // first byte is binary
"__\x03", // last byte is binary
"_\x02_" // a byte in the middle is binary
));

} // namespace
} // namespace net
24 changes: 12 additions & 12 deletions net/cookies/cookie_monster_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,18 @@ struct CookieMonsterTestTraits {
static const int creation_time_granularity_in_ms = 0;
};

INSTANTIATE_TYPED_TEST_CASE_P(CookieMonster,
CookieStoreTest,
CookieMonsterTestTraits);
INSTANTIATE_TYPED_TEST_CASE_P(CookieMonster,
CookieStoreChangeGlobalTest,
CookieMonsterTestTraits);
INSTANTIATE_TYPED_TEST_CASE_P(CookieMonster,
CookieStoreChangeUrlTest,
CookieMonsterTestTraits);
INSTANTIATE_TYPED_TEST_CASE_P(CookieMonster,
CookieStoreChangeNamedTest,
CookieMonsterTestTraits);
INSTANTIATE_TYPED_TEST_SUITE_P(CookieMonster,
CookieStoreTest,
CookieMonsterTestTraits);
INSTANTIATE_TYPED_TEST_SUITE_P(CookieMonster,
CookieStoreChangeGlobalTest,
CookieMonsterTestTraits);
INSTANTIATE_TYPED_TEST_SUITE_P(CookieMonster,
CookieStoreChangeUrlTest,
CookieMonsterTestTraits);
INSTANTIATE_TYPED_TEST_SUITE_P(CookieMonster,
CookieStoreChangeNamedTest,
CookieMonsterTestTraits);

template <typename T>
class CookieMonsterTestBase : public CookieStoreTest<T> {
Expand Down
132 changes: 66 additions & 66 deletions net/cookies/cookie_store_change_unittest.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,17 @@ class CookieStoreChangeTestBase
template <class CookieStoreTestTraits>
class CookieStoreChangeGlobalTest
: public CookieStoreChangeTestBase<CookieStoreTestTraits> {};
TYPED_TEST_CASE_P(CookieStoreChangeGlobalTest);
TYPED_TEST_SUITE_P(CookieStoreChangeGlobalTest);

template <class CookieStoreTestTraits>
class CookieStoreChangeUrlTest
: public CookieStoreChangeTestBase<CookieStoreTestTraits> {};
TYPED_TEST_CASE_P(CookieStoreChangeUrlTest);
TYPED_TEST_SUITE_P(CookieStoreChangeUrlTest);

template <class CookieStoreTestTraits>
class CookieStoreChangeNamedTest
: public CookieStoreChangeTestBase<CookieStoreTestTraits> {};
TYPED_TEST_CASE_P(CookieStoreChangeNamedTest);
TYPED_TEST_SUITE_P(CookieStoreChangeNamedTest);

TYPED_TEST_P(CookieStoreChangeGlobalTest, NoCookie) {
if (!TypeParam::supports_global_cookie_tracking)
Expand Down Expand Up @@ -2677,69 +2677,69 @@ TYPED_TEST_P(CookieStoreChangeNamedTest, SubscriptionOutlivesStore) {
subscription.reset();
}

REGISTER_TYPED_TEST_CASE_P(CookieStoreChangeGlobalTest,
NoCookie,
InitialCookie,
InsertOne,
InsertMany,
DeleteOne,
DeleteTwo,
Overwrite,
OverwriteWithHttpOnly,
Deregister,
DeregisterMultiple,
DispatchRace,
DeregisterRace,
DeregisterRaceMultiple,
MultipleSubscriptions);

REGISTER_TYPED_TEST_CASE_P(CookieStoreChangeUrlTest,
NoCookie,
InitialCookie,
InsertOne,
InsertMany,
InsertFiltering,
DeleteOne,
DeleteTwo,
DeleteFiltering,
Overwrite,
OverwriteFiltering,
OverwriteWithHttpOnly,
Deregister,
DeregisterMultiple,
DispatchRace,
DeregisterRace,
DeregisterRaceMultiple,
DifferentSubscriptionsDisjoint,
DifferentSubscriptionsDomains,
DifferentSubscriptionsPaths,
DifferentSubscriptionsFiltering,
MultipleSubscriptions);

REGISTER_TYPED_TEST_CASE_P(CookieStoreChangeNamedTest,
NoCookie,
InitialCookie,
InsertOne,
InsertTwo,
InsertFiltering,
DeleteOne,
DeleteTwo,
DeleteFiltering,
Overwrite,
OverwriteFiltering,
OverwriteWithHttpOnly,
Deregister,
DeregisterMultiple,
DispatchRace,
DeregisterRace,
DeregisterRaceMultiple,
DifferentSubscriptionsDisjoint,
DifferentSubscriptionsDomains,
DifferentSubscriptionsNames,
DifferentSubscriptionsPaths,
DifferentSubscriptionsFiltering,
MultipleSubscriptions,
SubscriptionOutlivesStore);
REGISTER_TYPED_TEST_SUITE_P(CookieStoreChangeGlobalTest,
NoCookie,
InitialCookie,
InsertOne,
InsertMany,
DeleteOne,
DeleteTwo,
Overwrite,
OverwriteWithHttpOnly,
Deregister,
DeregisterMultiple,
DispatchRace,
DeregisterRace,
DeregisterRaceMultiple,
MultipleSubscriptions);

REGISTER_TYPED_TEST_SUITE_P(CookieStoreChangeUrlTest,
NoCookie,
InitialCookie,
InsertOne,
InsertMany,
InsertFiltering,
DeleteOne,
DeleteTwo,
DeleteFiltering,
Overwrite,
OverwriteFiltering,
OverwriteWithHttpOnly,
Deregister,
DeregisterMultiple,
DispatchRace,
DeregisterRace,
DeregisterRaceMultiple,
DifferentSubscriptionsDisjoint,
DifferentSubscriptionsDomains,
DifferentSubscriptionsPaths,
DifferentSubscriptionsFiltering,
MultipleSubscriptions);

REGISTER_TYPED_TEST_SUITE_P(CookieStoreChangeNamedTest,
NoCookie,
InitialCookie,
InsertOne,
InsertTwo,
InsertFiltering,
DeleteOne,
DeleteTwo,
DeleteFiltering,
Overwrite,
OverwriteFiltering,
OverwriteWithHttpOnly,
Deregister,
DeregisterMultiple,
DispatchRace,
DeregisterRace,
DeregisterRaceMultiple,
DifferentSubscriptionsDisjoint,
DifferentSubscriptionsDomains,
DifferentSubscriptionsNames,
DifferentSubscriptionsPaths,
DifferentSubscriptionsFiltering,
MultipleSubscriptions,
SubscriptionOutlivesStore);

} // namespace net

Expand Down
82 changes: 41 additions & 41 deletions net/cookies/cookie_store_unittest.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ class CookieStoreTest : public testing::Test {

std::unique_ptr<CookieStore> cookie_store_;
};
TYPED_TEST_CASE_P(CookieStoreTest);
TYPED_TEST_SUITE_P(CookieStoreTest);

TYPED_TEST_P(CookieStoreTest, FilterTest) {
CookieStore* cs = this->GetCookieStore();
Expand Down Expand Up @@ -1648,46 +1648,46 @@ TYPED_TEST_P(CookieStoreTest, DeleteSessionCookie) {
EXPECT_EQ("C=D", this->GetCookies(cs, this->http_www_foo_.url()));
}

REGISTER_TYPED_TEST_CASE_P(CookieStoreTest,
FilterTest,
SetCanonicalCookieTest,
SecureEnforcement,
EmptyKeyTest,
DomainTest,
DomainWithTrailingDotTest,
ValidSubdomainTest,
InvalidDomainTest,
InvalidDomainSameDomainAndRegistry,
DomainWithoutLeadingDotParentDomain,
DomainWithoutLeadingDotSameDomain,
CaseInsensitiveDomainTest,
TestIpAddress,
TestIpAddressNoDomainCookies,
TestTLD,
TestTLDWithTerminalDot,
TestSubdomainSettingCookiesOnUnknownTLD,
TestSubdomainSettingCookiesOnKnownTLD,
TestSubdomainSettingCookiesOnKnownDottedTLD,
TestSettingCookiesOnUnknownTLD,
TestSettingCookiesWithHostDomainOnUnknownTLD,
TestHostEndsWithDot,
InvalidScheme,
InvalidScheme_Read,
PathTest,
EmptyExpires,
HttpOnlyTest,
TestCookieDeletion,
TestDeleteAll,
TestDeleteAllCreatedInTimeRange,
TestDeleteAllWithInfo,
TestSecure,
NetUtilCookieTest,
OverwritePersistentCookie,
EmptyName,
CookieOrdering,
GetAllCookiesAsync,
DeleteCanonicalCookieAsync,
DeleteSessionCookie);
REGISTER_TYPED_TEST_SUITE_P(CookieStoreTest,
FilterTest,
SetCanonicalCookieTest,
SecureEnforcement,
EmptyKeyTest,
DomainTest,
DomainWithTrailingDotTest,
ValidSubdomainTest,
InvalidDomainTest,
InvalidDomainSameDomainAndRegistry,
DomainWithoutLeadingDotParentDomain,
DomainWithoutLeadingDotSameDomain,
CaseInsensitiveDomainTest,
TestIpAddress,
TestIpAddressNoDomainCookies,
TestTLD,
TestTLDWithTerminalDot,
TestSubdomainSettingCookiesOnUnknownTLD,
TestSubdomainSettingCookiesOnKnownTLD,
TestSubdomainSettingCookiesOnKnownDottedTLD,
TestSettingCookiesOnUnknownTLD,
TestSettingCookiesWithHostDomainOnUnknownTLD,
TestHostEndsWithDot,
InvalidScheme,
InvalidScheme_Read,
PathTest,
EmptyExpires,
HttpOnlyTest,
TestCookieDeletion,
TestDeleteAll,
TestDeleteAllCreatedInTimeRange,
TestDeleteAllWithInfo,
TestSecure,
NetUtilCookieTest,
OverwritePersistentCookie,
EmptyName,
CookieOrdering,
GetAllCookiesAsync,
DeleteCanonicalCookieAsync,
DeleteSessionCookie);

} // namespace net

Expand Down
8 changes: 4 additions & 4 deletions net/filter/filter_source_stream_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,10 @@ class FilterSourceStreamTest
}
};

INSTANTIATE_TEST_CASE_P(FilterSourceStreamTests,
FilterSourceStreamTest,
::testing::Values(MockSourceStream::SYNC,
MockSourceStream::ASYNC));
INSTANTIATE_TEST_SUITE_P(FilterSourceStreamTests,
FilterSourceStreamTest,
::testing::Values(MockSourceStream::SYNC,
MockSourceStream::ASYNC));

// Tests that a FilterSourceStream subclass (NeedsAllInputFilterSourceStream)
// can return 0 bytes for FilterData()s when it has not consumed EOF from the
Expand Down
2 changes: 1 addition & 1 deletion net/filter/gzip_source_stream_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class GzipSourceStreamTest : public ::testing::TestWithParam<GzipTestParam> {
std::unique_ptr<GzipSourceStream> stream_;
};

INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
GzipSourceStreamTests,
GzipSourceStreamTest,
::testing::Values(GzipTestParam(kBigBufferSize,
Expand Down
8 changes: 4 additions & 4 deletions net/ftp/ftp_directory_listing_parser_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,10 @@ const FtpTestParam kTestParams[] = {
{"dir-listing-windows-2", OK},
};

INSTANTIATE_TEST_CASE_P(,
FtpDirectoryListingParserTest,
testing::ValuesIn(kTestParams),
TestName);
INSTANTIATE_TEST_SUITE_P(,
FtpDirectoryListingParserTest,
testing::ValuesIn(kTestParams),
TestName);

} // namespace

Expand Down
Loading

0 comments on commit 2309ea0

Please sign in to comment.