Fix connections_test

PiperOrigin-RevId: 549247026
google · Aug 9, 2023 · 9779fba · 9779fba
1 parent 347d10b
commit 9779fba
Show file tree

Hide file tree

Showing 61 changed files with 423 additions and 1,019 deletions.
diff --git a/connections/BUILD b/connections/BUILD
@@ -35,7 +35,6 @@ cc_library(
         "//internal/analytics:event_logger",
         "//internal/interop:device",
         "//internal/platform:base",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
@@ -102,7 +101,6 @@ cc_test(
         "//connections/implementation:internal_test",
         "//connections/v3:v3_types",
         "//internal/platform:base",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
         "@com_github_protobuf_matchers//protobuf-matchers",

diff --git a/connections/c/BUILD b/connections/c/BUILD
@@ -119,7 +119,7 @@ cc_test(
     ],
     deps = [
         "//connections:core",
-        "//internal/platform:logging",
+        "//internal/platform:types",
         "//internal/platform/implementation/windows",
         "@com_github_protobuf_matchers//protobuf-matchers",
         "@com_google_googletest//:gtest_main",

diff --git a/connections/c/bluetooth_classic_server_socket_test.cc b/connections/c/bluetooth_classic_server_socket_test.cc
@@ -117,10 +117,10 @@ TEST(BluetoothClassicServerSocketTest,
   PerformanceTimer::start();
 
   core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                        {.result_cb = [&](Status status) {
+                        [&](Status status) {
                           request_result = status;
                           notification.Notify();
-                        }});
+                        });
 
   if (notification.WaitForNotificationWithTimeout(
           absl::Seconds(TimeoutSeconds))) {
@@ -163,10 +163,10 @@ TEST(BluetoothClassicServerSocketTest,
   PerformanceTimer::start();
 
   core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                        {.result_cb = [&](Status status) {
+                        [&](Status status) {
                           request_result = status;
                           notification2.Notify();
-                        }});
+                        });
 
   if (notification2.WaitForNotificationWithTimeout(
           absl::Seconds(TimeoutSeconds))) {
@@ -209,10 +209,10 @@ TEST(BluetoothClassicServerSocketTest,
 
   PerformanceTimer::start();
 
-  core.StopAdvertising({.result_cb = [&](Status status) {
+  core.StopAdvertising([&](Status status) {
     request_result = status;
     notification3.Notify();
-  }});
+  });
 
   if (notification3.WaitForNotificationWithTimeout(
           absl::Seconds(TimeoutSeconds))) {
@@ -273,10 +273,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_MultiRunWithTimeoutReproStuck) {
     PerformanceTimer::start();
 
     core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                          {.result_cb = [&](Status status) {
+                          [&](Status status) {
                             request_result = status;
                             notification.Notify();
-                          }});
+                          });
 
     if (notification.WaitForNotificationWithTimeout(
             absl::Seconds(TimeoutSeconds))) {
@@ -319,10 +319,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_MultiRunWithTimeoutReproStuck) {
     PerformanceTimer::start();
 
     core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                          {.result_cb = [&](Status status) {
+                          [&](Status status) {
                             request_result = status;
                             notification2.Notify();
-                          }});
+                          });
 
     if (notification2.WaitForNotificationWithTimeout(
             absl::Seconds(TimeoutSeconds))) {
@@ -361,10 +361,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_MultiRunWithTimeoutReproStuck) {
 
     PerformanceTimer::start();
 
-    core.StopAdvertising({.result_cb = [&](Status status) {
+    core.StopAdvertising([&](Status status) {
       request_result = status;
       notification3.Notify();
-    }});
+    });
 
     if (notification3.WaitForNotificationWithTimeout(
             absl::Seconds(TimeoutSeconds))) {
@@ -424,10 +424,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_SingleRunNoTimeoutReproStuck) {
   PerformanceTimer::start();
 
   core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                        {.result_cb = [&](Status status) {
+                        [&](Status status) {
                           request_result = status;
                           notification.Notify();
-                        }});
+                        });
 
   notification.WaitForNotification();
   PerformanceTimer::stop();
@@ -451,10 +451,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_SingleRunNoTimeoutReproStuck) {
   PerformanceTimer::start();
 
   core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                        {.result_cb = [&](Status status) {
+                        [&](Status status) {
                           request_result = status;
                           notification2.Notify();
-                        }});
+                        });
 
   notification2.WaitForNotification();
   PerformanceTimer::stop();
