From 784b014dd22113550df24c37ab0ec92701ae4b3e Mon Sep 17 00:00:00 2001 From: Chris Manton Date: Thu, 20 Feb 2020 15:49:43 -0800 Subject: [PATCH] link manager test Clean up EXPECTs Bug: 146363313 Test: bluetooth_test_gd # on device Test: bluetooth_test_gd # native Change-Id: I2398f46380207e4e996a5cf0a4a7ea9c6add9b22 --- gd/l2cap/classic/internal/link_manager_test.cc | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gd/l2cap/classic/internal/link_manager_test.cc b/gd/l2cap/classic/internal/link_manager_test.cc index db4faa7d6..c385756e9 100644 --- a/gd/l2cap/classic/internal/link_manager_test.cc +++ b/gd/l2cap/classic/internal/link_manager_test.cc @@ -120,8 +120,11 @@ TEST_F(L2capClassicLinkManagerTest, connect_fixed_channel_service_without_acl) { // Step 3: ACL connection success event should trigger channel creation for all registered services std::unique_ptr acl_connection = std::make_unique(); - EXPECT_CALL(*acl_connection, RegisterDisconnectCallback(_, l2cap_handler_)).Times(1); EXPECT_CALL(*acl_connection, GetAddress()).WillRepeatedly(Return(device)); + EXPECT_CALL(*acl_connection, GetAddressType()).WillRepeatedly(Return(hci::AddressType::PUBLIC_DEVICE_ADDRESS)); + EXPECT_CALL(*acl_connection, RegisterCallbacks(_, l2cap_handler_)).Times(1); + EXPECT_CALL(*acl_connection, RegisterDisconnectCallback(_, l2cap_handler_)).Times(1); + EXPECT_CALL(*acl_connection, UnregisterCallbacks(_)).Times(1); std::unique_ptr channel_1, channel_2; std::promise promise_1, promise_2; auto future_1 = promise_1.get_future(); @@ -290,6 +293,10 @@ TEST_F(L2capClassicLinkManagerTest, not_acquiring_channels_should_disconnect_acl auto* raw_acl_connection = new MockAclConnection(); std::unique_ptr acl_connection(raw_acl_connection); EXPECT_CALL(*acl_connection, GetAddress()).WillRepeatedly(Return(device)); + EXPECT_CALL(*acl_connection, GetAddressType()).WillRepeatedly(Return(hci::AddressType::PUBLIC_DEVICE_ADDRESS)); + EXPECT_CALL(*acl_connection, RegisterCallbacks(_, l2cap_handler_)).Times(1); + EXPECT_CALL(*acl_connection, RegisterDisconnectCallback(_, l2cap_handler_)).Times(1); + EXPECT_CALL(*acl_connection, UnregisterCallbacks(_)).Times(1); std::unique_ptr channel_1, channel_2; std::promise promise_1, promise_2; auto future_1 = promise_1.get_future(); @@ -369,6 +376,10 @@ TEST_F(L2capClassicLinkManagerTest, acquiring_channels_should_not_disconnect_acl auto* raw_acl_connection = new MockAclConnection(); std::unique_ptr acl_connection(raw_acl_connection); EXPECT_CALL(*acl_connection, GetAddress()).WillRepeatedly(Return(device)); + EXPECT_CALL(*acl_connection, GetAddressType()).WillRepeatedly(Return(hci::AddressType::PUBLIC_DEVICE_ADDRESS)); + EXPECT_CALL(*acl_connection, RegisterCallbacks(_, l2cap_handler_)).Times(1); + EXPECT_CALL(*acl_connection, RegisterDisconnectCallback(_, l2cap_handler_)).Times(1); + EXPECT_CALL(*acl_connection, UnregisterCallbacks(_)).Times(1); std::unique_ptr channel_1, channel_2; std::promise promise_1, promise_2; auto future_1 = promise_1.get_future(); @@ -450,6 +461,10 @@ TEST_F(L2capClassicLinkManagerTest, acquiring_and_releasing_channels_should_even auto* raw_acl_connection = new MockAclConnection(); std::unique_ptr acl_connection(raw_acl_connection); EXPECT_CALL(*acl_connection, GetAddress()).WillRepeatedly(Return(device)); + EXPECT_CALL(*acl_connection, GetAddressType()).WillRepeatedly(Return(hci::AddressType::PUBLIC_DEVICE_ADDRESS)); + EXPECT_CALL(*acl_connection, RegisterCallbacks(_, l2cap_handler_)).Times(1); + EXPECT_CALL(*acl_connection, RegisterDisconnectCallback(_, l2cap_handler_)).Times(1); + EXPECT_CALL(*acl_connection, UnregisterCallbacks(_)).Times(1); std::unique_ptr channel_1, channel_2; std::promise promise_1, promise_2; auto future_1 = promise_1.get_future(); -- 2.11.0