diff options
| author | Florian Mayer <fmayer@google.com> | 2021-02-22 11:47:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-22 11:47:53 +0000 |
| commit | e46060c4528226af1a1089a123a21e537544aaa0 (patch) | |
| tree | 4982cee1e7b8328276575d8fbba75028856bafea /cras/src/tests/bt_device_unittest.cc | |
| parent | 1c3cce4627b1b3fed22ec3a07e36f7291a5f4a7a (diff) | |
| parent | 340c0ad3a4001bc2c52503277119a366c534ebb1 (diff) | |
| download | adhd-e46060c4528226af1a1089a123a21e537544aaa0.tar.gz | |
Merge "Revert "Merge branch 'upstream-master'"" am: 340c0ad3a4
Original change: https://android-review.googlesource.com/c/platform/external/adhd/+/1598216
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I12c7a288713fcd0aa0ab3df0879a8fa0782ed4d7
Diffstat (limited to 'cras/src/tests/bt_device_unittest.cc')
| -rw-r--r-- | cras/src/tests/bt_device_unittest.cc | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/cras/src/tests/bt_device_unittest.cc b/cras/src/tests/bt_device_unittest.cc index ccb581cc..a9213f3d 100644 --- a/cras/src/tests/bt_device_unittest.cc +++ b/cras/src/tests/bt_device_unittest.cc @@ -228,8 +228,7 @@ TEST_F(BtDeviceTestSuite, SetDeviceConnectedA2dpOnly) { device = cras_bt_device_create(NULL, FAKE_OBJ_PATH); EXPECT_NE((void*)NULL, device); - cras_bt_device_set_supported_profiles(device, - CRAS_BT_DEVICE_PROFILE_A2DP_SINK); + cras_bt_device_add_supported_profiles(device, A2DP_SINK_UUID); cur = msg_root = NewMockDBusConnectedMessage(1); cras_bt_device_update_properties(device, (DBusMessageIter*)&cur, NULL); @@ -269,9 +268,8 @@ TEST_F(BtDeviceTestSuite, SetDeviceConnectedHfpHspOnly) { device = cras_bt_device_create(NULL, FAKE_OBJ_PATH); EXPECT_NE((void*)NULL, device); - cras_bt_device_set_supported_profiles( - device, CRAS_BT_DEVICE_PROFILE_HSP_HEADSET | - CRAS_BT_DEVICE_PROFILE_HFP_HANDSFREE); + cras_bt_device_add_supported_profiles(device, HSP_HS_UUID); + cras_bt_device_add_supported_profiles(device, HFP_HF_UUID); cur = msg_root = NewMockDBusConnectedMessage(1); cras_bt_device_update_properties(device, (DBusMessageIter*)&cur, NULL); @@ -312,10 +310,9 @@ TEST_F(BtDeviceTestSuite, SetDeviceConnectedA2dpHfpHsp) { device = cras_bt_device_create(NULL, FAKE_OBJ_PATH); EXPECT_NE((void*)NULL, device); - cras_bt_device_set_supported_profiles( - device, CRAS_BT_DEVICE_PROFILE_A2DP_SINK | - CRAS_BT_DEVICE_PROFILE_HSP_HEADSET | - CRAS_BT_DEVICE_PROFILE_HFP_HANDSFREE); + cras_bt_device_add_supported_profiles(device, A2DP_SINK_UUID); + cras_bt_device_add_supported_profiles(device, HSP_HS_UUID); + cras_bt_device_add_supported_profiles(device, HFP_HF_UUID); cur = msg_root = NewMockDBusConnectedMessage(1); cras_bt_device_update_properties(device, (DBusMessageIter*)&cur, NULL); @@ -363,10 +360,9 @@ TEST_F(BtDeviceTestSuite, DevConnectedConflictCheck) { device = cras_bt_device_create(NULL, FAKE_OBJ_PATH); EXPECT_NE((void*)NULL, device); - cras_bt_device_set_supported_profiles( - device, CRAS_BT_DEVICE_PROFILE_A2DP_SINK | - CRAS_BT_DEVICE_PROFILE_HSP_HEADSET | - CRAS_BT_DEVICE_PROFILE_HFP_HANDSFREE); + cras_bt_device_add_supported_profiles(device, A2DP_SINK_UUID); + cras_bt_device_add_supported_profiles(device, HSP_HS_UUID); + cras_bt_device_add_supported_profiles(device, HFP_HF_UUID); cur = msg_root = NewMockDBusConnectedMessage(1); cras_bt_device_update_properties(device, (DBusMessageIter*)&cur, NULL); @@ -402,10 +398,9 @@ TEST_F(BtDeviceTestSuite, A2dpDropped) { device = cras_bt_device_create(NULL, FAKE_OBJ_PATH); EXPECT_NE((void*)NULL, device); - cras_bt_device_set_supported_profiles( - device, CRAS_BT_DEVICE_PROFILE_A2DP_SINK | - CRAS_BT_DEVICE_PROFILE_HSP_HEADSET | - CRAS_BT_DEVICE_PROFILE_HFP_HANDSFREE); + cras_bt_device_add_supported_profiles(device, A2DP_SINK_UUID); + cras_bt_device_add_supported_profiles(device, HSP_HS_UUID); + cras_bt_device_add_supported_profiles(device, HFP_HF_UUID); cur = msg_root = NewMockDBusConnectedMessage(1); cras_bt_device_update_properties(device, (DBusMessageIter*)&cur, NULL); @@ -438,10 +433,9 @@ TEST_F(BtDeviceTestSuite, DevConnectDisconnectBackToBack) { device = cras_bt_device_create(NULL, FAKE_OBJ_PATH); EXPECT_NE((void*)NULL, device); - cras_bt_device_set_supported_profiles( - device, CRAS_BT_DEVICE_PROFILE_A2DP_SINK | - CRAS_BT_DEVICE_PROFILE_HSP_HEADSET | - CRAS_BT_DEVICE_PROFILE_HFP_HANDSFREE); + cras_bt_device_add_supported_profiles(device, A2DP_SINK_UUID); + cras_bt_device_add_supported_profiles(device, HSP_HS_UUID); + cras_bt_device_add_supported_profiles(device, HFP_HF_UUID); cur = msg_root = NewMockDBusConnectedMessage(1); cras_bt_device_update_properties(device, (DBusMessageIter*)&cur, NULL); @@ -506,10 +500,9 @@ TEST_F(BtDeviceTestSuite, ConnectionWatchTimeout) { device = cras_bt_device_create(NULL, FAKE_OBJ_PATH); EXPECT_NE((void*)NULL, device); - cras_bt_device_set_supported_profiles( - device, CRAS_BT_DEVICE_PROFILE_A2DP_SINK | - CRAS_BT_DEVICE_PROFILE_HSP_HEADSET | - CRAS_BT_DEVICE_PROFILE_HFP_HANDSFREE); + cras_bt_device_add_supported_profiles(device, A2DP_SINK_UUID); + cras_bt_device_add_supported_profiles(device, HSP_HS_UUID); + cras_bt_device_add_supported_profiles(device, HFP_HF_UUID); cur = msg_root = NewMockDBusConnectedMessage(1); cras_bt_device_update_properties(device, (DBusMessageIter*)&cur, NULL); |