@@ -477,10 +477,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_SingleRunNoTimeoutReproStuck) {
 
   PerformanceTimer::start();
 
-  core.StopAdvertising({.result_cb = [&](Status status) {
+  core.StopAdvertising([&](Status status) {
     request_result = status;
     notification3.Notify();
-  }});
+  });
 
   notification3.WaitForNotification();
   PerformanceTimer::stop();
@@ -521,10 +521,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_MultiRunNoTimeoutReproStuck) {
     PerformanceTimer::start();
 
     core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                          {.result_cb = [&](Status status) {
+                          [&](Status status) {
                             request_result = status;
                             notification.Notify();
-                          }});
+                          });
 
     notification.WaitForNotification();
 
@@ -551,10 +551,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_MultiRunNoTimeoutReproStuck) {
     PerformanceTimer::start();
 
     core.StartAdvertising(SERVICE_ID, AdvertiseOptions, request_info,
-                          {.result_cb = [&](Status status) {
+                          [&](Status status) {
                             request_result = status;
                             notification2.Notify();
-                          }});
+                          });
 
     notification2.WaitForNotification();
     PerformanceTimer::stop();
@@ -580,10 +580,10 @@ TEST(BluetoothClassicServerSocketTest, DISABLED_MultiRunNoTimeoutReproStuck) {
 
     PerformanceTimer::start();
 
-    core.StopAdvertising({.result_cb = [&](Status status) {
+    core.StopAdvertising([&](Status status) {
       request_result = status;
       notification3.Notify();
-    }});
+    });
 
     notification3.WaitForNotification();
     PerformanceTimer::stop();

diff --git a/connections/implementation/BUILD b/connections/implementation/BUILD
@@ -126,7 +126,6 @@ cc_library(
         "//internal/platform:comm",
         "//internal/platform:connection_info",
         "//internal/platform:error_code_recorder",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform:util",
         "//internal/platform/implementation:comm",
@@ -236,7 +235,6 @@ cc_test(
         "//internal/interop:device",
         "//internal/platform:base",
         "//internal/platform:comm",
-        "//internal/platform:logging",
         "//internal/platform:test_util",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep

diff --git a/connections/implementation/analytics/BUILD b/connections/implementation/analytics/BUILD
@@ -31,7 +31,6 @@ cc_library(
         "//connections:core_types",
         "//internal/analytics:event_logger",
         "//internal/platform:error_code_recorder",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform/implementation:types",
         "//internal/proto/analytics:connections_log_cc_proto",
@@ -61,7 +60,6 @@ cc_test(
         "//internal/platform:base",
         "//internal/platform:comm",
         "//internal/platform:error_code_recorder",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
         "//internal/proto/analytics:connections_log_cc_proto",

diff --git a/connections/implementation/client_proxy.cc b/connections/implementation/client_proxy.cc
@@ -318,8 +318,11 @@ void ClientProxy::OnEndpointFound(
   MutexLock lock(&mutex_);
 
   NEARBY_LOGS(INFO) << "ClientProxy [Endpoint Found]: [enter] id="
-                    << endpoint_id << "; service=" << service_id << "; info="
-                    << absl::BytesToHexString(endpoint_info.data());
+                    << endpoint_id << "; service=" << service_id
+                    << "; info=" << absl::BytesToHexString(endpoint_info.data())
+                    << "; medium="
+                    << location::nearby::proto::connections::Medium_Name(
+                           medium);
   if (!IsDiscoveringServiceId(service_id)) {
     NEARBY_LOGS(INFO) << "ClientProxy [Endpoint Found]: Ignoring event for id="
                       << endpoint_id

diff --git a/connections/implementation/mediums/BUILD b/connections/implementation/mediums/BUILD
@@ -55,7 +55,6 @@ cc_library(
         "//internal/platform:base",
         "//internal/platform:cancellation_flag",
         "//internal/platform:comm",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform:uuid",
         "//proto/mediums:web_rtc_signaling_frames_cc_proto",

diff --git a/connections/implementation/mediums/ble_v2/BUILD b/connections/implementation/mediums/ble_v2/BUILD
@@ -45,7 +45,6 @@ cc_library(
         "//internal/flags:nearby_flags",
         "//internal/platform:base",
         "//internal/platform:comm",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform:util",
         "//internal/platform:uuid",

diff --git a/connections/implementation/mediums/webrtc/BUILD b/connections/implementation/mediums/webrtc/BUILD
@@ -39,7 +39,6 @@ cc_library(
         "//connections/implementation/mediums:utils",
         "//internal/platform:base",
         "//internal/platform:comm",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//proto/mediums:web_rtc_signaling_frames_cc_proto",
         # TODO: Support WebRTC

diff --git a/connections/status.cc b/connections/status.cc
@@ -53,6 +53,12 @@ std::string Status::ToString() const {
       return "kWifiLanError";
     case Status::kPayloadUnknown:
       return "kPayloadUnknown";
+    case Status::kReset:
+      return "kReset";
+    case Status::kTimeout:
+      return "kTimeout";
+    case Status::kUnknown:
+      // fall through
     default:
       return "Unknown";
   }

diff --git a/connections/status.h b/connections/status.h
@@ -22,7 +22,7 @@ namespace connections {
 
 // Protocol operation result: kSuccess, if operation was successful;
 // descriptive error code otherwise.
-// LINT.IfChange
+// LINT.IfChange(status_enum)
 struct Status {
   // Status is a struct, so it is possible to pass some context about failure,
   // by adding extra fields to it when necessary, and not change any of the
@@ -44,6 +44,9 @@ struct Status {
     kBleError,
     kWifiLanError,
     kPayloadUnknown,
+    kReset,
+    kTimeout,
+    kUnknown,
     kNextValue,
   };
   Value value{kError};
@@ -53,9 +56,9 @@ struct Status {
   std::string ToString() const;
 };
 // LINT.ThenChange(
-//   //depot/google3/location/nearby/cpp/sharing/implementation/nearby_connections_manager.cc:24
-//   //depot/google3/location/nearby/cpp/sharing/implementation/nearby_connections_types.h:46
-//   //depot/google3/location/nearby/cpp/sharing/implementation/nearby_connections_types_test.cc
+//     ../sharing/nearby_connections_manager.cc:status_enum,
+//     ../sharing/nearby_connections_types.h:status_enum,
+//     ../sharing/nearby_connections_types_test.cc:status_enum
 // )
 
 inline bool operator==(const Status& a, const Status& b) {

diff --git a/connections/swift/NearbyCoreAdapter/Sources/GNCCoreAdapter.mm b/connections/swift/NearbyCoreAdapter/Sources/GNCCoreAdapter.mm
@@ -87,6 +87,12 @@ GNCStatus GNCStatusFromCppStatus(Status status) {
       return GNCStatusWifiLanError;
     case Status::kPayloadUnknown:
       return GNCStatusPayloadUnknown;
+    case Status::kReset:
+      return GNCStatusReset;
+    case Status::kTimeout:
+      return GNCStatusTimeout;
+    case Status::kUnknown:
+      return GNCStatusUnknown;
     case Status::kNextValue:
       return GNCStatusUnknown;
   }

diff --git a/connections/swift/NearbyCoreAdapter/Sources/GNCError.mm b/connections/swift/NearbyCoreAdapter/Sources/GNCError.mm
@@ -65,6 +65,12 @@
       return [NSError errorWithDomain:GNCErrorDomain code:GNCErrorWifiLanError userInfo:nil];
     case Status::kPayloadUnknown:
       return [NSError errorWithDomain:GNCErrorDomain code:GNCErrorPayloadUnknown userInfo:nil];
+    case Status::kReset:
+      return [NSError errorWithDomain:GNCErrorDomain code:GNCErrorReset userInfo:nil];
+    case Status::kTimeout:
+      return [NSError errorWithDomain:GNCErrorDomain code:GNCErrorTimeout userInfo:nil];
+    case Status::kUnknown:
+      return [NSError errorWithDomain:GNCErrorDomain code:GNCErrorUnknown userInfo:nil];
     case Status::kNextValue:
       return [NSError errorWithDomain:GNCErrorDomain code:GNCErrorUnknown userInfo:nil];
   }

diff --git a/connections/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCConnectionDelegate.h b/connections/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCConnectionDelegate.h
@@ -35,6 +35,8 @@ typedef NS_CLOSED_ENUM(NSInteger, GNCStatus) {
   GNCStatusWifiLanError,
   GNCStatusPayloadUnknown,
   GNCStatusUnknown,
+  GNCStatusReset,
+  GNCStatusTimeout,
 };
 
 /**

diff --git a/connections/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCError.h b/connections/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCError.h
@@ -38,4 +38,6 @@ typedef NS_ERROR_ENUM(GNCErrorDomain, GNCErrorCode){
     GNCErrorBleError,
     GNCErrorWifiLanError,
     GNCErrorPayloadUnknown,
+    GNCErrorReset,
+    GNCErrorTimeout,
 } NS_SWIFT_NAME(NearbyError);
diff --git a/fastpair/BUILD b/fastpair/BUILD
@@ -134,7 +134,6 @@ cc_test(
         "//fastpair/plugins:fake_fast_pair_plugin",
         "//internal/account:test_support",
         "//internal/network:types",
-        "//internal/platform:logging",
         "//internal/platform:test_util",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep

diff --git a/fastpair/common/BUILD b/fastpair/common/BUILD
@@ -33,7 +33,7 @@ cc_library(
     deps = [
         "//fastpair/proto:fastpair_cc_proto",
         "//internal/crypto_cros",
-        "//internal/platform:logging",
+        "//internal/platform:types",
         "//internal/preferences",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:flat_hash_map",

diff --git a/fastpair/crypto/BUILD b/fastpair/crypto/BUILD
@@ -21,7 +21,7 @@ cc_library(
         "//fastpair/common",
         "//internal/base:bluetooth_address",
         "//internal/platform:base",
-        "//internal/platform:logging",
+        "//internal/platform:types",
         "@boringssl//:crypto",
         "@com_google_absl//absl/log:check",
     ],

diff --git a/fastpair/dataparser/BUILD b/fastpair/dataparser/BUILD
@@ -17,7 +17,7 @@ cc_library(
         "//fastpair/crypto",
         "//internal/base:bluetooth_address",
         "//internal/platform:base",
-        "//internal/platform:logging",
+        "//internal/platform:types",
         "@com_google_absl//absl/functional:any_invocable",
         "@com_google_absl//absl/strings",
     ],

diff --git a/fastpair/handshake/BUILD b/fastpair/handshake/BUILD
@@ -43,7 +43,6 @@ cc_library(
         "//fastpair/repository",
         "//internal/base:bluetooth_address",
         "//internal/platform:comm",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform:uuid",
         "@boringssl//:crypto",
@@ -89,7 +88,6 @@ cc_test(
         "//fastpair/internal/mediums",
         "//fastpair/repository:test_support",
         "//fastpair/testing",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
         "@com_github_protobuf_matchers//protobuf-matchers",
@@ -164,7 +162,6 @@ cc_test(
         ":handshake",
         "//fastpair/common",
         "//fastpair/internal/mediums",
-        "//internal/platform:logging",
         "//internal/platform:test_util",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep