Commit 81868e2b authored by David Schinazi's avatar David Schinazi Committed by Commit Bot

Improve test parameter logging in HttpStreamFactoryBidirectionalQuicTest

This CL changes the test to pretty-print its parameters.

R=zhongyi@chromium.org

Change-Id: I0542a103b6ff69001bed54e3b6f152fe9a97b19b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2225473
Commit-Queue: David Schinazi <dschinazi@chromium.org>
Commit-Queue: Zhongyi Shi <zhongyi@chromium.org>
Auto-Submit: David Schinazi <dschinazi@chromium.org>
Reviewed-by: default avatarZhongyi Shi <zhongyi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773864}
parent 47d1a4bd
...@@ -2199,15 +2199,39 @@ TEST_F(HttpStreamFactoryTest, RequestBidirectionalStreamImpl) { ...@@ -2199,15 +2199,39 @@ TEST_F(HttpStreamFactoryTest, RequestBidirectionalStreamImpl) {
EXPECT_TRUE(waiter.used_proxy_info().is_direct()); EXPECT_TRUE(waiter.used_proxy_info().is_direct());
} }
struct TestParams {
quic::ParsedQuicVersion version;
bool client_headers_include_h2_stream_dependency;
};
// Used by ::testing::PrintToStringParamName().
std::string PrintToString(const TestParams& p) {
return quiche::QuicheStrCat(
ParsedQuicVersionToString(p.version), "_",
(p.client_headers_include_h2_stream_dependency ? "" : "No"),
"Dependency");
}
std::vector<TestParams> GetTestParams() {
std::vector<TestParams> params;
quic::ParsedQuicVersionVector all_supported_versions =
quic::AllSupportedVersions();
for (const auto& version : all_supported_versions) {
params.push_back(TestParams{version, false});
params.push_back(TestParams{version, true});
}
return params;
}
class HttpStreamFactoryBidirectionalQuicTest class HttpStreamFactoryBidirectionalQuicTest
: public TestWithTaskEnvironment, : public TestWithTaskEnvironment,
public ::testing::WithParamInterface< public ::testing::WithParamInterface<TestParams> {
std::tuple<quic::ParsedQuicVersion, bool>> {
protected: protected:
HttpStreamFactoryBidirectionalQuicTest() HttpStreamFactoryBidirectionalQuicTest()
: default_url_(kDefaultUrl), : default_url_(kDefaultUrl),
version_(std::get<0>(GetParam())), version_(GetParam().version),
client_headers_include_h2_stream_dependency_(std::get<1>(GetParam())), client_headers_include_h2_stream_dependency_(
GetParam().client_headers_include_h2_stream_dependency),
client_packet_maker_(version_, client_packet_maker_(version_,
quic::QuicUtils::CreateRandomConnectionId( quic::QuicUtils::CreateRandomConnectionId(
quic_context_.random_generator()), quic_context_.random_generator()),
...@@ -2327,11 +2351,10 @@ class HttpStreamFactoryBidirectionalQuicTest ...@@ -2327,11 +2351,10 @@ class HttpStreamFactoryBidirectionalQuicTest
HttpNetworkSession::Params params_; HttpNetworkSession::Params params_;
}; };
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(VersionIncludeStreamDependencySequence,
VersionIncludeStreamDependencySequence, HttpStreamFactoryBidirectionalQuicTest,
HttpStreamFactoryBidirectionalQuicTest, ::testing::ValuesIn(GetTestParams()),
::testing::Combine(::testing::ValuesIn(quic::AllSupportedVersions()), ::testing::PrintToStringParamName());
::testing::Bool()));
TEST_P(HttpStreamFactoryBidirectionalQuicTest, TEST_P(HttpStreamFactoryBidirectionalQuicTest,
RequestBidirectionalStreamImplQuicAlternative) { RequestBidirectionalStreamImplQuicAlternative) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment