Chromium Code Reviews| Index: device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc |
| diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc b/device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc |
| index a0ee705f9173ccb1c95a6afb6f176a3ef30cfc37..df9d1d559084e942f200f91755131f1c3d5f0581 100644 |
| --- a/device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc |
| +++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc |
| @@ -1010,12 +1010,15 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, |
| } |
| #endif // defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| -#if defined(OS_ANDROID) || defined(OS_WIN) |
| +#if defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| // StartNotifySession fails if the characteristic is missing the Client |
| // Characteristic Configuration descriptor. |
| -// macOS: TODO(crbug.com/624017) Need to implement CCC descriptors. |
| TEST_F(BluetoothRemoteGattCharacteristicTest, |
| StartNotifySession_NoConfigDescriptor) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE(StartNotifyBoilerplate( |
| /* properties: NOTIFY */ 0x10, |
| /* expected_config_descriptor_value: NOTIFY */ 1, |
| @@ -1030,14 +1033,17 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, |
| EXPECT_EQ(BluetoothRemoteGattService::GATT_ERROR_NOT_SUPPORTED, |
| last_gatt_error_code_); |
| } |
| -#endif // defined(OS_ANDROID) || defined(OS_WIN) |
| +#endif // defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| -#if defined(OS_ANDROID) || defined(OS_WIN) |
| +#if defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| // StartNotifySession fails if the characteristic has multiple Client |
| // Characteristic Configuration descriptors. |
| -// macOS: TODO(crbug.com/624017) Need to implement CCC descriptors. |
| TEST_F(BluetoothRemoteGattCharacteristicTest, |
| StartNotifySession_MultipleConfigDescriptor) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE(StartNotifyBoilerplate( |
| /* properties: NOTIFY */ 0x10, |
| /* expected_config_descriptor_value: NOTIFY */ 1, |
| @@ -1052,7 +1058,7 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, |
| EXPECT_EQ(BluetoothRemoteGattService::GATT_ERROR_FAILED, |
| last_gatt_error_code_); |
| } |
| -#endif // defined(OS_ANDROID) || defined(OS_WIN) |
| +#endif // defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| #if defined(OS_ANDROID) |
| // StartNotifySession fails synchronously when failing to set a characteristic |
| @@ -1155,10 +1161,7 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, StartNotifySession_Multiple) { |
| characteristic1_, |
| BluetoothRemoteGattDescriptor::ClientCharacteristicConfigurationUuid() |
| .canonical_value()); |
| -#if !defined(OS_MACOSX) |
| - // TODO(crbug.com/624017): Need implementation for descriptors. |
| ASSERT_EQ(1u, characteristic1_->GetDescriptors().size()); |
| -#endif // !defined(OS_MACOSX) |
| characteristic1_->StartNotifySession( |
| GetNotifyCallback(Call::EXPECTED), |
| @@ -1198,10 +1201,7 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, |
| characteristic1_, |
| BluetoothRemoteGattDescriptor::ClientCharacteristicConfigurationUuid() |
| .canonical_value()); |
| -#if !defined(OS_MACOSX) |
| - // TODO(crbug.com/624017): Need implementation for descriptors. |
| ASSERT_EQ(1u, characteristic1_->GetDescriptors().size()); |
| -#endif // !defined(OS_MACOSX) |
| characteristic1_->StartNotifySession(GetNotifyCallback(Call::NOT_EXPECTED), |
| GetGattErrorCallback(Call::EXPECTED)); |
| @@ -1251,10 +1251,14 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, StartNotifySession_AfterDeleted) { |
| } |
| #endif // defined(OS_ANDROID) |
| -#if defined(OS_ANDROID) |
| +#if defined(OS_ANDROID) || defined(OS_MACOSX) |
| // Tests StartNotifySession completing before chrome objects are deleted. |
| TEST_F(BluetoothRemoteGattCharacteristicTest, |
| StartNotifySession_BeforeDeleted) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE( |
| FakeCharacteristicBoilerplate(/* properties: NOTIFY */ 0x10)); |
| SimulateGattDescriptor( |
| @@ -1288,7 +1292,7 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, |
| notify_sessions_[0]->GetCharacteristicIdentifier()); |
| EXPECT_FALSE(notify_sessions_[0]->IsActive()); |
| } |
| -#endif // defined(OS_ANDROID) |
| +#endif // defined(OS_ANDROID) || defined(OS_MACOSX) |
| #if defined(OS_MACOSX) || defined(OS_WIN) |
| // Tests StartNotifySession reentrant in start notify session success callback |
| @@ -1304,10 +1308,7 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, |
| SimulateGattDescriptor( |
| characteristic1_, |
| BluetoothGattDescriptor::ClientCharacteristicConfigurationUuid().value()); |
| -#if !defined(OS_MACOSX) |
| - // TODO(crbug.com/624017): Need implementation for descriptors. |
| ASSERT_EQ(1u, characteristic1_->GetDescriptors().size()); |
| -#endif // !defined(OS_MACOSX) |
| characteristic1_->StartNotifySession( |
| GetReentrantStartNotifySessionSuccessCallback(Call::EXPECTED, |
| @@ -1410,7 +1411,15 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, |
| #if defined(OS_ANDROID) |
| // Tests StopNotifySession success on a characteristic that enabled Notify. |
| +// macOS: Not applicable. CoreBluetooth exposes -[CBPeripheral |
|
ortuno
2017/02/09 22:46:27
Ah sorry to be confusing. I meant that only the pa
jlebel
2017/02/13 19:22:22
Done.
|
| +// setNotifyValue:forCharacteristic:] which handles all interactions with |
| +// the CCC descriptor. |
| +#if !defined(OS_MACOSX) |
| TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE(StartNotifyBoilerplate( |
| /* properties: NOTIFY */ 0x10, |
| /* expected_config_descriptor_value: NOTIFY */ 1)); |
| @@ -1430,12 +1439,21 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession) { |
| EXPECT_FALSE(notify_sessions_[0]->IsActive()); |
| EXPECT_FALSE(characteristic1_->IsNotifying()); |
| } |
| +#endif // !defined(OS_MACOSX) |
| #endif // defined(OS_ANDROID) |
| #if defined(OS_ANDROID) |
| // Tests that deleted sessions are stopped. |
| +// macOS: Not applicable. CoreBluetooth exposes -[CBPeripheral |
| +// setNotifyValue:forCharacteristic:] which handles all interactions with |
| +// the CCC descriptor. |
| +#if !defined(OS_MACOSX) |
| TEST_F(BluetoothRemoteGattCharacteristicTest, |
| StopNotifySession_SessionDeleted) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE(StartNotifyBoilerplate( |
| /* properties: NOTIFY */ 0x10, |
| /* expected_config_descriptor_value: NOTIFY */ 1)); |
| @@ -1454,24 +1472,26 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, |
| // Check that the notify session is inactive. |
| EXPECT_FALSE(characteristic1_->IsNotifying()); |
| } |
| +#endif // !defined(OS_MACOSX) |
| #endif // defined(OS_ANDROID) |
| -#if defined(OS_ANDROID) |
| +#if defined(OS_ANDROID) || defined(OS_MACOSX) |
| // Tests that deleting the sessions before the stop callbacks have been |
| // invoked does not cause problems. |
| TEST_F(BluetoothRemoteGattCharacteristicTest, |
| StopNotifySession_SessionDeleted2) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE( |
| FakeCharacteristicBoilerplate(/* properties: NOTIFY */ 0x10)); |
| -#if !defined(OS_MACOSX) |
| - // TODO(624017) enable for macosx |
| SimulateGattDescriptor( |
| characteristic1_, |
| BluetoothRemoteGattDescriptor::ClientCharacteristicConfigurationUuid() |
| .canonical_value()); |
| ASSERT_EQ(1u, characteristic1_->GetDescriptors().size()); |
| -#endif |
| // Start notify sessions. |
| characteristic1_->StartNotifySession( |
| @@ -1511,15 +1531,17 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, |
| EXPECT_TRUE("Did not crash!"); |
| EXPECT_FALSE(characteristic1_->IsNotifying()); |
| } |
| -#endif // defined(OS_ANDROID) |
| +#endif // defined(OS_ANDROID) || defined(OS_MACOSX) |
| -#if defined(OS_ANDROID) |
| +#if defined(OS_ANDROID) || defined(OS_MACOSX) |
| // Tests that cancelling StopNotifySession works. |
| -// TODO(crbug.com/633191): Enable on macOS when SubscribeToNotifications is |
| -// implemented. |
| // TODO(crbug.com/636270): Enable on Windows when SubscribeToNotifications is |
| // implemented. |
| TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_Cancelled) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE(StartNotifyBoilerplate( |
| /* properties: NOTIFY */ 0x10, |
| /* expected_config_descriptor_value: NOTIFY */ 1)); |
| @@ -1537,11 +1559,15 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_Cancelled) { |
| // Cancel Stop by deleting the device before Stop finishes. |
| DeleteDevice(device_); // TODO(576906) delete only the characteristic. |
| } |
| -#endif // defined(OS_ANDROID) |
| +#endif // defined(OS_ANDROID) || defined(OS_MACOSX) |
| -#if defined(OS_ANDROID) |
| +#if defined(OS_ANDROID) || defined(OS_MACOSX) |
| // Tests that deleted sessions are stopped. |
| TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_AfterDeleted) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE(StartNotifyBoilerplate( |
| /* properties: NOTIFY */ 0x10, |
| /* expected_config_descriptor_value: NOTIFY */ 1)); |
| @@ -1571,11 +1597,19 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_AfterDeleted) { |
| notify_sessions_[0]->GetCharacteristicIdentifier()); |
| EXPECT_FALSE(notify_sessions_[0]->IsActive()); |
| } |
| -#endif // defined(OS_ANDROID) |
| +#endif // defined(OS_ANDROID) || defined(OS_MACOSX) |
| #if defined(OS_ANDROID) |
| // Tests StopNotifySession success on a characteristic that enabled Indicate. |
| +// macOS: Not applicable. CoreBluetooth exposes -[CBPeripheral |
| +// setNotifyValue:forCharacteristic:] which handles all interactions with |
| +// the CCC descriptor. |
| +#if !defined(OS_MACOSX) |
| TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_OnIndicate) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE(StartNotifyBoilerplate( |
| /* properties: INDICATE */ 0x20, |
| /* expected_config_descriptor_value: INDICATE */ 2)); |
| @@ -1595,13 +1629,22 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_OnIndicate) { |
| EXPECT_FALSE(notify_sessions_[0]->IsActive()); |
| EXPECT_FALSE(characteristic1_->IsNotifying()); |
| } |
| +#endif // !defined(OS_MACOSX) |
| #endif // defined(OS_ANDROID) |
| #if defined(OS_ANDROID) |
| // Tests StopNotifySession success on a characteristic that enabled Notify & |
| // Indicate. |
| +// macOS: Not applicable. CoreBluetooth exposes -[CBPeripheral |
| +// setNotifyValue:forCharacteristic:] which handles all interactions with |
| +// the CCC descriptor. |
| +#if !defined(OS_MACOSX) |
| TEST_F(BluetoothRemoteGattCharacteristicTest, |
| StopNotifySession_OnNotifyAndIndicate) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE(StartNotifyBoilerplate( |
| /* properties: NOTIFY and INDICATE bits set */ 0x30, |
| /* expected_config_descriptor_value: INDICATE */ 1)); |
| @@ -1621,11 +1664,16 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, |
| EXPECT_FALSE(notify_sessions_[0]->IsActive()); |
| EXPECT_FALSE(characteristic1_->IsNotifying()); |
| } |
| +#endif // !defined(OS_MACOSX) |
| #endif // defined(OS_ANDROID) |
| -#if defined(OS_ANDROID) |
| +#if defined(OS_ANDROID) || defined(OS_MACOSX) |
| // Tests StopNotifySession error |
| TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_Error) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE(StartNotifyBoilerplate( |
| /* properties: NOTIFY */ 0x10, |
| /* expected_config_descriptor_value: NOTIFY */ 1)); |
| @@ -1646,22 +1694,23 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_Error) { |
| EXPECT_FALSE(notify_sessions_[0]->IsActive()); |
| EXPECT_FALSE(characteristic1_->IsNotifying()); |
| } |
| -#endif // defined(OS_ANDROID) |
| +#endif // defined(OS_ANDROID) || defined(OS_MACOSX) |
| -#if defined(OS_ANDROID) |
| +#if defined(OS_ANDROID) || defined(OS_MACOSX) |
| // Tests multiple StopNotifySession calls for a single session. |
| TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_Multiple1) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE( |
| FakeCharacteristicBoilerplate(/* properties: NOTIFY */ 0x10)); |
| -#if !defined(OS_MACOSX) |
| - // TODO(624017) enable for macosx |
| SimulateGattDescriptor( |
| characteristic1_, |
| BluetoothRemoteGattDescriptor::ClientCharacteristicConfigurationUuid() |
| .canonical_value()); |
| ASSERT_EQ(1u, characteristic1_->GetDescriptors().size()); |
| -#endif |
| // Start notify session |
| characteristic1_->StartNotifySession( |
| @@ -1690,22 +1739,23 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_Multiple1) { |
| EXPECT_FALSE(notify_sessions_[0]->IsActive()); |
| EXPECT_FALSE(characteristic1_->IsNotifying()); |
| } |
| -#endif // defined(OS_ANDROID) |
| +#endif // defined(OS_ANDROID) || defined(OS_MACOSX) |
| -#if defined(OS_ANDROID) |
| +#if defined(OS_ANDROID) || defined(OS_MACOSX) |
| // Tests multiple StartNotifySession calls and multiple StopNotifySession calls. |
| TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_Multiple2) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE( |
| FakeCharacteristicBoilerplate(/* properties: NOTIFY */ 0x10)); |
| -#if !defined(OS_MACOSX) |
| - // TODO(624017) enable for macosx |
| SimulateGattDescriptor( |
| characteristic1_, |
| BluetoothRemoteGattDescriptor::ClientCharacteristicConfigurationUuid() |
| .canonical_value()); |
| ASSERT_EQ(1u, characteristic1_->GetDescriptors().size()); |
| -#endif |
| // Start notify sessions |
| characteristic1_->StartNotifySession( |
| @@ -1745,12 +1795,16 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_Multiple2) { |
| EXPECT_FALSE(notify_sessions_[1]->IsActive()); |
| EXPECT_FALSE(characteristic1_->IsNotifying()); |
| } |
| -#endif // defined(OS_ANDROID) |
| +#endif // defined(OS_ANDROID) || defined(OS_MACOSX) |
| -#if defined(OS_ANDROID) |
| +#if defined(OS_ANDROID) || defined(OS_MACOSX) |
| // Tests starting a new notify session before the previous stop request |
| // resolves. |
| TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_StopStart) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE( |
| FakeCharacteristicBoilerplate(/* properties: NOTIFY */ 0x10)); |
| SimulateGattDescriptor( |
| @@ -1791,11 +1845,15 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_StopStart) { |
| EXPECT_TRUE(notify_sessions_[1]->IsActive()); |
| EXPECT_TRUE(characteristic1_->IsNotifying()); |
| } |
| -#endif // defined(OS_ANDROID) |
| +#endif // defined(OS_ANDROID) || defined(OS_MACOSX) |
| -#if defined(OS_ANDROID) |
| +#if defined(OS_ANDROID) || defined(OS_MACOSX) |
| TEST_F(BluetoothRemoteGattCharacteristicTest, |
| StopNotifySession_StartStopStart) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE(StartNotifyBoilerplate( |
| /* properties: NOTIFY */ 0x10, |
| /* expected_config_descriptor_value: NOTIFY */ 1)); |
| @@ -1843,12 +1901,20 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, |
| EXPECT_TRUE(characteristic1_->IsNotifying()); |
| } |
| -#endif |
| +#endif // defined(OS_ANDROID) || defined(OS_MACOSX) |
| #if defined(OS_ANDROID) |
| // Tests starting a new notify session before the previous stop requests |
| // resolve. |
| +// macOS: Not applicable. CoreBluetooth exposes -[CBPeripheral |
| +// setNotifyValue:forCharacteristic:] which handles all interactions with |
| +// the CCC descriptor. |
| +#if !defined(OS_MACOSX) |
| TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_StopStopStart) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE( |
| FakeCharacteristicBoilerplate(/* properties: NOTIFY */ 0x10)); |
| SimulateGattDescriptor( |
| @@ -1908,11 +1974,16 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, StopNotifySession_StopStopStart) { |
| EXPECT_TRUE(notify_sessions_[1]->IsActive()); |
| EXPECT_TRUE(characteristic1_->IsNotifying()); |
| } |
| +#endif // !defined(OS_MACOSX) |
| #endif // defined(OS_ANDROID) |
| -#if defined(OS_ANDROID) |
| +#if defined(OS_ANDROID) || defined(OS_MACOSX) |
| TEST_F(BluetoothRemoteGattCharacteristicTest, |
| StopNotifySession_Reentrant_Success_Stop) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE( |
| FakeCharacteristicBoilerplate(/* properties: NOTIFY */ 0x10)); |
| SimulateGattDescriptor( |
| @@ -1948,11 +2019,15 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, |
| EXPECT_FALSE(notify_sessions_[0]->IsActive()); |
| EXPECT_FALSE(characteristic1_->IsNotifying()); |
| } |
| -#endif |
| +#endif // defined(OS_ANDROID) || defined(OS_MACOSX) |
| -#if defined(OS_ANDROID) |
| +#if defined(OS_ANDROID) || defined(OS_MACOSX) |
| TEST_F(BluetoothRemoteGattCharacteristicTest, |
| StopNotifySession_Reentrant_Stop_StartSuccess) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE(StartNotifyBoilerplate( |
| /* properties: NOTIFY */ 0x10, |
| /* expected_config_descriptor_value: NOTIFY */ 1)); |
| @@ -1990,11 +2065,15 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, |
| EXPECT_TRUE(notify_sessions_[1]->IsActive()); |
| EXPECT_TRUE(characteristic1_->IsNotifying()); |
| } |
| -#endif |
| +#endif // defined(OS_ANDROID) || defined(OS_MACOSX) |
| -#if defined(OS_ANDROID) |
| +#if defined(OS_ANDROID) || defined(OS_MACOSX) |
| TEST_F(BluetoothRemoteGattCharacteristicTest, |
| StopNotifySession_Reentrant_Stop_StartError) { |
| + if (!PlatformSupportsLowEnergy()) { |
| + LOG(WARNING) << "Low Energy Bluetooth unavailable, skipping unit test."; |
| + return; |
| + } |
| ASSERT_NO_FATAL_FAILURE(StartNotifyBoilerplate( |
| /* properties: NOTIFY */ 0x10, |
| /* expected_config_descriptor_value: NOTIFY */ 1)); |
| @@ -2030,7 +2109,7 @@ TEST_F(BluetoothRemoteGattCharacteristicTest, |
| EXPECT_FALSE(notify_sessions_[0]->IsActive()); |
| EXPECT_FALSE(characteristic1_->IsNotifying()); |
| } |
| -#endif |
| +#endif // defined(OS_ANDROID) || defined(OS_MACOSX) |
| #if defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_WIN) |
| // Tests Characteristic Value changes during a Notify Session. |