bluetooth: Refactor how we update based on Advertising Data

device/bluetooth/bluez/bluetooth_bluez_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
@@ skipping 2144 matching lines @@
       base::UTF8ToUTF16(bluez::FakeBluetoothDeviceClient::kPairedDeviceAlias),
       devices[idx]->GetNameForDisplay());
   EXPECT_EQ(BluetoothDevice::DEVICE_COMPUTER, devices[idx]->GetDeviceType());
   EXPECT_TRUE(devices[idx]->IsPaired());
   EXPECT_FALSE(devices[idx]->IsConnected());
   EXPECT_FALSE(devices[idx]->IsConnecting());
 
   // Non HID devices are always connectable.
   EXPECT_TRUE(devices[idx]->IsConnectable());
 
-  BluetoothDevice::UUIDList uuids = devices[idx]->GetUUIDs();
+  BluetoothDevice::UUIDSet uuids = devices[idx]->GetUUIDs();
   ASSERT_EQ(2U, uuids.size());
-  EXPECT_EQ(uuids[0], BluetoothUUID("1800"));
-  EXPECT_EQ(uuids[1], BluetoothUUID("1801"));
+  EXPECT_TRUE(base::ContainsKey(uuids, BluetoothUUID("1800")));
+  EXPECT_TRUE(base::ContainsKey(uuids, BluetoothUUID("1801")));
 
   EXPECT_EQ(BluetoothDevice::VENDOR_ID_USB, devices[idx]->GetVendorIDSource());
   EXPECT_EQ(0x05ac, devices[idx]->GetVendorID());
   EXPECT_EQ(0x030d, devices[idx]->GetProductID());
   EXPECT_EQ(0x0306, devices[idx]->GetDeviceID());
 }
 
 TEST_F(BluetoothBlueZTest, DeviceClassChanged) {
   // Simulate a change of class of a device, as sometimes occurs
   // during discovery.
@@ skipping 249 matching lines @@
 
   BluetoothAdapter::DeviceList devices = adapter_->GetDevices();
   ASSERT_EQ(2U, devices.size());
 
   int idx = GetDeviceIndexByAddress(
       devices, bluez::FakeBluetoothDeviceClient::kPairedDeviceAddress);
   ASSERT_NE(-1, idx);
   ASSERT_EQ(bluez::FakeBluetoothDeviceClient::kPairedDeviceAddress,
             devices[idx]->GetAddress());
 
-  BluetoothDevice::UUIDList uuids = devices[idx]->GetUUIDs();
+  BluetoothDevice::UUIDSet uuids = devices[idx]->GetUUIDs();
   ASSERT_EQ(2U, uuids.size());
-  ASSERT_EQ(uuids[0], BluetoothUUID("1800"));
-  ASSERT_EQ(uuids[1], BluetoothUUID("1801"));
+  ASSERT_TRUE(base::ContainsKey(uuids, BluetoothUUID("1800")));
+  ASSERT_TRUE(base::ContainsKey(uuids, BluetoothUUID("1801")));
 
   // Install an observer; expect the DeviceChanged method to be called when
   // we change the class of the device.
   TestBluetoothAdapterObserver observer(adapter_);
 
   bluez::FakeBluetoothDeviceClient::Properties* properties =
       fake_bluetooth_device_client_->GetProperties(dbus::ObjectPath(
           bluez::FakeBluetoothDeviceClient::kPairedDevicePath));
 
   std::vector<std::string> new_uuids;
-  new_uuids.push_back(uuids[0].canonical_value());
-  new_uuids.push_back(uuids[1].canonical_value());
+  new_uuids.push_back(BluetoothUUID("1800").canonical_value());
+  new_uuids.push_back(BluetoothUUID("1801").canonical_value());
   new_uuids.push_back("0000110c-0000-1000-8000-00805f9b34fb");
   new_uuids.push_back("0000110e-0000-1000-8000-00805f9b34fb");
   new_uuids.push_back("0000110a-0000-1000-8000-00805f9b34fb");
 
   properties->uuids.ReplaceValue(new_uuids);
 
   EXPECT_EQ(1, observer.device_changed_count());
   EXPECT_EQ(devices[idx], observer.last_device());
 
   // Fetching the value should give the new one.
   uuids = devices[idx]->GetUUIDs();
   ASSERT_EQ(5U, uuids.size());
-  EXPECT_EQ(uuids[0], BluetoothUUID("1800"));
-  EXPECT_EQ(uuids[1], BluetoothUUID("1801"));
-  EXPECT_EQ(uuids[2], BluetoothUUID("110c"));
-  EXPECT_EQ(uuids[3], BluetoothUUID("110e"));
-  EXPECT_EQ(uuids[4], BluetoothUUID("110a"));
+  EXPECT_TRUE(base::ContainsKey(uuids, BluetoothUUID("1800")));
+  EXPECT_TRUE(base::ContainsKey(uuids, BluetoothUUID("1801")));
+  EXPECT_TRUE(base::ContainsKey(uuids, BluetoothUUID("110c")));
+  EXPECT_TRUE(base::ContainsKey(uuids, BluetoothUUID("110e")));
+  EXPECT_TRUE(base::ContainsKey(uuids, BluetoothUUID("110a")));
 }
 
 TEST_F(BluetoothBlueZTest, DeviceInquiryRSSIInvalidated) {
   // Simulate invalidation of inquiry RSSI of a device, as it occurs
   // when discovery is finished.
   GetAdapter();
 
   BluetoothAdapter::DeviceList devices = adapter_->GetDevices();
   ASSERT_EQ(2U, devices.size());
 
@@ skipping 202 matching lines @@
   EXPECT_TRUE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 
   // Make sure the trusted property has been set to true.
   bluez::FakeBluetoothDeviceClient::Properties* properties =
       fake_bluetooth_device_client_->GetProperties(dbus::ObjectPath(
           bluez::FakeBluetoothDeviceClient::kConnectUnpairablePath));
   EXPECT_TRUE(properties->trusted.value());
 
   // Verify is a HID device and is not connectable.
-  BluetoothDevice::UUIDList uuids = device->GetUUIDs();
+  BluetoothDevice::UUIDSet uuids = device->GetUUIDs();
   ASSERT_EQ(1U, uuids.size());

[Jeffrey Yasskin, 2016/08/19 15:09:53]

You can change these to EXPECT_EQ now that the inspection won't crash if the
set's too small.

[ortuno, 2016/08/19 20:50:34]

Done.

-  EXPECT_EQ(uuids[0], BluetoothUUID("1124"));
+  EXPECT_TRUE(base::ContainsKey(uuids, BluetoothUUID("1124")));
   EXPECT_FALSE(device->IsConnectable());
 }
 
 TEST_F(BluetoothBlueZTest, ConnectConnectedDevice) {
   GetAdapter();
 
   BluetoothDevice* device = adapter_->GetDevice(
       bluez::FakeBluetoothDeviceClient::kPairedDeviceAddress);
   ASSERT_TRUE(device != nullptr);
   ASSERT_TRUE(device->IsPaired());
@@ skipping 225 matching lines @@
   // mode (IsConnectable).
   EXPECT_EQ(7, observer.device_changed_count());
   EXPECT_EQ(device, observer.last_device());
 
   EXPECT_TRUE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 
   EXPECT_TRUE(device->IsPaired());
 
   // Verify is a HID device and is connectable.
-  BluetoothDevice::UUIDList uuids = device->GetUUIDs();
+  BluetoothDevice::UUIDSet uuids = device->GetUUIDs();
   ASSERT_EQ(1U, uuids.size());
-  EXPECT_EQ(uuids[0], BluetoothUUID("1124"));
+  EXPECT_TRUE(base::ContainsKey(uuids, BluetoothUUID("1124")));
   EXPECT_TRUE(device->IsConnectable());
 
   // Make sure the trusted property has been set to true.
   bluez::FakeBluetoothDeviceClient::Properties* properties =
       fake_bluetooth_device_client_->GetProperties(dbus::ObjectPath(
           bluez::FakeBluetoothDeviceClient::kLegacyAutopairPath));
   EXPECT_TRUE(properties->trusted.value());
 }
 
 TEST_F(BluetoothBlueZTest, PairDisplayPinCode) {
@@ skipping 30 matching lines @@
   // mode (IsConnectable).
   EXPECT_EQ(7, observer.device_changed_count());
   EXPECT_EQ(device, observer.last_device());
 
   EXPECT_TRUE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 
   EXPECT_TRUE(device->IsPaired());
 
   // Verify is a HID device and is connectable.
-  BluetoothDevice::UUIDList uuids = device->GetUUIDs();
+  BluetoothDevice::UUIDSet uuids = device->GetUUIDs();
   ASSERT_EQ(1U, uuids.size());
-  EXPECT_EQ(uuids[0], BluetoothUUID("1124"));
+  EXPECT_TRUE(base::ContainsKey(uuids, BluetoothUUID("1124")));
   EXPECT_TRUE(device->IsConnectable());
 
   // Make sure the trusted property has been set to true.
   bluez::FakeBluetoothDeviceClient::Properties* properties =
       fake_bluetooth_device_client_->GetProperties(dbus::ObjectPath(
           bluez::FakeBluetoothDeviceClient::kDisplayPinCodePath));
   EXPECT_TRUE(properties->trusted.value());
 }
 
 TEST_F(BluetoothBlueZTest, PairDisplayPasskey) {
@@ skipping 50 matching lines @@
   // mode (IsConnectable).
   EXPECT_EQ(7, observer.device_changed_count());
   EXPECT_EQ(device, observer.last_device());
 
   EXPECT_TRUE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 
   EXPECT_TRUE(device->IsPaired());
 
   // Verify is a HID device.
-  BluetoothDevice::UUIDList uuids = device->GetUUIDs();
+  BluetoothDevice::UUIDSet uuids = device->GetUUIDs();
   ASSERT_EQ(1U, uuids.size());
-  EXPECT_EQ(uuids[0], BluetoothUUID("1124"));
+  EXPECT_TRUE(base::ContainsKey(uuids, BluetoothUUID("1124")));
 
   // And usually not connectable.
   EXPECT_FALSE(device->IsConnectable());
 
   // Make sure the trusted property has been set to true.
   bluez::FakeBluetoothDeviceClient::Properties* properties =
       fake_bluetooth_device_client_->GetProperties(dbus::ObjectPath(
           bluez::FakeBluetoothDeviceClient::kDisplayPasskeyPath));
   EXPECT_TRUE(properties->trusted.value());
 }
