Preparing for characteristics discovery

Preparing for characteristics discovery

Mock services should be removed when simulating disconnect.

Renaming -[MockCBPeripheral didDiscoverWithError:] into
-[MockCBPeripheral didDiscoverServicesWithError:].

BUG=None

Committed: https://crrev.com/471d7dd53dbab5619b2b976f990357f4b95d00cf
Cr-Commit-Position: refs/heads/master@{#397658}

[jlebel, 2016-06-01 01:26:23]

The CQ bit was checked by jlebel@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-06-01 01:26:50]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2026193002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2026193002/1

[jlebel, 2016-06-01 01:33:54]

Description was changed from

==========
Preparing for characteristics discovery

Mock services should be removed when simulating disconnect. And renaming
-[MockCBPeripheral didDiscoverWithError:] into
-[MockCBPeripheral didDiscoverServicesWithError:].

BUG=
==========

to

==========
Preparing for characteristics discovery

Mock services should be removed when simulating disconnect. And renaming
-[MockCBPeripheral didDiscoverWithError:] into
-[MockCBPeripheral didDiscoverServicesWithError:].

BUG=None
==========

[jlebel, 2016-06-01 01:34:26]

Description was changed from

==========
Preparing for characteristics discovery

Mock services should be removed when simulating disconnect. And renaming
-[MockCBPeripheral didDiscoverWithError:] into
-[MockCBPeripheral didDiscoverServicesWithError:].

BUG=None
==========

to

==========
Preparing for characteristics discovery

Mock services should be removed when simulating disconnect.

Renaming -[MockCBPeripheral didDiscoverWithError:] into
-[MockCBPeripheral didDiscoverServicesWithError:].


BUG=None
==========

[commit-bot: I haz the power, 2016-06-01 01:37:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-01 01:37:49]

Dry run: Try jobs failed on following builders:
  mac_chromium_rel_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[jlebel, 2016-06-01 02:12:35]

The CQ bit was checked by jlebel@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-06-01 02:13:01]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2026193002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2026193002/20001

[jlebel, 2016-06-01 03:22:06]

jlebel@chromium.org changed reviewers:
+ fbeaufort@chromium.org, ortuno@chromium.org

[jlebel, 2016-06-01 03:22:09]

Hello Giovanni,

Can you review this small patch to cleanup to prepare for characteristic
discovery?

Thanks,

[commit-bot: I haz the power, 2016-06-01 03:22:33]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-01 03:22:35]

Dry run: This issue passed the CQ dry run.

[ortuno, 2016-06-01 04:11:49]

https://codereview.chromium.org/2026193002/diff/20001/device/bluetooth/test/b...
File device/bluetooth/test/bluetooth_test_mac.mm (right):

https://codereview.chromium.org/2026193002/diff/20001/device/bluetooth/test/b...
device/bluetooth/test/bluetooth_test_mac.mm:223: [peripheral_mock
removeAllServices];
Does this actually happen on real devices?

[jlebel, 2016-06-02 23:50:14]

On 2016/06/01 04:11:49, ortuno wrote:
>
https://codereview.chromium.org/2026193002/diff/20001/device/bluetooth/test/b...
> File device/bluetooth/test/bluetooth_test_mac.mm (right):
> 
>
https://codereview.chromium.org/2026193002/diff/20001/device/bluetooth/test/b...
> device/bluetooth/test/bluetooth_test_mac.mm:223: [peripheral_mock
> removeAllServices];
> Does this actually happen on real devices?

-[CBPeripheral services] returns nil until the services are discovered. And
returns nil again when the device is disconnected.

[jlebel, 2016-06-02 23:57:32]

The CQ bit was checked by jlebel@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-06-02 23:59:10]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2026193002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2026193002/40001

[ortuno, 2016-06-03 00:05:11]

https://codereview.chromium.org/2026193002/diff/40001/device/bluetooth/test/b...
File device/bluetooth/test/bluetooth_test_mac.mm (right):

https://codereview.chromium.org/2026193002/diff/40001/device/bluetooth/test/b...
device/bluetooth/test/bluetooth_test_mac.mm:253: [peripheral_mock
didDiscoverServicesWithError:nil];
This ends up calling didDiscoverServices which means when you call
SimulateGattServiceRemoved we end up calling:

1. didModifyServices
2. didDiscoverServices

