diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD index 7358914cf72ed..ac2a7e75c0b7b 100644 --- a/bazel/external/quiche.BUILD +++ b/bazel/external/quiche.BUILD @@ -85,6 +85,20 @@ envoy_cc_library( ], ) +envoy_cc_test( + name = "http2_adapter_callback_visitor_test", + srcs = ["quiche/http2/adapter/callback_visitor_test.cc"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_callback_visitor", + ":http2_adapter_mock_nghttp2_callbacks", + ":http2_adapter_nghttp2_test_utils", + ":http2_adapter_test_utils", + ":quiche_common_platform_test", + ], +) + envoy_cc_library( name = "http2_adapter_data_source", hdrs = ["quiche/http2/adapter/data_source.h"], @@ -107,6 +121,19 @@ envoy_cc_library( ], ) +envoy_cc_test( + name = "http2_adapter_event_forwarder_test", + srcs = ["quiche/http2/adapter/event_forwarder_test.cc"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_event_forwarder", + ":quiche_common_platform_test", + ":spdy_core_mock_spdy_framer_visitor_lib", + ":spdy_core_protocol_lib", + ], +) + envoy_cc_library( name = "http2_adapter_header_validator", srcs = ["quiche/http2/adapter/header_validator.cc"], @@ -119,6 +146,17 @@ envoy_cc_library( ], ) +envoy_cc_test( + name = "http2_adapter_header_validator_test", + srcs = ["quiche/http2/adapter/header_validator_test.cc"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_header_validator", + ":quiche_common_platform_test", + ], +) + envoy_cc_library( name = "http2_adapter_http2_protocol", srcs = ["quiche/http2/adapter/http2_protocol.cc"], @@ -155,6 +193,20 @@ envoy_cc_library( ], ) +envoy_cc_test( + name = "http2_adapter_impl_comparison_test", + srcs = ["quiche/http2/adapter/adapter_impl_comparison_test.cc"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter", + ":http2_adapter_http2_protocol", + ":http2_adapter_recording_http2_visitor", + ":http2_adapter_test_frame_sequence", + ":quiche_common_platform_test", + ], +) + envoy_cc_library( name = "http2_adapter_interface_lib", hdrs = [ @@ -171,6 +223,31 @@ envoy_cc_library( ], ) +envoy_cc_test_library( + name = "http2_adapter_mock_http2_visitor", + hdrs = ["quiche/http2/adapter/mock_http2_visitor.h"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_http2_visitor_interface", + ":quiche_common_platform_export", + ":quiche_common_platform_test", + ], +) + +envoy_cc_test_library( + name = "http2_adapter_mock_nghttp2_callbacks", + srcs = ["quiche/http2/adapter/mock_nghttp2_callbacks.cc"], + hdrs = ["quiche/http2/adapter/mock_nghttp2_callbacks.h"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_nghttp2_include", + ":http2_adapter_nghttp2_util", + ":quiche_common_platform_test", + ], +) + envoy_cc_library( name = "http2_adapter_nghttp2_adapter", srcs = [ @@ -201,6 +278,25 @@ envoy_cc_library( ], ) +envoy_cc_test( + name = "http2_adapter_nghttp2_adapter_test", + srcs = ["quiche/http2/adapter/nghttp2_adapter_test.cc"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_http2_protocol", + ":http2_adapter_http2_visitor_interface", + ":http2_adapter_mock_http2_visitor", + ":http2_adapter_nghttp2_adapter", + ":http2_adapter_nghttp2_include", + ":http2_adapter_nghttp2_test_utils", + ":http2_adapter_oghttp2_util", + ":http2_adapter_test_frame_sequence", + ":http2_adapter_test_utils", + ":quiche_common_platform_test", + ], +) + envoy_cc_library( name = "http2_adapter_nghttp2_callbacks", srcs = ["quiche/http2/adapter/nghttp2_callbacks.cc"], @@ -233,6 +329,18 @@ envoy_cc_library( ], ) +envoy_cc_test( + name = "http2_adapter_nghttp2_data_provider_test", + srcs = ["quiche/http2/adapter/nghttp2_data_provider_test.cc"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_nghttp2_data_provider", + ":http2_adapter_test_utils", + ":quiche_common_platform_test", + ], +) + envoy_cc_library( name = "http2_adapter_nghttp2_include", hdrs = ["quiche/http2/adapter/nghttp2.h"], @@ -241,6 +349,38 @@ envoy_cc_library( repository = "@envoy", ) +envoy_cc_test( + name = "http2_adapter_nghttp2_session_test", + srcs = ["quiche/http2/adapter/nghttp2_session_test.cc"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter", + ":http2_adapter_mock_http2_visitor", + ":http2_adapter_nghttp2_callbacks", + ":http2_adapter_nghttp2_util", + ":http2_adapter_test_frame_sequence", + ":http2_adapter_test_utils", + ":quiche_common_platform_test", + ":quiche_common_platform_test_helpers_lib", + ], +) + +envoy_cc_test_library( + name = "http2_adapter_nghttp2_test_utils", + srcs = ["quiche/http2/adapter/nghttp2_test_utils.cc"], + hdrs = ["quiche/http2/adapter/nghttp2_test_utils.h"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_http2_protocol", + ":http2_adapter_nghttp2_include", + ":http2_adapter_nghttp2_util", + ":quiche_common_platform_export", + ":quiche_common_platform_test", + ], +) + envoy_cc_library( name = "http2_adapter_nghttp2_util", srcs = ["quiche/http2/adapter/nghttp2_util.cc"], @@ -257,6 +397,19 @@ envoy_cc_library( ], ) +envoy_cc_test( + name = "http2_adapter_nghttp2_util_test", + srcs = ["quiche/http2/adapter/nghttp2_util_test.cc"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_nghttp2_test_utils", + ":http2_adapter_nghttp2_util", + ":http2_adapter_test_utils", + ":quiche_common_platform_test", + ], +) + envoy_cc_library( name = "http2_adapter_oghttp2_adapter", srcs = [ @@ -294,6 +447,38 @@ envoy_cc_library( ], ) +envoy_cc_test( + name = "http2_adapter_oghttp2_adapter_test", + srcs = ["quiche/http2/adapter/oghttp2_adapter_test.cc"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_http2_protocol", + ":http2_adapter_http2_visitor_interface", + ":http2_adapter_mock_http2_visitor", + ":http2_adapter_oghttp2_adapter", + ":http2_adapter_oghttp2_util", + ":http2_adapter_test_frame_sequence", + ":http2_adapter_test_utils", + ":quiche_common_platform_test", + ":quiche_common_platform_test_helpers_lib", + ], +) + +envoy_cc_test( + name = "http2_adapter_oghttp2_session_test", + srcs = ["quiche/http2/adapter/oghttp2_session_test.cc"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_mock_http2_visitor", + ":http2_adapter_oghttp2_adapter", + ":http2_adapter_test_frame_sequence", + ":http2_adapter_test_utils", + ":quiche_common_platform_test", + ], +) + envoy_cc_library( name = "http2_adapter_oghttp2_util", srcs = ["quiche/http2/adapter/oghttp2_util.cc"], @@ -307,6 +492,95 @@ envoy_cc_library( ], ) +envoy_cc_test( + name = "http2_adapter_oghttp2_util_test", + srcs = ["quiche/http2/adapter/oghttp2_util_test.cc"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_http2_protocol", + ":http2_adapter_oghttp2_util", + ":http2_adapter_test_frame_sequence", + ":quiche_common_platform_test", + ], +) + +envoy_cc_test_library( + name = "http2_adapter_recording_http2_visitor", + srcs = ["quiche/http2/adapter/recording_http2_visitor.cc"], + hdrs = ["quiche/http2/adapter/recording_http2_visitor.h"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_http2_protocol", + ":http2_adapter_http2_util", + ":http2_adapter_http2_visitor_interface", + ":quiche_common_platform_export", + ":quiche_common_platform_test", + ], +) + +envoy_cc_test( + name = "http2_adapter_recording_http2_visitor_test", + srcs = ["quiche/http2/adapter/recording_http2_visitor_test.cc"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_http2_protocol", + ":http2_adapter_http2_visitor_interface", + ":http2_adapter_recording_http2_visitor", + ":http2_test_tools_random", + ":quiche_common_platform_test", + ], +) + +envoy_cc_test_library( + name = "http2_adapter_test_frame_sequence", + srcs = ["quiche/http2/adapter/test_frame_sequence.cc"], + hdrs = ["quiche/http2/adapter/test_frame_sequence.h"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_http2_protocol", + ":http2_adapter_http2_util", + ":http2_adapter_oghttp2_util", + ":quiche_common_platform_export", + ":spdy_core_framer_lib", + ":spdy_core_hpack_hpack_lib", + ":spdy_core_protocol_lib", + ], +) + +envoy_cc_test_library( + name = "http2_adapter_test_utils", + srcs = ["quiche/http2/adapter/test_utils.cc"], + hdrs = ["quiche/http2/adapter/test_utils.h"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_data_source", + ":http2_adapter_http2_protocol", + ":http2_adapter_http2_visitor_interface", + ":http2_adapter_mock_http2_visitor", + ":quiche_common_platform_test", + ":spdy_core_header_block_lib", + ":spdy_core_hpack_hpack_lib", + ":spdy_core_protocol_lib", + ], +) + +envoy_cc_test_library( + name = "http2_adapter_test_utils_test", + srcs = ["quiche/http2/adapter/test_utils_test.cc"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_test_utils", + ":quiche_common_platform_test", + ":spdy_core_framer_lib", + ], +) + envoy_cc_library( name = "http2_adapter_window_manager", srcs = ["quiche/http2/adapter/window_manager.cc"], @@ -319,6 +593,21 @@ envoy_cc_library( ], ) +envoy_cc_test( + name = "http2_adapter_window_manager_test", + srcs = ["quiche/http2/adapter/window_manager_test.cc"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":http2_adapter_window_manager", + ":http2_test_tools_random", + ":quiche_common_platform_export", + ":quiche_common_platform_test", + ":quiche_common_platform_test_helpers_lib", + "@com_google_absl//absl/functional:bind_front", + ], +) + envoy_cc_library( name = "http2_adapter", copts = quiche_copts, @@ -1215,6 +1504,20 @@ envoy_cc_library( ], ) +envoy_cc_test_library( + name = "spdy_core_mock_spdy_framer_visitor_lib", + srcs = ["quiche/spdy/core/mock_spdy_framer_visitor.cc"], + hdrs = ["quiche/spdy/core/mock_spdy_framer_visitor.h"], + copts = quiche_copts, + repository = "@envoy", + deps = [ + ":quiche_common_platform_test", + ":spdy_core_http2_deframer_lib", + ":spdy_core_recording_headers_handler_lib", + ":spdy_core_test_utils_lib", + ], +) + envoy_cc_library( name = "spdy_core_protocol_lib", srcs = ["quiche/spdy/core/spdy_protocol.cc"], diff --git a/test/common/quic/platform/quiche_test_helpers_impl.h b/test/common/quic/platform/quiche_test_helpers_impl.h index 25123c0f9dbc9..3510d9a1df2ea 100644 --- a/test/common/quic/platform/quiche_test_helpers_impl.h +++ b/test/common/quic/platform/quiche_test_helpers_impl.h @@ -6,6 +6,4 @@ // consumed or referenced directly by other Envoy code. It serves purely as a // porting layer for QUICHE. -#include "quiche_platform_impl/quic_expect_bug_impl.h" - -#define EXPECT_QUICHE_BUG_IMPL EXPECT_QUIC_BUG_IMPL +#include "quiche_platform_impl/quiche_expect_bug_impl.h"