From 1b0efd13eff5438b9d2405ea33b5ac57bce5df6b Mon Sep 17 00:00:00 2001 From: suetfei Date: Fri, 21 Jan 2022 11:33:32 -0800 Subject: [PATCH] Internal change. PiperOrigin-RevId: 423369197 --- README.md | 2 +- cpp/cal/public/ble_test.cc | 1 + cpp/core/core_test.cc | 1 + cpp/core/internal/base_endpoint_channel_test.cc | 1 + cpp/core/internal/base_pcp_handler_test.cc | 1 + cpp/core/internal/bwu_manager_test.cc | 1 + cpp/core/internal/client_proxy_test.cc | 1 + cpp/core/internal/encryption_runner_test.cc | 1 + cpp/core/internal/endpoint_channel_manager_test.cc | 1 + cpp/core/internal/endpoint_manager_test.cc | 1 + cpp/core/internal/internal_payload_factory_test.cc | 1 + cpp/core/internal/mediums/ble_test.cc | 1 + cpp/core/internal/mediums/bluetooth_classic_test.cc | 1 + cpp/core/internal/mediums/bluetooth_radio_test.cc | 1 + cpp/core/internal/mediums/uuid_test.cc | 1 + cpp/core/internal/mediums/webrtc/connection_flow_test.cc | 1 + .../internal/mediums/webrtc/signaling_frames_test.cc | 9 +++++---- .../internal/mediums/webrtc/webrtc_socket_impl_test.cc | 1 + cpp/core/internal/mediums/webrtc_peer_id_test.cc | 1 + cpp/core/internal/mediums/webrtc_test.cc | 1 + cpp/core/internal/mediums/wifi_lan_test.cc | 1 + cpp/core/internal/mock_service_controller.h | 1 + cpp/core/internal/mock_service_controller_router.h | 1 + cpp/core/internal/offline_frames_test.cc | 3 ++- cpp/core/internal/offline_frames_validator_test.cc | 1 + cpp/core/internal/offline_service_controller_test.cc | 1 + cpp/core/internal/p2p_cluster_pcp_handler_test.cc | 1 + cpp/core/internal/payload_manager_test.cc | 1 + cpp/core/internal/pcp_manager_test.cc | 1 + cpp/core/internal/service_controller_router_test.cc | 1 + cpp/core/listeners_test.cc | 1 + cpp/core/payload_test.cc | 1 + cpp/core/status_test.cc | 1 + cpp/platform/base/cancellation_flag_test.cc | 1 + cpp/platform/base/error_code_recorder_test.cc | 1 + cpp/platform/base/exception_test.cc | 1 + cpp/platform/impl/g3/crypto.cc | 2 +- cpp/platform/impl/g3/log_message.h | 2 +- cpp/platform/impl/g3/multi_thread_executor.h | 2 +- cpp/platform/impl/g3/scheduled_executor.h | 2 +- cpp/platform/impl/ios/Source/Platform/log_message.h | 2 +- cpp/platform/impl/windows/crypto.cc | 2 +- cpp/platform/impl/windows/log_message.h | 2 +- cpp/platform/public/atomic_boolean_test.cc | 1 + cpp/platform/public/ble_test.cc | 1 + cpp/platform/public/bluetooth_adapter_test.cc | 1 + cpp/platform/public/bluetooth_classic_test.cc | 1 + cpp/platform/public/cancelable_alarm_test.cc | 1 + cpp/platform/public/condition_variable_test.cc | 1 + cpp/platform/public/crypto_test.cc | 1 + cpp/platform/public/logging_test.cc | 1 + cpp/platform/public/wifi_lan_test.cc | 1 + internal/analytics/analytics_recorder_test.cc | 3 ++- 53 files changed, 59 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 23cbc0b6..587bb490 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ git submodule update --init --recursive # Building Nearby, Unit Testing and Sample Apps We support multiple platforms including Linux, iOS & Windows. The ultimate goal -is to build from source. The offical build system we support is +is to build from source (coming soon!). The offical build system we support is [bazel] (https://bazel.build). Before that is accomplished, we provide precompiled libraries as stop-gap solutions. See the following pages for platform specific instructions. diff --git a/cpp/cal/public/ble_test.cc b/cpp/cal/public/ble_test.cc index 104eff11..d7c01520 100644 --- a/cpp/cal/public/ble_test.cc +++ b/cpp/cal/public/ble_test.cc @@ -15,6 +15,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "third_party/nearby/cpp/cal/api/ble.h" #include "third_party/nearby/cpp/cal/base/ble_types.h" diff --git a/cpp/core/core_test.cc b/cpp/core/core_test.cc index 982baae7..63933d2d 100644 --- a/cpp/core/core_test.cc +++ b/cpp/core/core_test.cc @@ -15,6 +15,7 @@ #include "core/core.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/clock.h" #include "core/internal/mock_service_controller_router.h" diff --git a/cpp/core/internal/base_endpoint_channel_test.cc b/cpp/core/internal/base_endpoint_channel_test.cc index 9d8ebc7e..01c9873c 100644 --- a/cpp/core/internal/base_endpoint_channel_test.cc +++ b/cpp/core/internal/base_endpoint_channel_test.cc @@ -21,6 +21,7 @@ #include "securegcm/d2d_connection_context_v1.h" #include "securegcm/ukey2_handshake.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/synchronization/mutex.h" #include "absl/time/time.h" diff --git a/cpp/core/internal/base_pcp_handler_test.cc b/cpp/core/internal/base_pcp_handler_test.cc index 85d72c61..f63616bf 100644 --- a/cpp/core/internal/base_pcp_handler_test.cc +++ b/cpp/core/internal/base_pcp_handler_test.cc @@ -19,6 +19,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "connections/implementation/proto/offline_wire_formats.pb.h" diff --git a/cpp/core/internal/bwu_manager_test.cc b/cpp/core/internal/bwu_manager_test.cc index 050a4563..2877dec2 100644 --- a/cpp/core/internal/bwu_manager_test.cc +++ b/cpp/core/internal/bwu_manager_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "core/internal/client_proxy.h" diff --git a/cpp/core/internal/client_proxy_test.cc b/cpp/core/internal/client_proxy_test.cc index a4df5f0e..f55a9343 100644 --- a/cpp/core/internal/client_proxy_test.cc +++ b/cpp/core/internal/client_proxy_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/container/flat_hash_set.h" #include "absl/time/clock.h" diff --git a/cpp/core/internal/encryption_runner_test.cc b/cpp/core/internal/encryption_runner_test.cc index 7a4f93f4..b9013473 100644 --- a/cpp/core/internal/encryption_runner_test.cc +++ b/cpp/core/internal/encryption_runner_test.cc @@ -15,6 +15,7 @@ #include "core/internal/encryption_runner.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/clock.h" #include "core/internal/client_proxy.h" diff --git a/cpp/core/internal/endpoint_channel_manager_test.cc b/cpp/core/internal/endpoint_channel_manager_test.cc index f278a1d2..f183b02c 100644 --- a/cpp/core/internal/endpoint_channel_manager_test.cc +++ b/cpp/core/internal/endpoint_channel_manager_test.cc @@ -15,6 +15,7 @@ #include "core/internal/endpoint_channel_manager.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace location { diff --git a/cpp/core/internal/endpoint_manager_test.cc b/cpp/core/internal/endpoint_manager_test.cc index d3b49313..f18fde54 100644 --- a/cpp/core/internal/endpoint_manager_test.cc +++ b/cpp/core/internal/endpoint_manager_test.cc @@ -20,6 +20,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/synchronization/mutex.h" #include "absl/time/clock.h" diff --git a/cpp/core/internal/internal_payload_factory_test.cc b/cpp/core/internal/internal_payload_factory_test.cc index 53cb79e7..28a29774 100644 --- a/cpp/core/internal/internal_payload_factory_test.cc +++ b/cpp/core/internal/internal_payload_factory_test.cc @@ -18,6 +18,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "connections/implementation/proto/offline_wire_formats.pb.h" #include "core/internal/offline_frames.h" diff --git a/cpp/core/internal/mediums/ble_test.cc b/cpp/core/internal/mediums/ble_test.cc index 6f03e677..173feeec 100644 --- a/cpp/core/internal/mediums/ble_test.cc +++ b/cpp/core/internal/mediums/ble_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "core/internal/mediums/bluetooth_radio.h" #include "platform/base/medium_environment.h" diff --git a/cpp/core/internal/mediums/bluetooth_classic_test.cc b/cpp/core/internal/mediums/bluetooth_classic_test.cc index d386bea5..ca370105 100644 --- a/cpp/core/internal/mediums/bluetooth_classic_test.cc +++ b/cpp/core/internal/mediums/bluetooth_classic_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "core/internal/mediums/bluetooth_radio.h" diff --git a/cpp/core/internal/mediums/bluetooth_radio_test.cc b/cpp/core/internal/mediums/bluetooth_radio_test.cc index 1a10383d..d86c686e 100644 --- a/cpp/core/internal/mediums/bluetooth_radio_test.cc +++ b/cpp/core/internal/mediums/bluetooth_radio_test.cc @@ -15,6 +15,7 @@ #include "core/internal/mediums/bluetooth_radio.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace location { diff --git a/cpp/core/internal/mediums/uuid_test.cc b/cpp/core/internal/mediums/uuid_test.cc index f5a83032..173f2fc1 100644 --- a/cpp/core/internal/mediums/uuid_test.cc +++ b/cpp/core/internal/mediums/uuid_test.cc @@ -15,6 +15,7 @@ #include "core/internal/mediums/uuid.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "platform/public/crypto.h" #include "platform/public/logging.h" diff --git a/cpp/core/internal/mediums/webrtc/connection_flow_test.cc b/cpp/core/internal/mediums/webrtc/connection_flow_test.cc index 8dfc2401..c13fd23a 100644 --- a/cpp/core/internal/mediums/webrtc/connection_flow_test.cc +++ b/cpp/core/internal/mediums/webrtc/connection_flow_test.cc @@ -18,6 +18,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "core/internal/mediums/webrtc/session_description_wrapper.h" diff --git a/cpp/core/internal/mediums/webrtc/signaling_frames_test.cc b/cpp/core/internal/mediums/webrtc/signaling_frames_test.cc index 4105c7b7..5d00e58f 100644 --- a/cpp/core/internal/mediums/webrtc/signaling_frames_test.cc +++ b/cpp/core/internal/mediums/webrtc/signaling_frames_test.cc @@ -18,6 +18,7 @@ #include "google/protobuf/text_format.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "core/internal/mediums/webrtc_peer_id.h" @@ -86,7 +87,7 @@ TEST(SignalingFramesTest, SignalingPoke) { location::nearby::mediums::WebRtcSignalingFrame frame; frame.ParseFromString(std::string(encoded_poke.data(), encoded_poke.size())); - EXPECT_THAT(frame, testing::EqualsProto(R"pb( + EXPECT_THAT(frame, protobuf_matchers::EqualsProto(R"pb( sender_id { id: "abc" } type: READY_FOR_SIGNALING_POKE_TYPE ready_for_signaling_poke {} @@ -103,7 +104,7 @@ TEST(SignalingFramesTest, EncodeValidOffer) { frame.ParseFromString( std::string(encoded_offer.data(), encoded_offer.size())); - EXPECT_THAT(frame, testing::EqualsProto(kOfferProto)); + EXPECT_THAT(frame, protobuf_matchers::EqualsProto(kOfferProto)); } TEST(SignaingFramesTest, DecodeValidOffer) { @@ -128,7 +129,7 @@ TEST(SignalingFramesTest, EncodeValidAnswer) { frame.ParseFromString( std::string(encoded_answer.data(), encoded_answer.size())); - EXPECT_THAT(frame, testing::EqualsProto(kAnswerProto)); + EXPECT_THAT(frame, protobuf_matchers::EqualsProto(kAnswerProto)); } TEST(SignalingFramesTest, DecodeValidAnswer) { @@ -163,7 +164,7 @@ TEST(SignalingFramesTest, EncodeValidIceCandidates) { frame.ParseFromString( std::string(encoded_candidates.data(), encoded_candidates.size())); - EXPECT_THAT(frame, testing::EqualsProto(kIceCandidatesProto)); + EXPECT_THAT(frame, protobuf_matchers::EqualsProto(kIceCandidatesProto)); } TEST(SignalingFramesTest, DecodeValidIceCandidates) { diff --git a/cpp/core/internal/mediums/webrtc/webrtc_socket_impl_test.cc b/cpp/core/internal/mediums/webrtc/webrtc_socket_impl_test.cc index b88ce0bb..95487f3e 100644 --- a/cpp/core/internal/mediums/webrtc/webrtc_socket_impl_test.cc +++ b/cpp/core/internal/mediums/webrtc/webrtc_socket_impl_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "platform/base/byte_array.h" #include "webrtc/api/data_channel_interface.h" diff --git a/cpp/core/internal/mediums/webrtc_peer_id_test.cc b/cpp/core/internal/mediums/webrtc_peer_id_test.cc index 612d213c..e459b8d4 100644 --- a/cpp/core/internal/mediums/webrtc_peer_id_test.cc +++ b/cpp/core/internal/mediums/webrtc_peer_id_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "platform/base/byte_array.h" #include "platform/public/crypto.h" diff --git a/cpp/core/internal/mediums/webrtc_test.cc b/cpp/core/internal/mediums/webrtc_test.cc index 727c34e1..1ffbca67 100644 --- a/cpp/core/internal/mediums/webrtc_test.cc +++ b/cpp/core/internal/mediums/webrtc_test.cc @@ -15,6 +15,7 @@ #include "core/internal/mediums/webrtc.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "core/internal/mediums/webrtc_socket.h" #include "platform/base/listeners.h" diff --git a/cpp/core/internal/mediums/wifi_lan_test.cc b/cpp/core/internal/mediums/wifi_lan_test.cc index 4640363b..664b562c 100644 --- a/cpp/core/internal/mediums/wifi_lan_test.cc +++ b/cpp/core/internal/mediums/wifi_lan_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "platform/base/medium_environment.h" diff --git a/cpp/core/internal/mock_service_controller.h b/cpp/core/internal/mock_service_controller.h index 4a9345ec..bec72760 100644 --- a/cpp/core/internal/mock_service_controller.h +++ b/cpp/core/internal/mock_service_controller.h @@ -16,6 +16,7 @@ #define CORE_INTERNAL_MOCK_SERVICE_CONTROLLER_H_ #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "core/internal/service_controller.h" namespace location { diff --git a/cpp/core/internal/mock_service_controller_router.h b/cpp/core/internal/mock_service_controller_router.h index 91966511..ff8bc16a 100644 --- a/cpp/core/internal/mock_service_controller_router.h +++ b/cpp/core/internal/mock_service_controller_router.h @@ -16,6 +16,7 @@ #define CORE_INTERNAL_MOCK_SERVICE_CONTROLLER_ROUTER_H_ #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "core/internal/service_controller_router.h" namespace location { diff --git a/cpp/core/internal/offline_frames_test.cc b/cpp/core/internal/offline_frames_test.cc index d40b7b63..f8f56727 100644 --- a/cpp/core/internal/offline_frames_test.cc +++ b/cpp/core/internal/offline_frames_test.cc @@ -20,6 +20,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "connections/implementation/proto/offline_wire_formats.pb.h" @@ -32,7 +33,7 @@ namespace parser { namespace { using Medium = proto::connections::Medium; -using ::testing::EqualsProto; +using ::protobuf_matchers::EqualsProto; constexpr absl::string_view kEndpointId{"ABC"}; constexpr absl::string_view kEndpointName{"XYZ"}; diff --git a/cpp/core/internal/offline_frames_validator_test.cc b/cpp/core/internal/offline_frames_validator_test.cc index 69c10901..8749c16e 100644 --- a/cpp/core/internal/offline_frames_validator_test.cc +++ b/cpp/core/internal/offline_frames_validator_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "connections/implementation/proto/offline_wire_formats.pb.h" diff --git a/cpp/core/internal/offline_service_controller_test.cc b/cpp/core/internal/offline_service_controller_test.cc index 35f04845..a1e06755 100644 --- a/cpp/core/internal/offline_service_controller_test.cc +++ b/cpp/core/internal/offline_service_controller_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "core/internal/offline_simulation_user.h" #include "platform/base/medium_environment.h" diff --git a/cpp/core/internal/p2p_cluster_pcp_handler_test.cc b/cpp/core/internal/p2p_cluster_pcp_handler_test.cc index ead37497..095e7aa1 100644 --- a/cpp/core/internal/p2p_cluster_pcp_handler_test.cc +++ b/cpp/core/internal/p2p_cluster_pcp_handler_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "core/internal/bwu_manager.h" diff --git a/cpp/core/internal/payload_manager_test.cc b/cpp/core/internal/payload_manager_test.cc index 372642d3..0c098dc8 100644 --- a/cpp/core/internal/payload_manager_test.cc +++ b/cpp/core/internal/payload_manager_test.cc @@ -15,6 +15,7 @@ #include "core/internal/payload_manager.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "core/internal/simulation_user.h" diff --git a/cpp/core/internal/pcp_manager_test.cc b/cpp/core/internal/pcp_manager_test.cc index b5520837..0d008b94 100644 --- a/cpp/core/internal/pcp_manager_test.cc +++ b/cpp/core/internal/pcp_manager_test.cc @@ -18,6 +18,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "core/internal/endpoint_channel_manager.h" diff --git a/cpp/core/internal/service_controller_router_test.cc b/cpp/core/internal/service_controller_router_test.cc index 72b74492..b2ee6a23 100644 --- a/cpp/core/internal/service_controller_router_test.cc +++ b/cpp/core/internal/service_controller_router_test.cc @@ -21,6 +21,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/container/flat_hash_set.h" #include "absl/time/clock.h" diff --git a/cpp/core/listeners_test.cc b/cpp/core/listeners_test.cc index d2221db9..59420a74 100644 --- a/cpp/core/listeners_test.cc +++ b/cpp/core/listeners_test.cc @@ -18,6 +18,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace location { diff --git a/cpp/core/payload_test.cc b/cpp/core/payload_test.cc index f6d54c76..db32ea59 100644 --- a/cpp/core/payload_test.cc +++ b/cpp/core/payload_test.cc @@ -18,6 +18,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "platform/base/byte_array.h" #include "platform/base/input_stream.h" diff --git a/cpp/core/status_test.cc b/cpp/core/status_test.cc index 1f64be5b..0e76e608 100644 --- a/cpp/core/status_test.cc +++ b/cpp/core/status_test.cc @@ -15,6 +15,7 @@ #include "core/status.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace location { diff --git a/cpp/platform/base/cancellation_flag_test.cc b/cpp/platform/base/cancellation_flag_test.cc index a8a2dcbd..59bf5cca 100644 --- a/cpp/platform/base/cancellation_flag_test.cc +++ b/cpp/platform/base/cancellation_flag_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "platform/base/cancellation_flag_listener.h" #include "platform/base/feature_flags.h" diff --git a/cpp/platform/base/error_code_recorder_test.cc b/cpp/platform/base/error_code_recorder_test.cc index f0f84b93..a65a9d43 100644 --- a/cpp/platform/base/error_code_recorder_test.cc +++ b/cpp/platform/base/error_code_recorder_test.cc @@ -15,6 +15,7 @@ #include "platform/base/error_code_recorder.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace location { diff --git a/cpp/platform/base/exception_test.cc b/cpp/platform/base/exception_test.cc index 7916f06d..3a18244a 100644 --- a/cpp/platform/base/exception_test.cc +++ b/cpp/platform/base/exception_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "platform/base/exception_test.nc.h" diff --git a/cpp/platform/impl/g3/crypto.cc b/cpp/platform/impl/g3/crypto.cc index a6e9ad20..7f9273b8 100644 --- a/cpp/platform/impl/g3/crypto.cc +++ b/cpp/platform/impl/g3/crypto.cc @@ -19,7 +19,7 @@ #include "absl/strings/string_view.h" #include "platform/base/byte_array.h" -#include "openssl/digest.h" +#include "src/include/openssl/digest.h" namespace location { namespace nearby { diff --git a/cpp/platform/impl/g3/log_message.h b/cpp/platform/impl/g3/log_message.h index 63ecfd76..fdcacfaa 100644 --- a/cpp/platform/impl/g3/log_message.h +++ b/cpp/platform/impl/g3/log_message.h @@ -34,7 +34,7 @@ class LogMessage : public api::LogMessage { std::ostream& Stream() override; private: - absl::LogStreamer log_streamer_; + google::LogMessage log_streamer_; }; } // namespace g3 diff --git a/cpp/platform/impl/g3/multi_thread_executor.h b/cpp/platform/impl/g3/multi_thread_executor.h index 37373af1..14956333 100644 --- a/cpp/platform/impl/g3/multi_thread_executor.h +++ b/cpp/platform/impl/g3/multi_thread_executor.h @@ -20,7 +20,7 @@ #include "absl/time/clock.h" #include "platform/api/submittable_executor.h" #include "platform/impl/shared/count_down_latch.h" -#include "thread/threadpool.h" +#include "nisaba/port/thread_pool.h" namespace location { namespace nearby { diff --git a/cpp/platform/impl/g3/scheduled_executor.h b/cpp/platform/impl/g3/scheduled_executor.h index 7ffcf6c5..a6840fc9 100644 --- a/cpp/platform/impl/g3/scheduled_executor.h +++ b/cpp/platform/impl/g3/scheduled_executor.h @@ -23,7 +23,7 @@ #include "platform/api/scheduled_executor.h" #include "platform/base/runnable.h" #include "platform/impl/g3/single_thread_executor.h" -#include "thread/threadpool.h" +#include "nisaba/port/thread_pool.h" namespace location { namespace nearby { diff --git a/cpp/platform/impl/ios/Source/Platform/log_message.h b/cpp/platform/impl/ios/Source/Platform/log_message.h index a3fbc032..fa9b2c8f 100644 --- a/cpp/platform/impl/ios/Source/Platform/log_message.h +++ b/cpp/platform/impl/ios/Source/Platform/log_message.h @@ -36,7 +36,7 @@ class LogMessage : public api::LogMessage { std::ostream& Stream() override; private: - absl::LogStreamer log_streamer_; + google::LogMessage log_streamer_; api::LogMessage::Severity severity_; }; diff --git a/cpp/platform/impl/windows/crypto.cc b/cpp/platform/impl/windows/crypto.cc index 5904d04d..95c312ad 100644 --- a/cpp/platform/impl/windows/crypto.cc +++ b/cpp/platform/impl/windows/crypto.cc @@ -22,7 +22,7 @@ #if defined NEARBY_WINDOWS_DLL #include "openssl/boringssl/src/include/openssl/digest.h" #else -#include "openssl/digest.h" +#include "src/include/openssl/digest.h" #endif // Function implementations for platform/api/crypto.h. diff --git a/cpp/platform/impl/windows/log_message.h b/cpp/platform/impl/windows/log_message.h index 90d84bb8..5d7aa899 100644 --- a/cpp/platform/impl/windows/log_message.h +++ b/cpp/platform/impl/windows/log_message.h @@ -34,7 +34,7 @@ class LogMessage : public api::LogMessage { std::ostream& Stream() override; private: - absl::LogStreamer log_streamer_; + google::LogMessage log_streamer_; static api::LogMessage::Severity min_log_severity_; }; diff --git a/cpp/platform/public/atomic_boolean_test.cc b/cpp/platform/public/atomic_boolean_test.cc index 8dcb6ed9..67aa048c 100644 --- a/cpp/platform/public/atomic_boolean_test.cc +++ b/cpp/platform/public/atomic_boolean_test.cc @@ -15,6 +15,7 @@ #include "platform/public/atomic_boolean.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace location { diff --git a/cpp/platform/public/ble_test.cc b/cpp/platform/public/ble_test.cc index 4c2173b4..0c00543e 100644 --- a/cpp/platform/public/ble_test.cc +++ b/cpp/platform/public/ble_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "platform/base/medium_environment.h" #include "platform/public/count_down_latch.h" diff --git a/cpp/platform/public/bluetooth_adapter_test.cc b/cpp/platform/public/bluetooth_adapter_test.cc index 14906413..032068d8 100644 --- a/cpp/platform/public/bluetooth_adapter_test.cc +++ b/cpp/platform/public/bluetooth_adapter_test.cc @@ -15,6 +15,7 @@ #include "platform/public/bluetooth_adapter.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "platform/base/bluetooth_utils.h" #include "platform/public/logging.h" diff --git a/cpp/platform/public/bluetooth_classic_test.cc b/cpp/platform/public/bluetooth_classic_test.cc index ea219ca5..5cce4dd7 100644 --- a/cpp/platform/public/bluetooth_classic_test.cc +++ b/cpp/platform/public/bluetooth_classic_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "platform/base/medium_environment.h" diff --git a/cpp/platform/public/cancelable_alarm_test.cc b/cpp/platform/public/cancelable_alarm_test.cc index 4aebe310..4ef25ae9 100644 --- a/cpp/platform/public/cancelable_alarm_test.cc +++ b/cpp/platform/public/cancelable_alarm_test.cc @@ -15,6 +15,7 @@ #include "platform/public/cancelable_alarm.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "platform/public/atomic_boolean.h" diff --git a/cpp/platform/public/condition_variable_test.cc b/cpp/platform/public/condition_variable_test.cc index 1c0f5c16..96b1a72c 100644 --- a/cpp/platform/public/condition_variable_test.cc +++ b/cpp/platform/public/condition_variable_test.cc @@ -15,6 +15,7 @@ #include "platform/public/condition_variable.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "platform/public/logging.h" diff --git a/cpp/platform/public/crypto_test.cc b/cpp/platform/public/crypto_test.cc index 72a4fb03..052b4503 100644 --- a/cpp/platform/public/crypto_test.cc +++ b/cpp/platform/public/crypto_test.cc @@ -15,6 +15,7 @@ #include "platform/public/crypto.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "platform/base/byte_array.h" diff --git a/cpp/platform/public/logging_test.cc b/cpp/platform/public/logging_test.cc index 73628af3..937fc878 100644 --- a/cpp/platform/public/logging_test.cc +++ b/cpp/platform/public/logging_test.cc @@ -15,6 +15,7 @@ #include "platform/public/logging.h" #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" namespace { diff --git a/cpp/platform/public/wifi_lan_test.cc b/cpp/platform/public/wifi_lan_test.cc index 93eb0a54..85f4211f 100644 --- a/cpp/platform/public/wifi_lan_test.cc +++ b/cpp/platform/public/wifi_lan_test.cc @@ -17,6 +17,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/strings/string_view.h" #include "platform/base/medium_environment.h" diff --git a/internal/analytics/analytics_recorder_test.cc b/internal/analytics/analytics_recorder_test.cc index 14c385e6..33688e5b 100644 --- a/internal/analytics/analytics_recorder_test.cc +++ b/internal/analytics/analytics_recorder_test.cc @@ -18,6 +18,7 @@ #include #include "gmock/gmock.h" +#include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" #include "absl/time/time.h" #include "platform/base/error_code_params.h" @@ -64,7 +65,7 @@ using ::location::nearby::proto::connections::WIFI_LAN_MEDIUM_ERROR; using ::location::nearby::proto::connections::WIFI_LAN_SOCKET_CREATION; using ::testing::Contains; -using ::testing::EqualsProto; +using ::protobuf_matchers::EqualsProto; using ::testing::proto::Partially; constexpr absl::Duration kDefaultTimeout = absl::Milliseconds(1000);