Is that what CoreBluetooth does?

[jlebel, 2016-06-03 00:23:19]

https://codereview.chromium.org/2026193002/diff/40001/device/bluetooth/test/b...
File device/bluetooth/test/bluetooth_test_mac.mm (right):

https://codereview.chromium.org/2026193002/diff/40001/device/bluetooth/test/b...
device/bluetooth/test/bluetooth_test_mac.mm:253: [peripheral_mock
didDiscoverServicesWithError:nil];
On 2016/06/03 00:05:10, ortuno wrote:
> This ends up calling didDiscoverServices which means when you call
> SimulateGattServiceRemoved we end up calling:
> 
> 1. didModifyServices
> 2. didDiscoverServices
> 
> Is that what CoreBluetooth does?

After calling -[<CBPeripheralDelegate> peripheral:didModifyServices:], the
peripheral delegate is assumed to call -[CBPeripheral discoverServices:]. I did
miss adding a check to make sure it is the case. 

Then after -[<CBPeripheralDelegate> peripheral:didDiscoverServices:] has to be
called to finish the update.

[ortuno, 2016-06-03 01:07:56]

lgtm

https://codereview.chromium.org/2026193002/diff/40001/device/bluetooth/test/b...
File device/bluetooth/test/bluetooth_test_mac.mm (right):

https://codereview.chromium.org/2026193002/diff/40001/device/bluetooth/test/b...
device/bluetooth/test/bluetooth_test_mac.mm:253: [peripheral_mock
didDiscoverServicesWithError:nil];
On 2016/06/03 at 00:23:19, jlebel wrote:
> On 2016/06/03 00:05:10, ortuno wrote:
> > This ends up calling didDiscoverServices which means when you call
> > SimulateGattServiceRemoved we end up calling:
> > 
> > 1. didModifyServices
> > 2. didDiscoverServices
> > 
> > Is that what CoreBluetooth does?
> 
> After calling -[<CBPeripheralDelegate> peripheral:didModifyServices:], the
peripheral delegate is assumed to call -[CBPeripheral discoverServices:]. I did
miss adding a check to make sure it is the case. 
> 
> Then after -[<CBPeripheralDelegate> peripheral:didDiscoverServices:] has to be
called to finish the update.

Ah I see. Hmm the test seems bit fragile but no need to fix it in this patch.

[commit-bot: I haz the power, 2016-06-03 02:26:34]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-03 02:26:35]

Dry run: This issue passed the CQ dry run.

[jlebel, 2016-06-03 08:03:24]

The CQ bit was checked by jlebel@chromium.org

[commit-bot: I haz the power, 2016-06-03 08:03:40]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2026193002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/2026193002/40001

[commit-bot: I haz the power, 2016-06-03 08:07:25]

Description was changed from

==========
Preparing for characteristics discovery

Mock services should be removed when simulating disconnect.

Renaming -[MockCBPeripheral didDiscoverWithError:] into
-[MockCBPeripheral didDiscoverServicesWithError:].


BUG=None
==========

to

==========
Preparing for characteristics discovery

Mock services should be removed when simulating disconnect.

Renaming -[MockCBPeripheral didDiscoverWithError:] into
-[MockCBPeripheral didDiscoverServicesWithError:].


BUG=None
==========

[commit-bot: I haz the power, 2016-06-03 08:07:27]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-06-03 08:08:56]

Description was changed from

==========
Preparing for characteristics discovery

Mock services should be removed when simulating disconnect.

Renaming -[MockCBPeripheral didDiscoverWithError:] into
-[MockCBPeripheral didDiscoverServicesWithError:].


BUG=None
==========

to

==========
Preparing for characteristics discovery

Mock services should be removed when simulating disconnect.

Renaming -[MockCBPeripheral didDiscoverWithError:] into
-[MockCBPeripheral didDiscoverServicesWithError:].

BUG=None

Committed: https://crrev.com/471d7dd53dbab5619b2b976f990357f4b95d00cf
Cr-Commit-Position: refs/heads/master@{#397658}
==========

[commit-bot: I haz the power, 2016-06-03 08:08:57]

Patchset 3 (id:??) landed as
https://crrev.com/471d7dd53dbab5619b2b976f990357f4b95d00cf
Cr-Commit-Position: refs/heads/master@{#397658}