Bringing 4 more BluetoothTest.* unit tests to Mac

device/bluetooth/bluetooth_low_energy_device_mac.mm

 // Copyright 2015 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 "device/bluetooth/bluetooth_low_energy_device_mac.h"
 
 #import <CoreFoundation/CoreFoundation.h>
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
@@ skipping 13 matching lines @@
   // UUIDString only available OS X >= 10.8.
   DCHECK(base::mac::IsOSMountainLionOrLater());
   std::string uuid_c_string = base::SysNSStringToUTF8([uuid UUIDString]);
   return device::BluetoothUUID(uuid_c_string);
 }
 
 }  // namespace
 
 BluetoothLowEnergyDeviceMac::BluetoothLowEnergyDeviceMac(
     CBPeripheral* peripheral,
-    NSDictionary* advertisementData,
+    NSDictionary* advertisement_data,
     int rssi) {
   DCHECK(BluetoothAdapterMac::IsLowEnergyAvailable());
   identifier_ = GetPeripheralIdentifier(peripheral);
   hash_address_ = GetPeripheralHashAddress(peripheral);
-  Update(peripheral, advertisementData, rssi);
+  Update(peripheral, advertisement_data, rssi);
 }
 
 BluetoothLowEnergyDeviceMac::~BluetoothLowEnergyDeviceMac() {
 }
 
 void BluetoothLowEnergyDeviceMac::Update(CBPeripheral* peripheral,
-                                         NSDictionary* advertisementData,
+                                         NSDictionary* advertisement_data,
                                          int rssi) {
   last_update_time_.reset([[NSDate date] retain]);
   peripheral_.reset([peripheral retain]);
   rssi_ = rssi;
   ClearServiceData();
-  NSNumber* nbConnectable =
-      [advertisementData objectForKey:CBAdvertisementDataIsConnectable];
-  connectable_ = [nbConnectable boolValue];
-  NSDictionary* serviceData =
-      [advertisementData objectForKey:CBAdvertisementDataServiceDataKey];
-  for (CBUUID* uuid in serviceData) {
-    NSData* data = [serviceData objectForKey:uuid];
-    BluetoothUUID serviceUUID = BluetoothUUIDWithCBUUID(uuid);
-    SetServiceData(serviceUUID, (const char*)[data bytes], [data length]);
+  NSNumber* connectable =
+      [advertisement_data objectForKey:CBAdvertisementDataIsConnectable];
+  connectable_ = [connectable boolValue];
+  NSDictionary* service_data =
+      [advertisement_data objectForKey:CBAdvertisementDataServiceDataKey];
+  for (CBUUID* uuid in service_data) {

[scheib, 2015/07/23 18:15:25]

ClearServiceData(); before setting values, so that old service data isn't kept?

[krstnmnlsn, 2015/07/23 22:03:29]

The call was further above.  Moved it down for clarity though.

[scheib, 2015/07/23 22:15:39]

Oh! great. Hmm, yeah, line breaks for sections would have helped a bit too here,
no need to change though.

+    NSData* data = [service_data objectForKey:uuid];
+    BluetoothUUID service_UUID = BluetoothUUIDWithCBUUID(uuid);
+    SetServiceData(service_UUID, (const char*)[data bytes], [data length]);
+  }
+  uuids_.clear();
+  NSArray* service_uuids =
+      [advertisement_data objectForKey:@"CBAdvertisementDataServiceUUIDsKey"];
+  for (CBUUID* uuid in service_uuids) {
+    uuids_.push_back(
+        BluetoothUUID(std::string([[uuid UUIDString] UTF8String])));
   }
 }
 
 std::string BluetoothLowEnergyDeviceMac::GetIdentifier() const {
   return identifier_;
 }
 
 uint32 BluetoothLowEnergyDeviceMac::GetBluetoothClass() const {
   return 0;
 }
@@ skipping 33 matching lines @@
 
 bool BluetoothLowEnergyDeviceMac::IsConnectable() const {
   return connectable_;
 }
 
 bool BluetoothLowEnergyDeviceMac::IsConnecting() const {
   return false;
 }
 
 BluetoothDevice::UUIDList BluetoothLowEnergyDeviceMac::GetUUIDs() const {
-  return std::vector<device::BluetoothUUID>();
+  return uuids_;
 }
 
 int16 BluetoothLowEnergyDeviceMac::GetInquiryRSSI() const {
   return kUnknownPower;
 }
 
 int16 BluetoothLowEnergyDeviceMac::GetInquiryTxPower() const {
   NOTIMPLEMENTED();
   return kUnknownPower;
 }
@@ skipping 106 matching lines @@
       instanceMethodSignatureForSelector:@selector(state)] retain]);
   base::scoped_nsobject<NSInvocation> invocation(
       [[NSInvocation invocationWithMethodSignature:signature] retain]);
   [invocation setTarget:peripheral_];
   [invocation setSelector:@selector(state)];
   [invocation invoke];
   CBPeripheralState state = CBPeripheralStateDisconnected;
   [invocation getReturnValue:&state];
   return state;
 }