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

Unified Diff: device/bluetooth/bluez/bluetooth_bluez_unittest.cc

Issue 2792203003: Revert of Bluetooth: Add service data unit tests for chromeos (Closed)
Patch Set: Created 3 years, 9 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 | « device/bluetooth/bluetooth_device_unittest.cc ('k') | device/bluetooth/dbus/fake_bluetooth_device_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluez/bluetooth_bluez_unittest.cc
diff --git a/device/bluetooth/bluez/bluetooth_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
index 74d88017fc7f35c0de15086fa905cecdcedd8c8b..8d1b1e255392efb6717c395e3f86b2f0a7ba424c 100644
--- a/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc
@@ -4482,6 +4482,69 @@
EXPECT_EQ(1 + kNumberOfDiscoverySessions, error_callback_count_);
}
+TEST_F(BluetoothBlueZTest, ServiceDataChanged) {
+ // Simulate a change of service data of a device.
+ GetAdapter();
+
+ BluetoothDevice* device = adapter_->GetDevice(
+ bluez::FakeBluetoothDeviceClient::kPairedDeviceAddress);
+
+ // Install an observer; expect the DeviceChanged method to be called
+ // when we change the service data.
+ TestBluetoothAdapterObserver observer(adapter_);
+
+ bluez::FakeBluetoothDeviceClient::Properties* properties =
+ fake_bluetooth_device_client_->GetProperties(dbus::ObjectPath(
+ bluez::FakeBluetoothDeviceClient::kPairedDevicePath));
+
+ properties->service_data.set_valid(true);
+
+ // Check that ServiceDataChanged is correctly invoke.
+ properties->service_data.ReplaceValue({{kGapUuid, {1, 2, 3}}});
+ EXPECT_EQ(1, observer.device_changed_count());
+ EXPECT_EQ(device, observer.last_device());
+ EXPECT_EQ(
+ BluetoothDevice::ServiceDataMap({{BluetoothUUID(kGapUuid), {1, 2, 3}}}),
+ device->GetServiceData());
+ EXPECT_EQ(BluetoothDevice::UUIDSet({BluetoothUUID(kGapUuid)}),
+ device->GetServiceDataUUIDs());
+ EXPECT_EQ(std::vector<uint8_t>({1, 2, 3}),
+ *(device->GetServiceDataForUUID(BluetoothUUID(kGapUuid))));
+
+ // Check that we can update service data with same uuid / add more uuid.
+ properties->service_data.ReplaceValue(
+ {{kGapUuid, {3, 2, 1}}, {kGattUuid, {1}}});
+ EXPECT_EQ(2, observer.device_changed_count());
+ EXPECT_EQ(device, observer.last_device());
+
+ EXPECT_EQ(
+ BluetoothDevice::ServiceDataMap({{BluetoothUUID(kGapUuid), {3, 2, 1}},
+ {BluetoothUUID(kGattUuid), {1}}}),
+ device->GetServiceData());
+ EXPECT_EQ(BluetoothDevice::UUIDSet(
+ {BluetoothUUID(kGapUuid), BluetoothUUID(kGattUuid)}),
+ device->GetServiceDataUUIDs());
+ EXPECT_EQ(std::vector<uint8_t>({3, 2, 1}),
+ *(device->GetServiceDataForUUID(BluetoothUUID(kGapUuid))));
+ EXPECT_EQ(std::vector<uint8_t>({1}),
+ *(device->GetServiceDataForUUID(BluetoothUUID(kGattUuid))));
+
+ // Check that we can remove uuid / change uuid with same data.
+ properties->service_data.ReplaceValue({{kPnpUuid, {3, 2, 1}}});
+ EXPECT_EQ(3, observer.device_changed_count());
+ EXPECT_EQ(device, observer.last_device());
+
+ EXPECT_EQ(
+ BluetoothDevice::ServiceDataMap({{BluetoothUUID(kPnpUuid), {3, 2, 1}}}),
+ device->GetServiceData());
+ EXPECT_EQ(BluetoothDevice::UUIDSet({BluetoothUUID(kPnpUuid)}),
+ device->GetServiceDataUUIDs());
+ EXPECT_EQ(std::vector<uint8_t>({3, 2, 1}),
+ *(device->GetServiceDataForUUID(BluetoothUUID(kPnpUuid))));
+ EXPECT_EQ(nullptr, device->GetServiceDataForUUID(BluetoothUUID(kGapUuid)));
+ EXPECT_EQ(nullptr, device->GetServiceDataForUUID(BluetoothUUID(kGattUuid)));
+}
+
TEST_F(BluetoothBlueZTest, ManufacturerDataChanged) {
const BluetoothDevice::ManufacturerId kManufacturerId1 = 0x1234;
const BluetoothDevice::ManufacturerId kManufacturerId2 = 0x2345;
« no previous file with comments | « device/bluetooth/bluetooth_device_unittest.cc ('k') | device/bluetooth/dbus/fake_bluetooth_device_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698