Bluetooth: macOS: Adding counter for service discovery callbacks.

device/bluetooth/test/bluetooth_test_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/test/bluetooth_test_mac.h"
 
 #include <stdint.h>
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 449 matching lines @@
       static_cast<BluetoothRemoteGattServiceMac*>(service);
   CBService* cb_service = mac_gatt_service->GetService();
   MockCBService* service_mock = ObjCCast<MockCBService>(cb_service);
   BluetoothRemoteGattCharacteristicMac* characteristic_mac =
       static_cast<BluetoothRemoteGattCharacteristicMac*>(characteristic);
   CBCharacteristic* cb_characteristic =
       characteristic_mac->GetCBCharacteristic();
   MockCBCharacteristic* characteristic_mock =
       ObjCCast<MockCBCharacteristic>(cb_characteristic);
   [service_mock removeCharacteristicMock:characteristic_mock];
+  [peripheral_mock didModifyServices:@[]];
   [peripheral_mock mockDidDiscoverEvents];
 }
 
 void BluetoothTestMac::ExpectedChangeNotifyValueAttempts(int attempts) {
   EXPECT_EQ(attempts, gatt_notify_characteristic_attempts_);
 }
 
 void BluetoothTestMac::ExpectedNotifyValue(
     NotifyValueState expected_value_state) {
   switch (expected_value_state) {
     case NotifyValueState::NONE:
       EXPECT_FALSE(last_notify_value_);
       break;
     case NotifyValueState::NOTIFY:
     case NotifyValueState::INDICATE:
       EXPECT_TRUE(last_notify_value_);
       break;
   }
 }
 
+void BluetoothTestMac::SimulateDidDiscoverServices(

[ortuno, 2017/03/06 09:49:55]

Seems like we are repeating a lot of code from SimulateGattServicesDiscovered is
there any way we can reuse that code? OK to leave for future patches.

[jlebel, 2017/03/06 22:13:20]

crrev.com/2738563002

+    BluetoothDevice* device,
+    const std::vector<std::string>& uuids) {
+  BluetoothLowEnergyDeviceMac* device_mac =
+      static_cast<BluetoothLowEnergyDeviceMac*>(device);
+  CBPeripheral* peripheral = device_mac->GetPeripheral();
+  MockCBPeripheral* peripheral_mock = ObjCCast<MockCBPeripheral>(peripheral);
+  scoped_nsobject<NSMutableArray> services([[NSMutableArray alloc] init]);
+  for (auto uuid : uuids) {
+    CBUUID* cb_service_uuid = [CBUUID UUIDWithString:@(uuid.c_str())];
+    [services addObject:cb_service_uuid];
+  }
+  [peripheral_mock addServices:services];
+  [peripheral_mock mockDidDiscoverServices];
+}
+
 void BluetoothTestMac::OnFakeBluetoothDeviceConnectGattCalled() {
   gatt_connection_attempts_++;
 }
 
 void BluetoothTestMac::OnFakeBluetoothGattDisconnect() {
   gatt_disconnection_attempts_++;
 }
 
 void BluetoothTestMac::OnFakeBluetoothServiceDiscovery() {
   gatt_discovery_attempts_++;
 }
 
+void BluetoothTestMac::OnFakeBluetoothCharacteristicDiscovery() {
+  gatt_characteristic_discovery_attempts_++;
+}
+
 void BluetoothTest::OnFakeBluetoothCharacteristicReadValue() {
   gatt_read_characteristic_attempts_++;
 }
 
 void BluetoothTest::OnFakeBluetoothCharacteristicWriteValue(
     std::vector<uint8_t> value) {
   last_write_value_ = value;
   gatt_write_characteristic_attempts_++;
 }
 
@@ skipping 70 matching lines @@
 //     crypto::SHA256HashString(input_str, raw, sizeof(raw));
 //     if (base::HexEncode(raw, sizeof(raw)) == target) {
 //       return input_str;
 //     }
 //     ++input[0];
 //   }
 //   return "";
 // }
 
 }  // namespace device