@@ skipping 32 matching lines @@
   // two for trusted (after pairing and connection).
   EXPECT_EQ(6, observer.device_changed_count());
   EXPECT_EQ(device, observer.last_device());
 
   EXPECT_TRUE(device->IsConnected());
   EXPECT_FALSE(device->IsConnecting());
 
   EXPECT_TRUE(device->IsPaired());
 
   // Verify is not a HID device.
-  BluetoothDevice::UUIDList uuids = device->GetUUIDs();
+  BluetoothDevice::UUIDSet uuids = device->GetUUIDs();
   ASSERT_EQ(0U, uuids.size());
 
   // Non HID devices are always connectable.
   EXPECT_TRUE(device->IsConnectable());
 
   // Make sure the trusted property has been set to true.
   bluez::FakeBluetoothDeviceClient::Properties* properties =
       fake_bluetooth_device_client_->GetProperties(dbus::ObjectPath(
           bluez::FakeBluetoothDeviceClient::kRequestPinCodePath));
   EXPECT_TRUE(properties->trusted.value());
@@ skipping 1374 matching lines @@
   adapter_->Shutdown();
   adapter_bluez->OnStopDiscoveryError(GetDiscoveryErrorCallback(), "", "");
 
   // 1 error reported to RemoveDiscoverySession because of OnStopDiscoveryError,
   // and kNumberOfDiscoverySessions errors queued with AddDiscoverySession.
   EXPECT_EQ(0, callback_count_);
   EXPECT_EQ(1 + kNumberOfDiscoverySessions, error_callback_count_);
 }
 
 }  // namespace bluez