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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2658473002: Refactor BluetoothAllowedDevicesMap (Closed)
Patch Set: cleaned up layout test code Created 3 years, 10 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/bluetooth_allowed_devices_map_unittest.cc ('k') | content/browser/bluetooth/web_bluetooth_service_impl.h » ('j') | third_party/WebKit/LayoutTests/resources/bluetooth/heart-rate-two-iframes.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/bluetooth/bluetooth_allowed_devices_unittest.cc
diff --git a/content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc b/content/browser/bluetooth/bluetooth_allowed_devices_unittest.cc
similarity index 38%
rename from content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc
rename to content/browser/bluetooth/bluetooth_allowed_devices_unittest.cc
index c5e463278e6e571b4a159763d933342730675ea2..376d28e8f1516e9f4b196143ec752710a0991943 100644
--- a/content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc
+++ b/content/browser/bluetooth/bluetooth_allowed_devices_unittest.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/browser/bluetooth/bluetooth_allowed_devices_map.h"
+#include "content/browser/bluetooth/bluetooth_allowed_devices.h"
#include "base/strings/string_util.h"
+#include "content/browser/bluetooth/bluetooth_allowed_devices_map.h"
#include "content/common/bluetooth/web_bluetooth_device_id.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
@@ -32,157 +33,145 @@ const BluetoothUUID kBatteryServiceUUID(kBatteryServiceUUIDString);
const BluetoothUUID kBloodPressureUUID(kBloodPressureUUIDString);
const BluetoothUUID kCyclingPowerUUID(kCyclingPowerUUIDString);
-class BluetoothAllowedDevicesMapTest : public testing::Test {
+class BluetoothAllowedDevicesTest : public testing::Test {
protected:
- BluetoothAllowedDevicesMapTest() {
+ BluetoothAllowedDevicesTest() {
empty_options_ = blink::mojom::WebBluetoothRequestDeviceOptions::New();
}
- ~BluetoothAllowedDevicesMapTest() override {}
+ ~BluetoothAllowedDevicesTest() override {}
blink::mojom::WebBluetoothRequestDeviceOptionsPtr empty_options_;
};
} // namespace
-TEST_F(BluetoothAllowedDevicesMapTest, UniqueOriginNotSupported) {
- BluetoothAllowedDevicesMap allowed_devices_map;
-
- EXPECT_DEATH_IF_SUPPORTED(allowed_devices_map.AddDevice(
- url::Origin(), kDeviceAddress1, empty_options_),
- "");
+TEST_F(BluetoothAllowedDevicesTest, UniqueOriginNotSupported) {
+ scoped_refptr<BluetoothAllowedDevicesMap> allowed_devices_map =
+ new BluetoothAllowedDevicesMap();
+ EXPECT_DEATH_IF_SUPPORTED(
+ allowed_devices_map->GetOrCreateAllowedDevices(url::Origin()), "");
}
-TEST_F(BluetoothAllowedDevicesMapTest, AddDeviceToMap) {
- BluetoothAllowedDevicesMap allowed_devices_map;
+TEST_F(BluetoothAllowedDevicesTest, AddDevice) {
+ BluetoothAllowedDevices allowed_devices;
- const WebBluetoothDeviceId& device_id = allowed_devices_map.AddDevice(
- kTestOrigin1, kDeviceAddress1, empty_options_);
+ const WebBluetoothDeviceId& device_id =
+ allowed_devices.AddDevice(kDeviceAddress1, empty_options_);
// Test that we can retrieve the device address/id.
- EXPECT_EQ(device_id,
- *allowed_devices_map.GetDeviceId(kTestOrigin1, kDeviceAddress1));
- EXPECT_EQ(kDeviceAddress1,
- allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id));
+ EXPECT_EQ(device_id, *allowed_devices.GetDeviceId(kDeviceAddress1));
+ EXPECT_EQ(kDeviceAddress1, allowed_devices.GetDeviceAddress(device_id));
}
-TEST_F(BluetoothAllowedDevicesMapTest, AddDeviceToMapTwice) {
- BluetoothAllowedDevicesMap allowed_devices_map;
- const WebBluetoothDeviceId& device_id1 = allowed_devices_map.AddDevice(
- kTestOrigin1, kDeviceAddress1, empty_options_);
- const WebBluetoothDeviceId& device_id2 = allowed_devices_map.AddDevice(
- kTestOrigin1, kDeviceAddress1, empty_options_);
+TEST_F(BluetoothAllowedDevicesTest, AddDeviceTwice) {
+ BluetoothAllowedDevices allowed_devices;
+ const WebBluetoothDeviceId& device_id1 =
+ allowed_devices.AddDevice(kDeviceAddress1, empty_options_);
+ const WebBluetoothDeviceId& device_id2 =
+ allowed_devices.AddDevice(kDeviceAddress1, empty_options_);
EXPECT_EQ(device_id1, device_id2);
// Test that we can retrieve the device address/id.
- EXPECT_EQ(device_id1,
- *allowed_devices_map.GetDeviceId(kTestOrigin1, kDeviceAddress1));
- EXPECT_EQ(kDeviceAddress1,
- allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id1));
+ EXPECT_EQ(device_id1, *allowed_devices.GetDeviceId(kDeviceAddress1));
+ EXPECT_EQ(kDeviceAddress1, allowed_devices.GetDeviceAddress(device_id1));
}
-TEST_F(BluetoothAllowedDevicesMapTest, AddTwoDevicesFromSameOriginToMap) {
- BluetoothAllowedDevicesMap allowed_devices_map;
- const WebBluetoothDeviceId& device_id1 = allowed_devices_map.AddDevice(
- kTestOrigin1, kDeviceAddress1, empty_options_);
- const WebBluetoothDeviceId& device_id2 = allowed_devices_map.AddDevice(
- kTestOrigin1, kDeviceAddress2, empty_options_);
+TEST_F(BluetoothAllowedDevicesTest, AddTwoDevices) {
+ BluetoothAllowedDevices allowed_devices;
+ const WebBluetoothDeviceId& device_id1 =
+ allowed_devices.AddDevice(kDeviceAddress1, empty_options_);
+ const WebBluetoothDeviceId& device_id2 =
+ allowed_devices.AddDevice(kDeviceAddress2, empty_options_);
EXPECT_NE(device_id1, device_id2);
// Test that we can retrieve the device address/id.
- EXPECT_EQ(device_id1,
- *allowed_devices_map.GetDeviceId(kTestOrigin1, kDeviceAddress1));
- EXPECT_EQ(device_id2,
- *allowed_devices_map.GetDeviceId(kTestOrigin1, kDeviceAddress2));
-
- EXPECT_EQ(kDeviceAddress1,
- allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id1));
- EXPECT_EQ(kDeviceAddress2,
- allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id2));
+ EXPECT_EQ(device_id1, *allowed_devices.GetDeviceId(kDeviceAddress1));
+ EXPECT_EQ(device_id2, *allowed_devices.GetDeviceId(kDeviceAddress2));
+
+ EXPECT_EQ(kDeviceAddress1, allowed_devices.GetDeviceAddress(device_id1));
+ EXPECT_EQ(kDeviceAddress2, allowed_devices.GetDeviceAddress(device_id2));
}
-TEST_F(BluetoothAllowedDevicesMapTest, AddTwoDevicesFromTwoOriginsToMap) {
- BluetoothAllowedDevicesMap allowed_devices_map;
- const WebBluetoothDeviceId& device_id1 = allowed_devices_map.AddDevice(
- kTestOrigin1, kDeviceAddress1, empty_options_);
- const WebBluetoothDeviceId& device_id2 = allowed_devices_map.AddDevice(
- kTestOrigin2, kDeviceAddress2, empty_options_);
+TEST_F(BluetoothAllowedDevicesTest, AddTwoDevicesFromTwoOriginsToMap) {
+ scoped_refptr<BluetoothAllowedDevicesMap> allowed_devices_map =
+ new BluetoothAllowedDevicesMap();
+ content::BluetoothAllowedDevices& allowed_devices1 =
+ allowed_devices_map->GetOrCreateAllowedDevices(kTestOrigin1);
+ content::BluetoothAllowedDevices& allowed_devices2 =
+ allowed_devices_map->GetOrCreateAllowedDevices(kTestOrigin2);
+
+ const WebBluetoothDeviceId& device_id1 =
+ allowed_devices1.AddDevice(kDeviceAddress1, empty_options_);
+ const WebBluetoothDeviceId& device_id2 =
+ allowed_devices2.AddDevice(kDeviceAddress2, empty_options_);
EXPECT_NE(device_id1, device_id2);
// Test that the wrong origin doesn't have access to the device.
+ EXPECT_EQ(nullptr, allowed_devices1.GetDeviceId(kDeviceAddress2));
+ EXPECT_EQ(nullptr, allowed_devices2.GetDeviceId(kDeviceAddress1));
- EXPECT_EQ(nullptr,
- allowed_devices_map.GetDeviceId(kTestOrigin1, kDeviceAddress2));
- EXPECT_EQ(nullptr,
- allowed_devices_map.GetDeviceId(kTestOrigin2, kDeviceAddress1));
-
- EXPECT_EQ(base::EmptyString(),
- allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id2));
- EXPECT_EQ(base::EmptyString(),
- allowed_devices_map.GetDeviceAddress(kTestOrigin2, device_id1));
+ EXPECT_EQ(base::EmptyString(), allowed_devices1.GetDeviceAddress(device_id2));
+ EXPECT_EQ(base::EmptyString(), allowed_devices2.GetDeviceAddress(device_id1));
// Test that we can retrieve the device address/id.
- EXPECT_EQ(device_id1,
- *allowed_devices_map.GetDeviceId(kTestOrigin1, kDeviceAddress1));
- EXPECT_EQ(device_id2,
- *allowed_devices_map.GetDeviceId(kTestOrigin2, kDeviceAddress2));
-
- EXPECT_EQ(kDeviceAddress1,
- allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id1));
- EXPECT_EQ(kDeviceAddress2,
- allowed_devices_map.GetDeviceAddress(kTestOrigin2, device_id2));
+ EXPECT_EQ(device_id1, *(allowed_devices1.GetDeviceId(kDeviceAddress1)));
+ EXPECT_EQ(device_id2, *(allowed_devices2.GetDeviceId(kDeviceAddress2)));
+
+ EXPECT_EQ(kDeviceAddress1, allowed_devices1.GetDeviceAddress(device_id1));
+ EXPECT_EQ(kDeviceAddress2, allowed_devices2.GetDeviceAddress(device_id2));
}
-TEST_F(BluetoothAllowedDevicesMapTest, AddDeviceFromTwoOriginsToMap) {
- BluetoothAllowedDevicesMap allowed_devices_map;
- const WebBluetoothDeviceId& device_id1 = allowed_devices_map.AddDevice(
- kTestOrigin1, kDeviceAddress1, empty_options_);
- const WebBluetoothDeviceId& device_id2 = allowed_devices_map.AddDevice(
- kTestOrigin2, kDeviceAddress1, empty_options_);
+TEST_F(BluetoothAllowedDevicesTest, AddDeviceFromTwoOriginsToMap) {
+ scoped_refptr<BluetoothAllowedDevicesMap> allowed_devices_map =
+ new BluetoothAllowedDevicesMap();
+ content::BluetoothAllowedDevices& allowed_devices1 =
+ allowed_devices_map->GetOrCreateAllowedDevices(kTestOrigin1);
+ content::BluetoothAllowedDevices& allowed_devices2 =
+ allowed_devices_map->GetOrCreateAllowedDevices(kTestOrigin2);
+
+ const WebBluetoothDeviceId& device_id1 =
+ allowed_devices1.AddDevice(kDeviceAddress1, empty_options_);
+ const WebBluetoothDeviceId& device_id2 =
+ allowed_devices2.AddDevice(kDeviceAddress1, empty_options_);
EXPECT_NE(device_id1, device_id2);
// Test that the wrong origin doesn't have access to the device.
- EXPECT_EQ(base::EmptyString(),
- allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id2));
- EXPECT_EQ(base::EmptyString(),
- allowed_devices_map.GetDeviceAddress(kTestOrigin2, device_id1));
+ EXPECT_EQ(base::EmptyString(), allowed_devices1.GetDeviceAddress(device_id2));
+ EXPECT_EQ(base::EmptyString(), allowed_devices2.GetDeviceAddress(device_id1));
}
-TEST_F(BluetoothAllowedDevicesMapTest, AddRemoveAddDeviceToMap) {
- BluetoothAllowedDevicesMap allowed_devices_map;
+TEST_F(BluetoothAllowedDevicesTest, AddRemoveAddDevice) {
+ BluetoothAllowedDevices allowed_devices;
const WebBluetoothDeviceId device_id_first_time =
- allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1,
- empty_options_);
+ allowed_devices.AddDevice(kDeviceAddress1, empty_options_);
- allowed_devices_map.RemoveDevice(kTestOrigin1, kDeviceAddress1);
+ allowed_devices.RemoveDevice(kDeviceAddress1);
const WebBluetoothDeviceId device_id_second_time =
- allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1,
- empty_options_);
+ allowed_devices.AddDevice(kDeviceAddress1, empty_options_);
EXPECT_NE(device_id_first_time, device_id_second_time);
}
-TEST_F(BluetoothAllowedDevicesMapTest, RemoveDeviceFromMap) {
- BluetoothAllowedDevicesMap allowed_devices_map;
+TEST_F(BluetoothAllowedDevicesTest, RemoveDevice) {
+ BluetoothAllowedDevices allowed_devices;
- const WebBluetoothDeviceId device_id = allowed_devices_map.AddDevice(
- kTestOrigin1, kDeviceAddress1, empty_options_);
+ const WebBluetoothDeviceId device_id =
+ allowed_devices.AddDevice(kDeviceAddress1, empty_options_);
- allowed_devices_map.RemoveDevice(kTestOrigin1, kDeviceAddress1);
+ allowed_devices.RemoveDevice(kDeviceAddress1);
- EXPECT_EQ(nullptr,
- allowed_devices_map.GetDeviceId(kTestOrigin1, kDeviceAddress1));
- EXPECT_EQ(base::EmptyString(),
- allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id));
+ EXPECT_EQ(nullptr, allowed_devices.GetDeviceId(kDeviceAddress1));
+ EXPECT_EQ(base::EmptyString(), allowed_devices.GetDeviceAddress(device_id));
}
-TEST_F(BluetoothAllowedDevicesMapTest, NoPermissionForAnyService) {
- BluetoothAllowedDevicesMap allowed_devices_map;
+TEST_F(BluetoothAllowedDevicesTest, NoPermissionForAnyService) {
+ BluetoothAllowedDevices allowed_devices;
// Setup device.
blink::mojom::WebBluetoothRequestDeviceOptionsPtr options =
@@ -196,17 +185,16 @@ TEST_F(BluetoothAllowedDevicesMapTest, NoPermissionForAnyService) {
// Add to map.
const WebBluetoothDeviceId device_id =
- allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options);
+ allowed_devices.AddDevice(kDeviceAddress1, options);
// Try to access at least one service.
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
- kTestOrigin1, device_id));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id, kGlucoseUUID));
+ EXPECT_FALSE(allowed_devices.IsAllowedToAccessAtLeastOneService(device_id));
+ EXPECT_FALSE(
+ allowed_devices.IsAllowedToAccessService(device_id, kGlucoseUUID));
}
-TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_OneOriginOneDevice) {
- BluetoothAllowedDevicesMap allowed_devices_map;
+TEST_F(BluetoothAllowedDevicesTest, AllowedServices_OneDevice) {
+ BluetoothAllowedDevices allowed_devices;
// Setup device.
blink::mojom::WebBluetoothRequestDeviceOptionsPtr options =
@@ -230,33 +218,31 @@ TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_OneOriginOneDevice) {
// Add to map.
const WebBluetoothDeviceId device_id1 =
- allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options);
+ allowed_devices.AddDevice(kDeviceAddress1, options);
// Access allowed services.
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
- kTestOrigin1, device_id1));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kGlucoseUUID));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kHeartRateUUID));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kBatteryServiceUUID));
+ EXPECT_TRUE(allowed_devices.IsAllowedToAccessAtLeastOneService(device_id1));
+ EXPECT_TRUE(
+ allowed_devices.IsAllowedToAccessService(device_id1, kGlucoseUUID));
+ EXPECT_TRUE(
+ allowed_devices.IsAllowedToAccessService(device_id1, kHeartRateUUID));
+ EXPECT_TRUE(allowed_devices.IsAllowedToAccessService(device_id1,
+ kBatteryServiceUUID));
// Try to access a non-allowed service.
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kBloodPressureUUID));
+ EXPECT_FALSE(
+ allowed_devices.IsAllowedToAccessService(device_id1, kBloodPressureUUID));
// Try to access allowed services after removing device.
- allowed_devices_map.RemoveDevice(kTestOrigin1, kDeviceAddress1);
+ allowed_devices.RemoveDevice(kDeviceAddress1);
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
- kTestOrigin1, device_id1));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kGlucoseUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kHeartRateUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kBatteryServiceUUID));
+ EXPECT_FALSE(allowed_devices.IsAllowedToAccessAtLeastOneService(device_id1));
+ EXPECT_FALSE(
+ allowed_devices.IsAllowedToAccessService(device_id1, kGlucoseUUID));
+ EXPECT_FALSE(
+ allowed_devices.IsAllowedToAccessService(device_id1, kHeartRateUUID));
+ EXPECT_FALSE(allowed_devices.IsAllowedToAccessService(device_id1,
+ kBatteryServiceUUID));
// Add device back.
blink::mojom::WebBluetoothRequestDeviceOptionsPtr options2 =
@@ -267,31 +253,30 @@ TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_OneOriginOneDevice) {
options2->filters->push_back(scan_filter2.Clone());
const WebBluetoothDeviceId device_id2 =
- allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options2);
+ allowed_devices.AddDevice(kDeviceAddress1, options2);
// Access allowed services.
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
- kTestOrigin1, device_id2));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id2, kGlucoseUUID));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id2, kHeartRateUUID));
+ EXPECT_TRUE(allowed_devices.IsAllowedToAccessAtLeastOneService(device_id2));
+ EXPECT_TRUE(
+ allowed_devices.IsAllowedToAccessService(device_id2, kGlucoseUUID));
+ EXPECT_TRUE(
+ allowed_devices.IsAllowedToAccessService(device_id2, kHeartRateUUID));
// Try to access a non-allowed service.
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id2, kBatteryServiceUUID));
+ EXPECT_FALSE(allowed_devices.IsAllowedToAccessService(device_id2,
+ kBatteryServiceUUID));
// Try to access services from old device.
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kGlucoseUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kHeartRateUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kBatteryServiceUUID));
+ EXPECT_FALSE(
+ allowed_devices.IsAllowedToAccessService(device_id1, kGlucoseUUID));
+ EXPECT_FALSE(
+ allowed_devices.IsAllowedToAccessService(device_id1, kHeartRateUUID));
+ EXPECT_FALSE(allowed_devices.IsAllowedToAccessService(device_id1,
+ kBatteryServiceUUID));
}
-TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_OneOriginTwoDevices) {
- BluetoothAllowedDevicesMap allowed_devices_map;
+TEST_F(BluetoothAllowedDevicesTest, AllowedServices_TwoDevices) {
+ BluetoothAllowedDevices allowed_devices;
// Setup request for device #1.
blink::mojom::WebBluetoothRequestDeviceOptionsPtr options1 =
@@ -321,43 +306,46 @@ TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_OneOriginTwoDevices) {
// Add devices to map.
const WebBluetoothDeviceId& device_id1 =
- allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options1);
+ allowed_devices.AddDevice(kDeviceAddress1, options1);
const WebBluetoothDeviceId& device_id2 =
- allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress2, options2);
+ allowed_devices.AddDevice(kDeviceAddress2, options2);
// Access allowed services.
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
- kTestOrigin1, device_id1));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kGlucoseUUID));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kHeartRateUUID));
-
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
- kTestOrigin1, device_id2));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id2, kBatteryServiceUUID));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id2, kBloodPressureUUID));
+ EXPECT_TRUE(allowed_devices.IsAllowedToAccessAtLeastOneService(device_id1));
+ EXPECT_TRUE(
+ allowed_devices.IsAllowedToAccessService(device_id1, kGlucoseUUID));
+ EXPECT_TRUE(
+ allowed_devices.IsAllowedToAccessService(device_id1, kHeartRateUUID));
+
+ EXPECT_TRUE(allowed_devices.IsAllowedToAccessAtLeastOneService(device_id2));
+ EXPECT_TRUE(allowed_devices.IsAllowedToAccessService(device_id2,
+ kBatteryServiceUUID));
+ EXPECT_TRUE(
+ allowed_devices.IsAllowedToAccessService(device_id2, kBloodPressureUUID));
// Try to access non-allowed services.
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kBatteryServiceUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kBloodPressureUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kCyclingPowerUUID));
-
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id2, kGlucoseUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id2, kHeartRateUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id2, kCyclingPowerUUID));
+ EXPECT_FALSE(allowed_devices.IsAllowedToAccessService(device_id1,
+ kBatteryServiceUUID));
+ EXPECT_FALSE(
+ allowed_devices.IsAllowedToAccessService(device_id1, kBloodPressureUUID));
+ EXPECT_FALSE(
+ allowed_devices.IsAllowedToAccessService(device_id1, kCyclingPowerUUID));
+
+ EXPECT_FALSE(
+ allowed_devices.IsAllowedToAccessService(device_id2, kGlucoseUUID));
+ EXPECT_FALSE(
+ allowed_devices.IsAllowedToAccessService(device_id2, kHeartRateUUID));
+ EXPECT_FALSE(
+ allowed_devices.IsAllowedToAccessService(device_id2, kCyclingPowerUUID));
}
-TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_TwoOriginsOneDevice) {
- BluetoothAllowedDevicesMap allowed_devices_map;
+TEST_F(BluetoothAllowedDevicesTest, AllowedServices_TwoOriginsOneDevice) {
+ scoped_refptr<BluetoothAllowedDevicesMap> allowed_devices_map =
+ new BluetoothAllowedDevicesMap();
+ content::BluetoothAllowedDevices& allowed_devices1 =
+ allowed_devices_map->GetOrCreateAllowedDevices(kTestOrigin1);
+ content::BluetoothAllowedDevices& allowed_devices2 =
+ allowed_devices_map->GetOrCreateAllowedDevices(kTestOrigin2);
// Setup request #1 for device.
blink::mojom::WebBluetoothRequestDeviceOptionsPtr options1 =
blink::mojom::WebBluetoothRequestDeviceOptions::New();
@@ -386,61 +374,57 @@ TEST_F(BluetoothAllowedDevicesMapTest, AllowedServices_TwoOriginsOneDevice) {
// Add devices to map.
const WebBluetoothDeviceId& device_id1 =
- allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options1);
+ allowed_devices1.AddDevice(kDeviceAddress1, options1);
const WebBluetoothDeviceId& device_id2 =
- allowed_devices_map.AddDevice(kTestOrigin2, kDeviceAddress1, options2);
+ allowed_devices2.AddDevice(kDeviceAddress1, options2);
// Access allowed services.
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
- kTestOrigin1, device_id1));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kGlucoseUUID));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kHeartRateUUID));
-
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
- kTestOrigin2, device_id2));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin2, device_id2, kBatteryServiceUUID));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin2, device_id2, kBloodPressureUUID));
+ EXPECT_TRUE(allowed_devices1.IsAllowedToAccessAtLeastOneService(device_id1));
+ EXPECT_TRUE(
+ allowed_devices1.IsAllowedToAccessService(device_id1, kGlucoseUUID));
+ EXPECT_TRUE(
+ allowed_devices1.IsAllowedToAccessService(device_id1, kHeartRateUUID));
+
+ EXPECT_TRUE(allowed_devices2.IsAllowedToAccessAtLeastOneService(device_id2));
+ EXPECT_TRUE(allowed_devices2.IsAllowedToAccessService(device_id2,
+ kBatteryServiceUUID));
+ EXPECT_TRUE(allowed_devices2.IsAllowedToAccessService(device_id2,
+ kBloodPressureUUID));
// Try to access non-allowed services.
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kBatteryServiceUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kBloodPressureUUID));
-
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
- kTestOrigin1, device_id2));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id2, kGlucoseUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id2, kHeartRateUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id2, kBatteryServiceUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id2, kBloodPressureUUID));
-
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin2, device_id2, kGlucoseUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin2, device_id2, kHeartRateUUID));
-
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
- kTestOrigin2, device_id1));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin2, device_id1, kGlucoseUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin2, device_id1, kHeartRateUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin2, device_id1, kBatteryServiceUUID));
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin2, device_id1, kBloodPressureUUID));
+ EXPECT_FALSE(allowed_devices1.IsAllowedToAccessService(device_id1,
+ kBatteryServiceUUID));
+ EXPECT_FALSE(allowed_devices1.IsAllowedToAccessService(device_id1,
+ kBloodPressureUUID));
+
+ EXPECT_FALSE(allowed_devices1.IsAllowedToAccessAtLeastOneService(device_id2));
+ EXPECT_FALSE(
+ allowed_devices1.IsAllowedToAccessService(device_id2, kGlucoseUUID));
+ EXPECT_FALSE(
+ allowed_devices1.IsAllowedToAccessService(device_id2, kHeartRateUUID));
+ EXPECT_FALSE(allowed_devices1.IsAllowedToAccessService(device_id2,
+ kBatteryServiceUUID));
+ EXPECT_FALSE(allowed_devices1.IsAllowedToAccessService(device_id2,
+ kBloodPressureUUID));
+
+ EXPECT_FALSE(
+ allowed_devices2.IsAllowedToAccessService(device_id2, kGlucoseUUID));
+ EXPECT_FALSE(
+ allowed_devices2.IsAllowedToAccessService(device_id2, kHeartRateUUID));
+
+ EXPECT_FALSE(allowed_devices2.IsAllowedToAccessAtLeastOneService(device_id1));
+ EXPECT_FALSE(
+ allowed_devices2.IsAllowedToAccessService(device_id1, kGlucoseUUID));
+ EXPECT_FALSE(
+ allowed_devices2.IsAllowedToAccessService(device_id1, kHeartRateUUID));
+ EXPECT_FALSE(allowed_devices2.IsAllowedToAccessService(device_id1,
+ kBatteryServiceUUID));
+ EXPECT_FALSE(allowed_devices2.IsAllowedToAccessService(device_id1,
+ kBloodPressureUUID));
}
-TEST_F(BluetoothAllowedDevicesMapTest, MergeServices) {
- BluetoothAllowedDevicesMap allowed_devices_map;
+TEST_F(BluetoothAllowedDevicesTest, MergeServices) {
+ BluetoothAllowedDevices allowed_devices;
// Setup first request.
blink::mojom::WebBluetoothRequestDeviceOptionsPtr options1 =
@@ -457,7 +441,7 @@ TEST_F(BluetoothAllowedDevicesMapTest, MergeServices) {
// Add to map.
const WebBluetoothDeviceId device_id1 =
- allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options1);
+ allowed_devices.AddDevice(kDeviceAddress1, options1);
// Setup second request.
blink::mojom::WebBluetoothRequestDeviceOptionsPtr options2 =
@@ -474,33 +458,32 @@ TEST_F(BluetoothAllowedDevicesMapTest, MergeServices) {
// Add to map again.
const WebBluetoothDeviceId device_id2 =
- allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options2);
+ allowed_devices.AddDevice(kDeviceAddress1, options2);
EXPECT_EQ(device_id1, device_id2);
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
- kTestOrigin1, device_id1));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kGlucoseUUID));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kBatteryServiceUUID));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kHeartRateUUID));
- EXPECT_TRUE(allowed_devices_map.IsOriginAllowedToAccessService(
- kTestOrigin1, device_id1, kBloodPressureUUID));
+ EXPECT_TRUE(allowed_devices.IsAllowedToAccessAtLeastOneService(device_id1));
+ EXPECT_TRUE(
+ allowed_devices.IsAllowedToAccessService(device_id1, kGlucoseUUID));
+ EXPECT_TRUE(allowed_devices.IsAllowedToAccessService(device_id1,
+ kBatteryServiceUUID));
+ EXPECT_TRUE(
+ allowed_devices.IsAllowedToAccessService(device_id1, kHeartRateUUID));
+ EXPECT_TRUE(
+ allowed_devices.IsAllowedToAccessService(device_id1, kBloodPressureUUID));
}
-TEST_F(BluetoothAllowedDevicesMapTest, CorrectIdFormat) {
- BluetoothAllowedDevicesMap allowed_devices_map;
+TEST_F(BluetoothAllowedDevicesTest, CorrectIdFormat) {
+ BluetoothAllowedDevices allowed_devices;
- const WebBluetoothDeviceId& device_id = allowed_devices_map.AddDevice(
- kTestOrigin1, kDeviceAddress1, empty_options_);
+ const WebBluetoothDeviceId& device_id =
+ allowed_devices.AddDevice(kDeviceAddress1, empty_options_);
EXPECT_TRUE(WebBluetoothDeviceId::IsValid(device_id.str()));
}
-TEST_F(BluetoothAllowedDevicesMapTest, NoFilterServices) {
- BluetoothAllowedDevicesMap allowed_devices_map;
+TEST_F(BluetoothAllowedDevicesTest, NoFilterServices) {
+ BluetoothAllowedDevices allowed_devices;
// Setup request.
blink::mojom::WebBluetoothRequestDeviceOptionsPtr options =
@@ -513,10 +496,9 @@ TEST_F(BluetoothAllowedDevicesMapTest, NoFilterServices) {
// Add to map.
const WebBluetoothDeviceId device_id =
- allowed_devices_map.AddDevice(kTestOrigin1, kDeviceAddress1, options);
+ allowed_devices.AddDevice(kDeviceAddress1, options);
- EXPECT_FALSE(allowed_devices_map.IsOriginAllowedToAccessAtLeastOneService(
- kTestOrigin1, device_id));
+ EXPECT_FALSE(allowed_devices.IsAllowedToAccessAtLeastOneService(device_id));
}
} // namespace content
« no previous file with comments | « content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc ('k') | content/browser/bluetooth/web_bluetooth_service_impl.h » ('j') | third_party/WebKit/LayoutTests/resources/bluetooth/heart-rate-two-iframes.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698