Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Issues Search
    My Issues | Starred     Open | Closed | All

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: Address jyasskin's comments Created 4 years, 6 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
« content/browser/bluetooth/bluetooth_allowed_devices_map.cc ('K') | « 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') | Show Comments 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 8a76e565ece2ceb803e3735b600ea634bcf18f3c..1392a4901c901276c83f132b83860e73bfa676f6 100644
--- a/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc
+++ b/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc
@@ -29,11 +29,11 @@ using testing::_;
namespace {
-constexpr char kDeviceId0[] = "0";
+const BluetoothDeviceId kDeviceId0("0000000000000000000000==");
constexpr char kDeviceAddress0[] = "0";
constexpr char kDeviceName0[] = "Device0";
-constexpr char kDeviceId1[] = "1";
+const BluetoothDeviceId kDeviceId1("1111111111111111111111==");
constexpr char kDeviceAddress1[] = "1";
constexpr char kDeviceName1[] = "Device1";
@@ -227,7 +227,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());
@@ -241,9 +241,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));
@@ -257,7 +257,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());
@@ -272,9 +272,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));
@@ -288,14 +288,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());
@@ -310,14 +310,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());
« content/browser/bluetooth/bluetooth_allowed_devices_map.cc ('K') | « content/browser/bluetooth/frame_connected_bluetooth_devices.cc ('k') | content/browser/bluetooth/web_bluetooth_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698