Removes http2_test_helpers.h from //third_party/http2/platform/api. PiperOrigin-RevId: 441483036
diff --git a/quiche/common/platform/api/quiche_test_helpers.h b/quiche/common/platform/api/quiche_test_helpers.h index 2dbe611..5b67812 100644 --- a/quiche/common/platform/api/quiche_test_helpers.h +++ b/quiche/common/platform/api/quiche_test_helpers.h
@@ -5,4 +5,10 @@ #define EXPECT_QUICHE_BUG EXPECT_QUICHE_BUG_IMPL +#define VERIFY_AND_RETURN_SUCCESS(expression) \ + { \ + VERIFY_SUCCESS(expression); \ + return ::testing::AssertionSuccess(); \ + } + #endif // QUICHE_COMMON_PLATFORM_API_QUICHE_TEST_HELPERS_H_
diff --git a/quiche/http2/decoder/decode_buffer_test.cc b/quiche/http2/decoder/decode_buffer_test.cc index f8739a7..c72e32b 100644 --- a/quiche/http2/decoder/decode_buffer_test.cc +++ b/quiche/http2/decoder/decode_buffer_test.cc
@@ -7,7 +7,6 @@ #include <functional> #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/decoder/decode_http2_structures_test.cc b/quiche/http2/decoder/decode_http2_structures_test.cc index 1c3f9bd..a85859a 100644 --- a/quiche/http2/decoder/decode_http2_structures_test.cc +++ b/quiche/http2/decoder/decode_http2_structures_test.cc
@@ -17,7 +17,6 @@ #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures_test_util.h" #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/common/platform/api/quiche_test.h"
diff --git a/quiche/http2/decoder/http2_frame_decoder_test.cc b/quiche/http2/decoder/http2_frame_decoder_test.cc index 8269500..fb6b2f5 100644 --- a/quiche/http2/decoder/http2_frame_decoder_test.cc +++ b/quiche/http2/decoder/http2_frame_decoder_test.cc
@@ -13,11 +13,11 @@ #include "quiche/http2/http2_constants.h" #include "quiche/http2/platform/api/http2_flags.h" #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector_listener.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionSuccess;
diff --git a/quiche/http2/decoder/http2_structure_decoder_test.cc b/quiche/http2/decoder/http2_structure_decoder_test.cc index 44bf785..5f5660c 100644 --- a/quiche/http2/decoder/http2_structure_decoder_test.cc +++ b/quiche/http2/decoder/http2_structure_decoder_test.cc
@@ -29,9 +29,9 @@ #include "quiche/http2/http2_constants.h" #include "quiche/http2/http2_structures_test_util.h" #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionSuccess;
diff --git a/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc b/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc index c460b0b..5df8899 100644 --- a/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc +++ b/quiche/http2/decoder/payload_decoders/data_payload_decoder_test.cc
@@ -14,13 +14,13 @@ #include "quiche/http2/http2_structures.h" #include "quiche/http2/http2_structures_test_util.h" #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/test_tools/frame_parts.h" #include "quiche/http2/test_tools/frame_parts_collector.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" #include "quiche/http2/tools/random_decoder_test.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" namespace http2 { namespace test {
diff --git a/quiche/http2/hpack/decoder/hpack_block_collector.cc b/quiche/http2/hpack/decoder/hpack_block_collector.cc index 620da14..180dd24 100644 --- a/quiche/http2/hpack/decoder/hpack_block_collector.cc +++ b/quiche/http2/hpack/decoder/hpack_block_collector.cc
@@ -8,7 +8,7 @@ #include <memory> #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionResult; using ::testing::AssertionSuccess;
diff --git a/quiche/http2/hpack/decoder/hpack_block_decoder_test.cc b/quiche/http2/hpack/decoder/hpack_block_decoder_test.cc index 2cac66c..25d603e 100644 --- a/quiche/http2/hpack/decoder/hpack_block_decoder_test.cc +++ b/quiche/http2/hpack/decoder/hpack_block_decoder_test.cc
@@ -15,10 +15,10 @@ #include "quiche/http2/hpack/http2_hpack_constants.h" #include "quiche/http2/hpack/tools/hpack_block_builder.h" #include "quiche/http2/hpack/tools/hpack_example.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/random_decoder_test.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" namespace http2 { namespace test {
diff --git a/quiche/http2/hpack/decoder/hpack_decoder_state_test.cc b/quiche/http2/hpack/decoder/hpack_decoder_state_test.cc index 566b617..03a4751 100644 --- a/quiche/http2/hpack/decoder/hpack_decoder_state_test.cc +++ b/quiche/http2/hpack/decoder/hpack_decoder_state_test.cc
@@ -13,8 +13,8 @@ #include "quiche/http2/hpack/http2_hpack_constants.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionResult; using ::testing::AssertionSuccess;
diff --git a/quiche/http2/hpack/decoder/hpack_decoder_string_buffer_test.cc b/quiche/http2/hpack/decoder/hpack_decoder_string_buffer_test.cc index 3cd5f82..6378538 100644 --- a/quiche/http2/hpack/decoder/hpack_decoder_string_buffer_test.cc +++ b/quiche/http2/hpack/decoder/hpack_decoder_string_buffer_test.cc
@@ -10,8 +10,8 @@ #include "absl/strings/escaping.h" #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionResult; using ::testing::AssertionSuccess;
diff --git a/quiche/http2/hpack/decoder/hpack_decoder_tables_test.cc b/quiche/http2/hpack/decoder/hpack_decoder_tables_test.cc index 93ffa73..cd4655b 100644 --- a/quiche/http2/hpack/decoder/hpack_decoder_tables_test.cc +++ b/quiche/http2/hpack/decoder/hpack_decoder_tables_test.cc
@@ -11,10 +11,10 @@ #include "quiche/http2/hpack/http2_hpack_constants.h" #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/random_util.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionResult; using ::testing::AssertionSuccess;
diff --git a/quiche/http2/hpack/decoder/hpack_decoder_test.cc b/quiche/http2/hpack/decoder/hpack_decoder_test.cc index 9974421..18b7b64 100644 --- a/quiche/http2/hpack/decoder/hpack_decoder_test.cc +++ b/quiche/http2/hpack/decoder/hpack_decoder_test.cc
@@ -20,10 +20,10 @@ #include "quiche/http2/hpack/tools/hpack_example.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/random_util.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionResult; using ::testing::AssertionSuccess;
diff --git a/quiche/http2/hpack/decoder/hpack_entry_collector.cc b/quiche/http2/hpack/decoder/hpack_entry_collector.cc index 853b99a..d2e7e2e 100644 --- a/quiche/http2/hpack/decoder/hpack_entry_collector.cc +++ b/quiche/http2/hpack/decoder/hpack_entry_collector.cc
@@ -8,8 +8,8 @@ #include "quiche/http2/hpack/decoder/hpack_string_collector.h" #include "quiche/http2/hpack/http2_hpack_constants.h" #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionResult;
diff --git a/quiche/http2/hpack/decoder/hpack_entry_decoder_test.cc b/quiche/http2/hpack/decoder/hpack_entry_decoder_test.cc index a748d73..5307767 100644 --- a/quiche/http2/hpack/decoder/hpack_entry_decoder_test.cc +++ b/quiche/http2/hpack/decoder/hpack_entry_decoder_test.cc
@@ -10,10 +10,10 @@ #include "quiche/http2/hpack/decoder/hpack_entry_collector.h" #include "quiche/http2/hpack/tools/hpack_block_builder.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/random_decoder_test.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" namespace http2 { namespace test {
diff --git a/quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc b/quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc index 4aaff79..be0d5ac 100644 --- a/quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc +++ b/quiche/http2/hpack/decoder/hpack_entry_type_decoder_test.cc
@@ -8,9 +8,9 @@ #include "quiche/http2/hpack/tools/hpack_block_builder.h" #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/tools/random_decoder_test.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionSuccess;
diff --git a/quiche/http2/hpack/decoder/hpack_string_collector.cc b/quiche/http2/hpack/decoder/hpack_string_collector.cc index d9fa440..5709f2d 100644 --- a/quiche/http2/hpack/decoder/hpack_string_collector.cc +++ b/quiche/http2/hpack/decoder/hpack_string_collector.cc
@@ -11,8 +11,8 @@ #include "absl/strings/escaping.h" #include "absl/strings/str_cat.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" namespace http2 { namespace test {
diff --git a/quiche/http2/hpack/decoder/hpack_string_decoder_test.cc b/quiche/http2/hpack/decoder/hpack_string_decoder_test.cc index 58b4abc..cfdb20a 100644 --- a/quiche/http2/hpack/decoder/hpack_string_decoder_test.cc +++ b/quiche/http2/hpack/decoder/hpack_string_decoder_test.cc
@@ -10,10 +10,10 @@ #include "quiche/http2/hpack/decoder/hpack_string_collector.h" #include "quiche/http2/hpack/decoder/hpack_string_decoder_listener.h" #include "quiche/http2/hpack/tools/hpack_block_builder.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/random_decoder_test.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" namespace http2 { namespace test {
diff --git a/quiche/http2/hpack/decoder/hpack_whole_entry_buffer_test.cc b/quiche/http2/hpack/decoder/hpack_whole_entry_buffer_test.cc index ea20564..5c8ba80 100644 --- a/quiche/http2/hpack/decoder/hpack_whole_entry_buffer_test.cc +++ b/quiche/http2/hpack/decoder/hpack_whole_entry_buffer_test.cc
@@ -7,7 +7,6 @@ // Tests of HpackWholeEntryBuffer: does it buffer correctly, and does it // detect Huffman decoding errors and oversize string errors? -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/common/platform/api/quiche_test.h" using ::testing::_;
diff --git a/quiche/http2/hpack/http2_hpack_constants_test.cc b/quiche/http2/hpack/http2_hpack_constants_test.cc index 277492e..61b465f 100644 --- a/quiche/http2/hpack/http2_hpack_constants_test.cc +++ b/quiche/http2/hpack/http2_hpack_constants_test.cc
@@ -7,7 +7,7 @@ #include <sstream> #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" +#include "quiche/common/platform/api/quiche_test.h" namespace http2 { namespace test {
diff --git a/quiche/http2/hpack/huffman/hpack_huffman_decoder_test.cc b/quiche/http2/hpack/huffman/hpack_huffman_decoder_test.cc index d73acd5..728d3d4 100644 --- a/quiche/http2/hpack/huffman/hpack_huffman_decoder_test.cc +++ b/quiche/http2/hpack/huffman/hpack_huffman_decoder_test.cc
@@ -12,9 +12,9 @@ #include "absl/strings/escaping.h" #include "quiche/http2/decoder/decode_buffer.h" #include "quiche/http2/decoder/decode_status.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/tools/random_decoder_test.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" namespace http2 { namespace test {
diff --git a/quiche/http2/http2_constants_test.cc b/quiche/http2/http2_constants_test.cc index 34cc60a..1044b80 100644 --- a/quiche/http2/http2_constants_test.cc +++ b/quiche/http2/http2_constants_test.cc
@@ -4,7 +4,6 @@ #include "quiche/http2/http2_constants.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/common/platform/api/quiche_test.h" namespace http2 {
diff --git a/quiche/http2/http2_structures_test.cc b/quiche/http2/http2_structures_test.cc index 2cb6a30..9fae635 100644 --- a/quiche/http2/http2_structures_test.cc +++ b/quiche/http2/http2_structures_test.cc
@@ -21,9 +21,9 @@ #include "absl/strings/str_cat.h" #include "quiche/http2/http2_structures_test_util.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionResult; using ::testing::AssertionSuccess;
diff --git a/quiche/http2/http2_structures_test_util.h b/quiche/http2/http2_structures_test_util.h index 4a665de..fb9aa5e 100644 --- a/quiche/http2/http2_structures_test_util.h +++ b/quiche/http2/http2_structures_test_util.h
@@ -8,9 +8,9 @@ #include <string> #include "quiche/http2/http2_structures.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/http2/tools/http2_frame_builder.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" namespace http2 { namespace test {
diff --git a/quiche/http2/platform/api/http2_test_helpers.h b/quiche/http2/platform/api/http2_test_helpers.h deleted file mode 100644 index 07d2906..0000000 --- a/quiche/http2/platform/api/http2_test_helpers.h +++ /dev/null
@@ -1,15 +0,0 @@ -#ifndef QUICHE_HTTP2_PLATFORM_API_HTTP2_TEST_HELPERS_H_ -#define QUICHE_HTTP2_PLATFORM_API_HTTP2_TEST_HELPERS_H_ - -// Provides VERIFY_* macros, similar to EXPECT_* and ASSERT_*, but they return -// an AssertionResult if the condition is not satisfied. -#include "quiche/common/platform/api/quiche_test.h" -#include "quiche/common/platform/api/quiche_test_helpers.h" - -#define VERIFY_AND_RETURN_SUCCESS(expression) \ - { \ - VERIFY_SUCCESS(expression); \ - return ::testing::AssertionSuccess(); \ - } - -#endif // QUICHE_HTTP2_PLATFORM_API_HTTP2_TEST_HELPERS_H_
diff --git a/quiche/http2/test_tools/frame_parts.cc b/quiche/http2/test_tools/frame_parts.cc index bfdb2a4..90db520 100644 --- a/quiche/http2/test_tools/frame_parts.cc +++ b/quiche/http2/test_tools/frame_parts.cc
@@ -9,8 +9,8 @@ #include "absl/strings/escaping.h" #include "quiche/http2/http2_structures_test_util.h" #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionFailure; using ::testing::AssertionResult;
diff --git a/quiche/http2/tools/random_decoder_test.cc b/quiche/http2/tools/random_decoder_test.cc index 6b55db8..134dda8 100644 --- a/quiche/http2/tools/random_decoder_test.cc +++ b/quiche/http2/tools/random_decoder_test.cc
@@ -13,8 +13,8 @@ #include "quiche/http2/decoder/decode_status.h" #include "quiche/http2/http2_constants.h" #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" using ::testing::AssertionResult;
diff --git a/quiche/http2/tools/random_decoder_test.h b/quiche/http2/tools/random_decoder_test.h index e6c9b79..9b4b102 100644 --- a/quiche/http2/tools/random_decoder_test.h +++ b/quiche/http2/tools/random_decoder_test.h
@@ -21,9 +21,9 @@ #include "quiche/http2/decoder/decode_buffer.h" #include "quiche/http2/decoder/decode_status.h" #include "quiche/http2/platform/api/http2_logging.h" -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/http2/test_tools/http2_random.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" namespace http2 { namespace test { @@ -54,7 +54,7 @@ // Base class for tests of the ability to decode a sequence of bytes with // various boundaries between the DecodeBuffers provided to the decoder. -class RandomDecoderTest : public QuicheTest { +QUICHE_NO_EXPORT class RandomDecoderTest : public QuicheTest { public: // SelectSize returns the size of the next DecodeBuffer to be passed to the // decoder. Note that RandomDecoderTest allows that size to be zero, though
diff --git a/quiche/spdy/core/spdy_protocol_test_utils.h b/quiche/spdy/core/spdy_protocol_test_utils.h index 1f147a6..515a903 100644 --- a/quiche/spdy/core/spdy_protocol_test_utils.h +++ b/quiche/spdy/core/spdy_protocol_test_utils.h
@@ -19,9 +19,9 @@ #include <typeinfo> -#include "quiche/http2/platform/api/http2_test_helpers.h" #include "quiche/common/platform/api/quiche_logging.h" #include "quiche/common/platform/api/quiche_test.h" +#include "quiche/common/platform/api/quiche_test_helpers.h" #include "quiche/spdy/core/spdy_protocol.h" #include "quiche/spdy/core/spdy_test_utils.h"