content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc - Issue 2019853002: bluetooth: Use WebBluetoothDeviceId instead of string

Unified Diff: content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc

Issue 2019853002: bluetooth: Use WebBluetoothDeviceId instead of string (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-uuid-typemap

Patch Set: Rebase Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/bluetooth/frame_connected_bluetooth_devices.cc ('k') | content/browser/bluetooth/web_bluetooth_service_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc

diff --git a/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc b/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc

index 644a04d8acb464855ff9f0af120ca4cc284131e5..66b018ad948c259045eb00a6d25434e5575bf793 100644

--- a/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc

+++ b/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc

@@ -30,11 +30,11 @@ using testing::_;

namespace {

-constexpr char kDeviceId0[] = "0";

+const WebBluetoothDeviceId kDeviceId0("000000000000000000000A==");

constexpr char kDeviceAddress0[] = "0";

constexpr char kDeviceName0[] = "Device0";

-constexpr char kDeviceId1[] = "1";

+const WebBluetoothDeviceId kDeviceId1("111111111111111111111A==");

constexpr char kDeviceAddress1[] = "1";

constexpr char kDeviceName1[] = "Device1";

@@ -255,7 +255,7 @@ TEST_F(FrameConnectedBluetoothDevicesTest,

EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());

EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));

- EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0),

+ EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),

kDeviceId0);

EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());

@@ -269,9 +269,9 @@ TEST_F(FrameConnectedBluetoothDevicesTest,

EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());

EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));

- EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0),

+ EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),

kDeviceId0);

- EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0), "");

+ EXPECT_FALSE(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0));

EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());

EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));

@@ -285,7 +285,7 @@ TEST_F(FrameConnectedBluetoothDevicesTest,

EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());

EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));

- EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0),

+ EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),

kDeviceId0);

EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());

@@ -300,9 +300,9 @@ TEST_F(FrameConnectedBluetoothDevicesTest,

EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());

EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));

- EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0),

+ EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),

kDeviceId0);

- EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0), "");

+ EXPECT_FALSE(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0));

EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());

EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));

@@ -316,14 +316,14 @@ TEST_F(FrameConnectedBluetoothDevicesTest, CloseConnectionAddress_TwoDevices) {

EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));

EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId1));

- EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0),

+ EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),

kDeviceId0);

EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());

EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));

EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId1));

- EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress1),

+ EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress1).value(),

kDeviceId1);

EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());

@@ -338,14 +338,14 @@ TEST_F(FrameConnectedBluetoothDevicesTest, CloseConnectionAddress_TwoMaps) {

EXPECT_TRUE(map0_->IsConnectedToDeviceWithId(kDeviceId0));

EXPECT_TRUE(map1_->IsConnectedToDeviceWithId(kDeviceId1));

- EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0),

+ EXPECT_EQ(map0_->CloseConnectionToDeviceWithAddress(kDeviceAddress0).value(),

kDeviceId0);

EXPECT_TRUE(contents()->IsConnectedToBluetoothDevice());

EXPECT_FALSE(map0_->IsConnectedToDeviceWithId(kDeviceId0));

EXPECT_TRUE(map1_->IsConnectedToDeviceWithId(kDeviceId1));

- EXPECT_EQ(map1_->CloseConnectionToDeviceWithAddress(kDeviceAddress1),

+ EXPECT_EQ(map1_->CloseConnectionToDeviceWithAddress(kDeviceAddress1).value(),

kDeviceId1);

EXPECT_FALSE(contents()->IsConnectedToBluetoothDevice());