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

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: Fix build Created 4 years, 5 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
« components/web_bluetooth/web_bluetooth_device_id_unittest.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 66d58c531739fbe49d90b323b0e6dca18dc17f3c..36004b5dbda07a3b287c919d8c2c0b404f0d11a1 100644
--- a/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc
+++ b/content/browser/bluetooth/frame_connected_bluetooth_devices_unittest.cc
@@ -15,6 +15,8 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+using web_bluetooth::WebBluetoothDeviceId;
+
namespace content {
typedef testing::NiceMock<device::MockBluetoothAdapter>
@@ -29,11 +31,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";
@@ -227,7 +229,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 +243,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 +259,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 +274,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 +290,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 +312,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());
« components/web_bluetooth/web_bluetooth_device_id_unittest.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