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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1641783002: bluetooth: Fix constants' names in BluetoothAllowedDevicesMap tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: Created 4 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc
diff --git a/content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc b/content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc
index 2d5243a1d5f602815ab29ecc7e25c8bd3120c353..fa699e4b51725ce371e577485108879207ff90ca 100644
--- a/content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc
+++ b/content/browser/bluetooth/bluetooth_allowed_devices_map_unittest.cc
@@ -12,15 +12,15 @@
namespace content {
namespace {
-const url::Origin test_origin1(GURL("https://www.example1.com"));
-const url::Origin test_origin2(GURL("https://www.example2.com"));
+const url::Origin kTestOrigin1(GURL("https://www.example1.com"));
+const url::Origin kTestOrigin2(GURL("https://www.example2.com"));
-const std::string device_address1 = "00:00:00";
-const std::string device_address2 = "11:11:11";
+const std::string kDeviceAddress1 = "00:00:00";
+const std::string kDeviceAddress2 = "11:11:11";
-const std::vector<content::BluetoothScanFilter> filters =
+const std::vector<content::BluetoothScanFilter> kEmptyFilters =
std::vector<BluetoothScanFilter>();
-const std::vector<device::BluetoothUUID> optional_services =
+const std::vector<device::BluetoothUUID> kEmptyOptionalServices =
std::vector<device::BluetoothUUID>();
} // namespace
@@ -30,110 +30,110 @@ TEST_F(BluetoothAllowedDevicesMapTest, AddDeviceToMap) {
BluetoothAllowedDevicesMap allowed_devices_map;
const std::string& device_id = allowed_devices_map.AddDevice(
- test_origin1, device_address1, filters, optional_services);
+ kTestOrigin1, kDeviceAddress1, kEmptyFilters, kEmptyOptionalServices);
// Test that we can retrieve the device address/id.
EXPECT_EQ(device_id,
- allowed_devices_map.GetDeviceId(test_origin1, device_address1));
- EXPECT_EQ(device_address1,
- allowed_devices_map.GetDeviceAddress(test_origin1, device_id));
+ allowed_devices_map.GetDeviceId(kTestOrigin1, kDeviceAddress1));
+ EXPECT_EQ(kDeviceAddress1,
+ allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id));
}
TEST_F(BluetoothAllowedDevicesMapTest, AddDeviceToMapTwice) {
BluetoothAllowedDevicesMap allowed_devices_map;
const std::string& device_id1 = allowed_devices_map.AddDevice(
- test_origin1, device_address1, filters, optional_services);
+ kTestOrigin1, kDeviceAddress1, kEmptyFilters, kEmptyOptionalServices);
const std::string& device_id2 = allowed_devices_map.AddDevice(
- test_origin1, device_address1, filters, optional_services);
+ kTestOrigin1, kDeviceAddress1, kEmptyFilters, kEmptyOptionalServices);
EXPECT_EQ(device_id1, device_id2);
// Test that we can retrieve the device address/id.
EXPECT_EQ(device_id1,
- allowed_devices_map.GetDeviceId(test_origin1, device_address1));
- EXPECT_EQ(device_address1,
- allowed_devices_map.GetDeviceAddress(test_origin1, device_id1));
+ allowed_devices_map.GetDeviceId(kTestOrigin1, kDeviceAddress1));
+ EXPECT_EQ(kDeviceAddress1,
+ allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id1));
}
TEST_F(BluetoothAllowedDevicesMapTest, AddTwoDevicesFromSameOriginToMap) {
BluetoothAllowedDevicesMap allowed_devices_map;
const std::string& device_id1 = allowed_devices_map.AddDevice(
- test_origin1, device_address1, filters, optional_services);
+ kTestOrigin1, kDeviceAddress1, kEmptyFilters, kEmptyOptionalServices);
const std::string& device_id2 = allowed_devices_map.AddDevice(
- test_origin1, device_address2, filters, optional_services);
+ kTestOrigin1, kDeviceAddress2, kEmptyFilters, kEmptyOptionalServices);
EXPECT_NE(device_id1, device_id2);
// Test that we can retrieve the device address/id.
EXPECT_EQ(device_id1,
- allowed_devices_map.GetDeviceId(test_origin1, device_address1));
+ allowed_devices_map.GetDeviceId(kTestOrigin1, kDeviceAddress1));
EXPECT_EQ(device_id2,
- allowed_devices_map.GetDeviceId(test_origin1, device_address2));
+ allowed_devices_map.GetDeviceId(kTestOrigin1, kDeviceAddress2));
- EXPECT_EQ(device_address1,
- allowed_devices_map.GetDeviceAddress(test_origin1, device_id1));
- EXPECT_EQ(device_address2,
- allowed_devices_map.GetDeviceAddress(test_origin1, device_id2));
+ EXPECT_EQ(kDeviceAddress1,
+ allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id1));
+ EXPECT_EQ(kDeviceAddress2,
+ allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id2));
}
TEST_F(BluetoothAllowedDevicesMapTest, AddTwoDevicesFromTwoOriginsToMap) {
BluetoothAllowedDevicesMap allowed_devices_map;
const std::string& device_id1 = allowed_devices_map.AddDevice(
- test_origin1, device_address1, filters, optional_services);
+ kTestOrigin1, kDeviceAddress1, kEmptyFilters, kEmptyOptionalServices);
const std::string& device_id2 = allowed_devices_map.AddDevice(
- test_origin2, device_address2, filters, optional_services);
+ kTestOrigin2, kDeviceAddress2, kEmptyFilters, kEmptyOptionalServices);
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.GetDeviceId(test_origin1, device_address2));
+ allowed_devices_map.GetDeviceId(kTestOrigin1, kDeviceAddress2));
EXPECT_EQ(base::EmptyString(),
- allowed_devices_map.GetDeviceId(test_origin2, device_address1));
+ allowed_devices_map.GetDeviceId(kTestOrigin2, kDeviceAddress1));
EXPECT_EQ(base::EmptyString(),
- allowed_devices_map.GetDeviceAddress(test_origin1, device_id2));
+ allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id2));
EXPECT_EQ(base::EmptyString(),
- allowed_devices_map.GetDeviceAddress(test_origin2, device_id1));
+ allowed_devices_map.GetDeviceAddress(kTestOrigin2, device_id1));
// Test that we can retrieve the device address/id.
EXPECT_EQ(device_id1,
- allowed_devices_map.GetDeviceId(test_origin1, device_address1));
+ allowed_devices_map.GetDeviceId(kTestOrigin1, kDeviceAddress1));
EXPECT_EQ(device_id2,
- allowed_devices_map.GetDeviceId(test_origin2, device_address2));
+ allowed_devices_map.GetDeviceId(kTestOrigin2, kDeviceAddress2));
- EXPECT_EQ(device_address1,
- allowed_devices_map.GetDeviceAddress(test_origin1, device_id1));
- EXPECT_EQ(device_address2,
- allowed_devices_map.GetDeviceAddress(test_origin2, device_id2));
+ EXPECT_EQ(kDeviceAddress1,
+ allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id1));
+ EXPECT_EQ(kDeviceAddress2,
+ allowed_devices_map.GetDeviceAddress(kTestOrigin2, device_id2));
}
TEST_F(BluetoothAllowedDevicesMapTest, AddDeviceFromTwoOriginsToMap) {
BluetoothAllowedDevicesMap allowed_devices_map;
const std::string& device_id1 = allowed_devices_map.AddDevice(
- test_origin1, device_address1, filters, optional_services);
+ kTestOrigin1, kDeviceAddress1, kEmptyFilters, kEmptyOptionalServices);
const std::string& device_id2 = allowed_devices_map.AddDevice(
- test_origin2, device_address1, filters, optional_services);
+ kTestOrigin2, kDeviceAddress1, kEmptyFilters, kEmptyOptionalServices);
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(test_origin1, device_id2));
+ allowed_devices_map.GetDeviceAddress(kTestOrigin1, device_id2));
EXPECT_EQ(base::EmptyString(),
- allowed_devices_map.GetDeviceAddress(test_origin2, device_id1));
+ allowed_devices_map.GetDeviceAddress(kTestOrigin2, device_id1));
}
TEST_F(BluetoothAllowedDevicesMapTest, AddRemoveAddDeviceToMap) {
BluetoothAllowedDevicesMap allowed_devices_map;
const std::string device_id_first_time = allowed_devices_map.AddDevice(
- test_origin1, device_address1, filters, optional_services);
+ kTestOrigin1, kDeviceAddress1, kEmptyFilters, kEmptyOptionalServices);
- allowed_devices_map.RemoveDevice(test_origin1, device_address1);
+ allowed_devices_map.RemoveDevice(kTestOrigin1, kDeviceAddress1);
const std::string device_id_second_time = allowed_devices_map.AddDevice(
- test_origin1, device_address1, filters, optional_services);
+ kTestOrigin1, kDeviceAddress1, kEmptyFilters, kEmptyOptionalServices);
EXPECT_NE(device_id_first_time, device_id_second_time);
}
@@ -142,21 +142,21 @@ TEST_F(BluetoothAllowedDevicesMapTest, RemoveDeviceFromMap) {
BluetoothAllowedDevicesMap allowed_devices_map;
const std::string& device_id = allowed_devices_map.AddDevice(
- test_origin1, device_address1, filters, optional_services);
+ kTestOrigin1, kDeviceAddress1, kEmptyFilters, kEmptyOptionalServices);
- allowed_devices_map.RemoveDevice(test_origin1, device_address1);
+ allowed_devices_map.RemoveDevice(kTestOrigin1, kDeviceAddress1);
EXPECT_EQ(base::EmptyString(),
- allowed_devices_map.GetDeviceId(test_origin1, device_id));
+ allowed_devices_map.GetDeviceId(kTestOrigin1, device_id));
EXPECT_EQ(base::EmptyString(), allowed_devices_map.GetDeviceAddress(
- test_origin1, device_address1));
+ kTestOrigin1, kDeviceAddress1));
}
TEST_F(BluetoothAllowedDevicesMapTest, CorrectIdFormat) {
BluetoothAllowedDevicesMap allowed_devices_map;
const std::string& device_id = allowed_devices_map.AddDevice(
- test_origin1, device_address1, filters, optional_services);
+ kTestOrigin1, kDeviceAddress1, kEmptyFilters, kEmptyOptionalServices);
EXPECT_TRUE(device_id.size() == 24)
<< "Expected Lenghth of a 128bit string encoded to Base64.";
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698