Replace calls to deprecated googletest macros *TEST_CASE() with *TEST_SUITE() There is no semantic change; this is just a rename. This change replaces the TEST_CASE, TestCase() family of APIs provided by googletest with TEST_SUITE, TestSuite() APIs. PiperOrigin-RevId: 231706521 Change-Id: I948ee3769e141dbc2ba2d90cb25783b7ae07735b
diff --git a/http2/hpack/decoder/hpack_decoder_test.cc b/http2/hpack/decoder/hpack_decoder_test.cc index 563e977..83a0ede 100644 --- a/http2/hpack/decoder/hpack_decoder_test.cc +++ b/http2/hpack/decoder/hpack_decoder_test.cc
@@ -224,7 +224,7 @@ bool saw_start_ = false; bool saw_end_ = false; }; -INSTANTIATE_TEST_CASE_P(AllWays, HpackDecoderTest, ::testing::Bool()); +INSTANTIATE_TEST_SUITE_P(AllWays, HpackDecoderTest, ::testing::Bool()); // Test based on RFC 7541, section C.3: Request Examples without Huffman Coding. // This section shows several consecutive header lists, corresponding to HTTP
diff --git a/http2/hpack/decoder/hpack_entry_decoder_test.cc b/http2/hpack/decoder/hpack_entry_decoder_test.cc index 7249bd5..b447e82 100644 --- a/http2/hpack/decoder/hpack_entry_decoder_test.cc +++ b/http2/hpack/decoder/hpack_entry_decoder_test.cc
@@ -157,9 +157,8 @@ const HpackEntryType entry_type_; }; -INSTANTIATE_TEST_CASE_P( - AllLiteralTypes, - HpackLiteralEntryDecoderTest, +INSTANTIATE_TEST_SUITE_P( + AllLiteralTypes, HpackLiteralEntryDecoderTest, testing::Values(HpackEntryType::kIndexedLiteralHeader, HpackEntryType::kUnindexedLiteralHeader, HpackEntryType::kNeverIndexedLiteralHeader));
diff --git a/http2/hpack/huffman/hpack_huffman_transcoder_test.cc b/http2/hpack/huffman/hpack_huffman_transcoder_test.cc index cfd73b5..2791d6a 100644 --- a/http2/hpack/huffman/hpack_huffman_transcoder_test.cc +++ b/http2/hpack/huffman/hpack_huffman_transcoder_test.cc
@@ -139,9 +139,9 @@ const char c_; }; -INSTANTIATE_TEST_CASE_P(HpackHuffmanTranscoderAdjacentCharTest, - HpackHuffmanTranscoderAdjacentCharTest, - ::testing::Range(0, 256)); +INSTANTIATE_TEST_SUITE_P(HpackHuffmanTranscoderAdjacentCharTest, + HpackHuffmanTranscoderAdjacentCharTest, + ::testing::Range(0, 256)); // Test c_ adjacent to every other character, both before and after. TEST_P(HpackHuffmanTranscoderAdjacentCharTest, RoundTripAdjacentChar) { @@ -169,11 +169,11 @@ const size_t length_; }; -INSTANTIATE_TEST_CASE_P( - HpackHuffmanTranscoderRepeatedCharTest, - HpackHuffmanTranscoderRepeatedCharTest, - ::testing::Combine(::testing::Range(0, 256), - ::testing::Values(1, 2, 3, 4, 8, 16, 32))); +INSTANTIATE_TEST_SUITE_P(HpackHuffmanTranscoderRepeatedCharTest, + HpackHuffmanTranscoderRepeatedCharTest, + ::testing::Combine(::testing::Range(0, 256), + ::testing::Values(1, 2, 3, 4, 8, 16, + 32))); TEST_P(HpackHuffmanTranscoderRepeatedCharTest, RoundTripRepeatedChar) { ASSERT_TRUE(TranscodeAndValidateSeveralWays(MakeString()));
diff --git a/http2/hpack/varint/hpack_varint_decoder_test.cc b/http2/hpack/varint/hpack_varint_decoder_test.cc index 32a4a30..2d589fd 100644 --- a/http2/hpack/varint/hpack_varint_decoder_test.cc +++ b/http2/hpack/varint/hpack_varint_decoder_test.cc
@@ -107,9 +107,8 @@ uint8_t prefix_length_; }; -INSTANTIATE_TEST_CASE_P( - HpackVarintDecoderTest, - HpackVarintDecoderTest, +INSTANTIATE_TEST_SUITE_P( + HpackVarintDecoderTest, HpackVarintDecoderTest, ::testing::Combine( // Bits of the first byte not part of the prefix should be ignored. ::testing::Values(0b00000000, 0b11111111, 0b10101010),
diff --git a/http2/http2_structures_test.cc b/http2/http2_structures_test.cc index 30ebb36..78107f7 100644 --- a/http2/http2_structures_test.cc +++ b/http2/http2_structures_test.cc
@@ -163,10 +163,9 @@ }; class IsEndStreamTest : public Http2FrameHeaderTypeAndFlagTest {}; -INSTANTIATE_TEST_CASE_P(IsEndStream, - IsEndStreamTest, - Combine(ValuesIn(ValidFrameTypes()), - Values(~Http2FrameFlag::END_STREAM, 0xff))); +INSTANTIATE_TEST_SUITE_P(IsEndStream, IsEndStreamTest, + Combine(ValuesIn(ValidFrameTypes()), + Values(~Http2FrameFlag::END_STREAM, 0xff))); TEST_P(IsEndStreamTest, IsEndStream) { const bool is_set = (flags_ & Http2FrameFlag::END_STREAM) == Http2FrameFlag::END_STREAM; @@ -201,10 +200,9 @@ } class IsACKTest : public Http2FrameHeaderTypeAndFlagTest {}; -INSTANTIATE_TEST_CASE_P(IsAck, - IsACKTest, - Combine(ValuesIn(ValidFrameTypes()), - Values(~Http2FrameFlag::ACK, 0xff))); +INSTANTIATE_TEST_SUITE_P(IsAck, IsACKTest, + Combine(ValuesIn(ValidFrameTypes()), + Values(~Http2FrameFlag::ACK, 0xff))); TEST_P(IsACKTest, IsAck) { const bool is_set = (flags_ & Http2FrameFlag::ACK) == Http2FrameFlag::ACK; Http2String flags_string; @@ -238,10 +236,9 @@ } class IsEndHeadersTest : public Http2FrameHeaderTypeAndFlagTest {}; -INSTANTIATE_TEST_CASE_P(IsEndHeaders, - IsEndHeadersTest, - Combine(ValuesIn(ValidFrameTypes()), - Values(~Http2FrameFlag::END_HEADERS, 0xff))); +INSTANTIATE_TEST_SUITE_P(IsEndHeaders, IsEndHeadersTest, + Combine(ValuesIn(ValidFrameTypes()), + Values(~Http2FrameFlag::END_HEADERS, 0xff))); TEST_P(IsEndHeadersTest, IsEndHeaders) { const bool is_set = (flags_ & Http2FrameFlag::END_HEADERS) == Http2FrameFlag::END_HEADERS; @@ -279,10 +276,9 @@ } class IsPaddedTest : public Http2FrameHeaderTypeAndFlagTest {}; -INSTANTIATE_TEST_CASE_P(IsPadded, - IsPaddedTest, - Combine(ValuesIn(ValidFrameTypes()), - Values(~Http2FrameFlag::PADDED, 0xff))); +INSTANTIATE_TEST_SUITE_P(IsPadded, IsPaddedTest, + Combine(ValuesIn(ValidFrameTypes()), + Values(~Http2FrameFlag::PADDED, 0xff))); TEST_P(IsPaddedTest, IsPadded) { const bool is_set = (flags_ & Http2FrameFlag::PADDED) == Http2FrameFlag::PADDED; @@ -318,10 +314,9 @@ } class HasPriorityTest : public Http2FrameHeaderTypeAndFlagTest {}; -INSTANTIATE_TEST_CASE_P(HasPriority, - HasPriorityTest, - Combine(ValuesIn(ValidFrameTypes()), - Values(~Http2FrameFlag::PRIORITY, 0xff))); +INSTANTIATE_TEST_SUITE_P(HasPriority, HasPriorityTest, + Combine(ValuesIn(ValidFrameTypes()), + Values(~Http2FrameFlag::PRIORITY, 0xff))); TEST_P(HasPriorityTest, HasPriority) { const bool is_set = (flags_ & Http2FrameFlag::PRIORITY) == Http2FrameFlag::PRIORITY;
diff --git a/spdy/core/hpack/hpack_decoder_adapter_test.cc b/spdy/core/hpack/hpack_decoder_adapter_test.cc index 765c2ea..9c94126 100644 --- a/spdy/core/hpack/hpack_decoder_adapter_test.cc +++ b/spdy/core/hpack/hpack_decoder_adapter_test.cc
@@ -259,15 +259,13 @@ size_t bytes_passed_in_; }; -INSTANTIATE_TEST_CASE_P( - NoHandler, - HpackDecoderAdapterTest, +INSTANTIATE_TEST_SUITE_P( + NoHandler, HpackDecoderAdapterTest, ::testing::Combine(::testing::Values(START_WITHOUT_HANDLER, NO_START), ::testing::Bool())); -INSTANTIATE_TEST_CASE_P( - WithHandler, - HpackDecoderAdapterTest, +INSTANTIATE_TEST_SUITE_P( + WithHandler, HpackDecoderAdapterTest, ::testing::Combine(::testing::Values(START_WITH_HANDLER), ::testing::Bool()));
diff --git a/spdy/core/hpack/hpack_encoder_test.cc b/spdy/core/hpack/hpack_encoder_test.cc index 8ead1c2..7d7d37d 100644 --- a/spdy/core/hpack/hpack_encoder_test.cc +++ b/spdy/core/hpack/hpack_encoder_test.cc
@@ -207,7 +207,8 @@ bool use_incremental_; }; -INSTANTIATE_TEST_CASE_P(HpackEncoderTests, HpackEncoderTest, ::testing::Bool()); +INSTANTIATE_TEST_SUITE_P(HpackEncoderTests, HpackEncoderTest, + ::testing::Bool()); TEST_P(HpackEncoderTest, SingleDynamicIndex) { encoder_.SetHeaderListener(
diff --git a/spdy/core/hpack/hpack_round_trip_test.cc b/spdy/core/hpack/hpack_round_trip_test.cc index 4b3a848..bd4d6ee 100644 --- a/spdy/core/hpack/hpack_round_trip_test.cc +++ b/spdy/core/hpack/hpack_round_trip_test.cc
@@ -78,11 +78,9 @@ HpackDecoderAdapter decoder_; }; -INSTANTIATE_TEST_CASE_P(Tests, - HpackRoundTripTest, - ::testing::Values(ALL_INPUT, - ONE_BYTE, - ZERO_THEN_ONE_BYTE)); +INSTANTIATE_TEST_SUITE_P(Tests, HpackRoundTripTest, + ::testing::Values(ALL_INPUT, ONE_BYTE, + ZERO_THEN_ONE_BYTE)); TEST_P(HpackRoundTripTest, ResponseFixtures) { {
diff --git a/spdy/core/spdy_framer_test.cc b/spdy/core/spdy_framer_test.cc index a08d7d7..3841172 100644 --- a/spdy/core/spdy_framer_test.cc +++ b/spdy/core/spdy_framer_test.cc
@@ -615,9 +615,8 @@ Http2DecoderAdapter deframer_; }; -INSTANTIATE_TEST_CASE_P(SpdyFramerTests, - SpdyFramerTest, - ::testing::Values(USE, NOT_USE)); +INSTANTIATE_TEST_SUITE_P(SpdyFramerTests, SpdyFramerTest, + ::testing::Values(USE, NOT_USE)); // Test that we can encode and decode a SpdyHeaderBlock in serialized form. TEST_P(SpdyFramerTest, HeaderBlockInBuffer) {