Fix QUIC core test display
Tests names will now display a pretty name instead of the test index.
For example new string is:
QuicStreamTests/QuicStreamTest.PendingStreamStaticness/Q048
as opposed to old:
QuicStreamTests/QuicStreamTest.PendingStreamStaticness/33
gfe-relnote: n/a, test-only
PiperOrigin-RevId: 269934211
Change-Id: I44552e9730c57e00a3829f5a15ba10d8af2dc207
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index dfaa9ec..7acae48 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -114,6 +114,19 @@
QuicTag priority_tag;
};
+// Used by ::testing::PrintToStringParamName().
+std::string PrintToString(const TestParams& p) {
+ std::string rv = QuicStrCat(
+ ParsedQuicVersionToString(p.negotiated_version), "_Server_",
+ ParsedQuicVersionVectorToString(p.server_supported_versions), "_Client_",
+ ParsedQuicVersionVectorToString(p.client_supported_versions), "_",
+ QuicTagToString(p.congestion_control_tag), "_",
+ QuicTagToString(p.priority_tag));
+ std::replace(rv.begin(), rv.end(), ',', '_');
+ std::replace(rv.begin(), rv.end(), ' ', '_');
+ return rv;
+}
+
// Constructs various test permutations.
std::vector<TestParams> GetTestParams(bool use_tls_handshake) {
QuicFlagSaver flags;
@@ -592,13 +605,15 @@
// Run all end to end tests with all supported versions.
INSTANTIATE_TEST_SUITE_P(EndToEndTests,
EndToEndTest,
- ::testing::ValuesIn(GetTestParams(false)));
+ ::testing::ValuesIn(GetTestParams(false)),
+ ::testing::PrintToStringParamName());
class EndToEndTestWithTls : public EndToEndTest {};
INSTANTIATE_TEST_SUITE_P(EndToEndTestsWithTls,
EndToEndTestWithTls,
- ::testing::ValuesIn(GetTestParams(true)));
+ ::testing::ValuesIn(GetTestParams(true)),
+ ::testing::PrintToStringParamName());
TEST_P(EndToEndTestWithTls, HandshakeSuccessful) {
ASSERT_TRUE(Initialize());
@@ -3120,7 +3135,8 @@
// Run all server push end to end tests with all supported versions.
INSTANTIATE_TEST_SUITE_P(EndToEndTestsServerPush,
EndToEndTestServerPush,
- ::testing::ValuesIn(GetTestParams(false)));
+ ::testing::ValuesIn(GetTestParams(false)),
+ ::testing::PrintToStringParamName());
TEST_P(EndToEndTestServerPush, ServerPush) {
ASSERT_TRUE(Initialize());
@@ -3845,7 +3861,8 @@
INSTANTIATE_TEST_SUITE_P(EndToEndPacketReorderingTests,
EndToEndPacketReorderingTest,
- testing::ValuesIn(GetTestParams(false)));
+ ::testing::ValuesIn(GetTestParams(false)),
+ ::testing::PrintToStringParamName());
TEST_P(EndToEndPacketReorderingTest, ReorderedConnectivityProbing) {
ASSERT_TRUE(Initialize());
diff --git a/quic/core/http/quic_headers_stream_test.cc b/quic/core/http/quic_headers_stream_test.cc
index 2f2db8d..b4bdb28 100644
--- a/quic/core/http/quic_headers_stream_test.cc
+++ b/quic/core/http/quic_headers_stream_test.cc
@@ -162,6 +162,13 @@
Perspective perspective;
};
+// Used by ::testing::PrintToStringParamName().
+std::string PrintToString(const TestParams& tp) {
+ return QuicStrCat(
+ ParsedQuicVersionToString(tp.version), "_",
+ (tp.perspective == Perspective::IS_CLIENT ? "client" : "server"));
+}
+
std::vector<TestParams> GetTestParams() {
std::vector<TestParams> params;
ParsedQuicVersionVector all_supported_versions = AllSupportedVersions();
@@ -374,7 +381,8 @@
// Run all tests with each version and perspective (client or server).
INSTANTIATE_TEST_SUITE_P(Tests,
QuicHeadersStreamTest,
- ::testing::ValuesIn(GetTestParams()));
+ ::testing::ValuesIn(GetTestParams()),
+ ::testing::PrintToStringParamName());
TEST_P(QuicHeadersStreamTest, StreamId) {
EXPECT_EQ(QuicUtils::GetHeadersStreamId(connection_->transport_version()),
diff --git a/quic/core/http/quic_receive_control_stream_test.cc b/quic/core/http/quic_receive_control_stream_test.cc
index 5eeb466..6914681 100644
--- a/quic/core/http/quic_receive_control_stream_test.cc
+++ b/quic/core/http/quic_receive_control_stream_test.cc
@@ -23,18 +23,31 @@
struct TestParams {
TestParams(const ParsedQuicVersion& version, Perspective perspective)
: version(version), perspective(perspective) {
- QUIC_LOG(INFO) << "TestParams: version: "
- << ParsedQuicVersionToString(version)
- << ", perspective: " << perspective;
+ QUIC_LOG(INFO) << "TestParams: " << *this;
}
TestParams(const TestParams& other)
: version(other.version), perspective(other.perspective) {}
+ friend std::ostream& operator<<(std::ostream& os, const TestParams& tp) {
+ os << "{ version: " << ParsedQuicVersionToString(tp.version)
+ << ", perspective: "
+ << (tp.perspective == Perspective::IS_CLIENT ? "client" : "server")
+ << "}";
+ return os;
+ }
+
ParsedQuicVersion version;
Perspective perspective;
};
+// Used by ::testing::PrintToStringParamName().
+std::string PrintToString(const TestParams& tp) {
+ return QuicStrCat(
+ ParsedQuicVersionToString(tp.version), "_",
+ (tp.perspective == Perspective::IS_CLIENT ? "client" : "server"));
+}
+
std::vector<TestParams> GetTestParams() {
std::vector<TestParams> params;
ParsedQuicVersionVector all_supported_versions = AllSupportedVersions();
@@ -120,7 +133,8 @@
INSTANTIATE_TEST_SUITE_P(Tests,
QuicReceiveControlStreamTest,
- ::testing::ValuesIn(GetTestParams()));
+ ::testing::ValuesIn(GetTestParams()),
+ ::testing::PrintToStringParamName());
TEST_P(QuicReceiveControlStreamTest, ResetControlStream) {
EXPECT_TRUE(receive_control_stream_->is_static());
diff --git a/quic/core/http/quic_send_control_stream_test.cc b/quic/core/http/quic_send_control_stream_test.cc
index e989e22..3d9de83 100644
--- a/quic/core/http/quic_send_control_stream_test.cc
+++ b/quic/core/http/quic_send_control_stream_test.cc
@@ -21,18 +21,31 @@
struct TestParams {
TestParams(const ParsedQuicVersion& version, Perspective perspective)
: version(version), perspective(perspective) {
- QUIC_LOG(INFO) << "TestParams: version: "
- << ParsedQuicVersionToString(version)
- << ", perspective: " << perspective;
+ QUIC_LOG(INFO) << "TestParams: " << *this;
}
TestParams(const TestParams& other)
: version(other.version), perspective(other.perspective) {}
+ friend std::ostream& operator<<(std::ostream& os, const TestParams& tp) {
+ os << "{ version: " << ParsedQuicVersionToString(tp.version)
+ << ", perspective: "
+ << (tp.perspective == Perspective::IS_CLIENT ? "client" : "server")
+ << "}";
+ return os;
+ }
+
ParsedQuicVersion version;
Perspective perspective;
};
+// Used by ::testing::PrintToStringParamName().
+std::string PrintToString(const TestParams& tp) {
+ return QuicStrCat(
+ ParsedQuicVersionToString(tp.version), "_",
+ (tp.perspective == Perspective::IS_CLIENT ? "client" : "server"));
+}
+
std::vector<TestParams> GetTestParams() {
std::vector<TestParams> params;
ParsedQuicVersionVector all_supported_versions = AllSupportedVersions();
@@ -82,7 +95,8 @@
INSTANTIATE_TEST_SUITE_P(Tests,
QuicSendControlStreamTest,
- ::testing::ValuesIn(GetTestParams()));
+ ::testing::ValuesIn(GetTestParams()),
+ ::testing::PrintToStringParamName());
TEST_P(QuicSendControlStreamTest, WriteSettings) {
session_.set_qpack_maximum_dynamic_table_capacity(255);
diff --git a/quic/core/http/quic_server_session_base_test.cc b/quic/core/http/quic_server_session_base_test.cc
index 2570d63..89dbf04 100644
--- a/quic/core/http/quic_server_session_base_test.cc
+++ b/quic/core/http/quic_server_session_base_test.cc
@@ -228,7 +228,9 @@
INSTANTIATE_TEST_SUITE_P(Tests,
QuicServerSessionBaseTest,
- ::testing::ValuesIn(AllSupportedVersions()));
+ ::testing::ValuesIn(AllSupportedVersions()),
+ ::testing::PrintToStringParamName());
+
TEST_P(QuicServerSessionBaseTest, CloseStreamDueToReset) {
// Open a stream, then reset it.
// Send two bytes of payload to open it.
@@ -693,7 +695,8 @@
INSTANTIATE_TEST_SUITE_P(StreamMemberLifetimeTests,
StreamMemberLifetimeTest,
- ::testing::ValuesIn(AllSupportedVersions()));
+ ::testing::ValuesIn(AllSupportedVersions()),
+ ::testing::PrintToStringParamName());
// Trigger an operation which causes an async invocation of
// ProofSource::GetProof. Delay the completion of the operation until after the
diff --git a/quic/core/http/quic_spdy_client_session_test.cc b/quic/core/http/quic_spdy_client_session_test.cc
index f8a0a0f..3e951b3 100644
--- a/quic/core/http/quic_spdy_client_session_test.cc
+++ b/quic/core/http/quic_spdy_client_session_test.cc
@@ -182,7 +182,8 @@
INSTANTIATE_TEST_SUITE_P(Tests,
QuicSpdyClientSessionTest,
- ::testing::ValuesIn(AllSupportedVersions()));
+ ::testing::ValuesIn(AllSupportedVersions()),
+ ::testing::PrintToStringParamName());
TEST_P(QuicSpdyClientSessionTest, CryptoConnect) {
CompleteCryptoHandshake();
diff --git a/quic/core/http/quic_spdy_client_stream_test.cc b/quic/core/http/quic_spdy_client_stream_test.cc
index be6a162..6f8450e 100644
--- a/quic/core/http/quic_spdy_client_stream_test.cc
+++ b/quic/core/http/quic_spdy_client_stream_test.cc
@@ -101,7 +101,8 @@
INSTANTIATE_TEST_SUITE_P(Tests,
QuicSpdyClientStreamTest,
- ::testing::ValuesIn(AllSupportedVersions()));
+ ::testing::ValuesIn(AllSupportedVersions()),
+ ::testing::PrintToStringParamName());
TEST_P(QuicSpdyClientStreamTest, TestReceivingIllegalResponseStatusCode) {
headers_[":status"] = "200 ok";
diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc
index 8ea04f8..f2362fc 100644
--- a/quic/core/http/quic_spdy_session_test.cc
+++ b/quic/core/http/quic_spdy_session_test.cc
@@ -418,7 +418,8 @@
INSTANTIATE_TEST_SUITE_P(Tests,
QuicSpdySessionTestServer,
- ::testing::ValuesIn(AllSupportedVersions()));
+ ::testing::ValuesIn(AllSupportedVersions()),
+ ::testing::PrintToStringParamName());
TEST_P(QuicSpdySessionTestServer, UsesPendingStreams) {
if (!VersionHasStreamType(transport_version())) {
@@ -1687,7 +1688,8 @@
INSTANTIATE_TEST_SUITE_P(Tests,
QuicSpdySessionTestClient,
- ::testing::ValuesIn(AllSupportedVersions()));
+ ::testing::ValuesIn(AllSupportedVersions()),
+ ::testing::PrintToStringParamName());
TEST_P(QuicSpdySessionTestClient, UsesPendingStreams) {
if (!VersionHasStreamType(transport_version())) {
diff --git a/quic/core/http/quic_spdy_stream_test.cc b/quic/core/http/quic_spdy_stream_test.cc
index b1f6672..327b952 100644
--- a/quic/core/http/quic_spdy_stream_test.cc
+++ b/quic/core/http/quic_spdy_stream_test.cc
@@ -299,7 +299,8 @@
INSTANTIATE_TEST_SUITE_P(Tests,
QuicSpdyStreamTest,
- ::testing::ValuesIn(AllSupportedVersions()));
+ ::testing::ValuesIn(AllSupportedVersions()),
+ ::testing::PrintToStringParamName());
TEST_P(QuicSpdyStreamTest, ProcessHeaderList) {
Initialize(kShouldProcessData);
@@ -2094,7 +2095,8 @@
INSTANTIATE_TEST_SUITE_P(Tests,
QuicSpdyStreamIncrementalConsumptionTest,
::testing::Values(ParsedQuicVersion{PROTOCOL_TLS1_3,
- QUIC_VERSION_99}));
+ QUIC_VERSION_99}),
+ ::testing::PrintToStringParamName());
// Test that stream bytes are consumed (by calling
// sequencer()->MarkConsumed()) incrementally, as soon as possible.
