Test: make mock_acl_manager_ into unique_ptr

Bug: none
Test: updated
Flag: exempt, test only change
Change-Id: I05fe3351b4e462f3d8d11999af6c866ecbe8a73a

4 files changed, 35 insertions, 33 deletions

diff --git a/system/main/test/main_shim_test.cc b/system/main/test/main_shim_test.cc
index 2f4056a381..5e11dd248b 100644
--- a/system/main/test/main_shim_test.cc
+++ b/system/main/test/main_shim_test.cc
@@ -333,7 +333,8 @@ protected:
     handler_ = new os::Handler(thread_);
 
     /* extern */ test::mock_controller_ = new bluetooth::hci::testing::MockControllerInterface();
-    /* extern */ test::mock_acl_manager_ = new bluetooth::hci::testing::MockAclManager();
+    /* extern */ test::mock_acl_manager_ =
+            std::make_unique<bluetooth::hci::testing::MockAclManager>();
     /* extern */ test::mock_le_scanning_manager_ =
             new bluetooth::hci::testing::MockLeScanningManager();
     /* extern */ test::mock_le_advertising_manager_ =
@@ -344,8 +345,7 @@ protected:
   void TearDown() override {
     delete test::mock_controller_;
     test::mock_controller_ = nullptr;
-    delete test::mock_acl_manager_;
-    test::mock_acl_manager_ = nullptr;
+    test::mock_acl_manager_.release();
     delete test::mock_le_advertising_manager_;
     test::mock_le_advertising_manager_ = nullptr;
     delete test::mock_le_scanning_manager_;
diff --git a/system/stack/test/connection_manager_test.cc b/system/stack/test/connection_manager_test.cc
index 1a06158ca0..9b07b841de 100644
--- a/system/stack/test/connection_manager_test.cc
+++ b/system/stack/test/connection_manager_test.cc
@@ -70,7 +70,8 @@ namespace connection_manager {
 class BleConnectionManager : public testing::Test {
   void SetUp() override {
     localConnTimeoutMock = std::make_unique<MockConnTimeout>();
-    /* extern */ test::mock_acl_manager_ = new bluetooth::hci::testing::MockAclManager();
+    /* extern */ test::mock_acl_manager_ =
+            std::make_unique<bluetooth::hci::testing::MockAclManager>();
     /* extern */ test::mock_controller_ =
             new testing::NiceMock<bluetooth::hci::testing::MockControllerInterface>();
     ON_CALL(*test::mock_controller_, GetLeFilterAcceptListSize()).WillByDefault(Return(16));
@@ -93,7 +94,7 @@ class BleConnectionManager : public testing::Test {
     connection_manager::reset(true);
     AlarmMock::Reset();
     delete test::mock_controller_;
-    delete test::mock_acl_manager_;
+    test::mock_acl_manager_.reset();
     localConnTimeoutMock.reset();
   }
 };
@@ -106,7 +107,7 @@ TEST_F(BleConnectionManager, test_background_connection_add_remove) {
 
   EXPECT_TRUE(background_connect_add(CLIENT1, address1));
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 
   std::set<tAPP_ID> apps = get_apps_connecting_to(address1);
   EXPECT_EQ(apps.size(), 1UL);
@@ -119,7 +120,7 @@ TEST_F(BleConnectionManager, test_background_connection_add_remove) {
 
   EXPECT_EQ(get_apps_connecting_to(address1).size(), 0UL);
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 }
 
 /** Verify that multiple clients adding same device multiple times, result in
@@ -136,7 +137,7 @@ TEST_F(BleConnectionManager, test_background_connection_multiple_clients) {
 
   EXPECT_EQ(get_apps_connecting_to(address1).size(), 3UL);
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 
   EXPECT_CALL(*test::mock_acl_manager_, CreateLeConnection(_, _)).Times(0);
 
@@ -153,7 +154,7 @@ TEST_F(BleConnectionManager, test_background_connection_multiple_clients) {
 
   EXPECT_EQ(get_apps_connecting_to(address1).size(), 0UL);
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 }
 
 /** Verify adding/removing device to direct connection. */
@@ -173,7 +174,7 @@ TEST_F(BleConnectionManager, test_direct_connection_client) {
   // Client that don't do direct connection should fail attempt to stop it
   EXPECT_FALSE(direct_connect_remove(CLIENT2, address1));
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 
   EXPECT_CALL(*test::mock_acl_manager_, CancelLeConnect(_)).Times(1);
   EXPECT_CALL(*AlarmMock::Get(), AlarmFree(_)).Times(1);
@@ -183,7 +184,7 @@ TEST_F(BleConnectionManager, test_direct_connection_client) {
   // acceptlist is in use, i.e. next connection attempt
   EXPECT_TRUE(direct_connect_remove(CLIENT1, address1));
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 }
 
 /** Verify direct connection timeout does remove device from acceptlist, and
@@ -201,7 +202,7 @@ TEST_F(BleConnectionManager, test_direct_connect_timeout) {
   // Start direct connect attempt...
   EXPECT_TRUE(direct_connect_add(CLIENT1, address1));
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 
   EXPECT_CALL(*test::mock_acl_manager_, CancelLeConnect(_)).Times(1);
   EXPECT_CALL(*localConnTimeoutMock, OnConnectionTimedOut(CLIENT1, address1)).Times(1);
@@ -210,7 +211,7 @@ TEST_F(BleConnectionManager, test_direct_connect_timeout) {
   // simulate timeout seconds passed, alarm executing
   alarm_callback(alarm_data);
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 }
 
 /** Verify that we properly handle successfull direct connection */
@@ -222,7 +223,7 @@ TEST_F(BleConnectionManager, test_direct_connection_success) {
   // Start direct connect attempt...
   EXPECT_TRUE(direct_connect_add(CLIENT1, address1));
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 
   EXPECT_CALL(*test::mock_acl_manager_, CancelLeConnect(address1_hci)).Times(1);
   EXPECT_CALL(*AlarmMock::Get(), AlarmFree(_)).Times(1);
@@ -230,7 +231,7 @@ TEST_F(BleConnectionManager, test_direct_connection_success) {
   // successfully.
   on_connection_complete(address1);
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 }
 
 /** Verify that we properly handle application unregistration */
@@ -244,23 +245,23 @@ TEST_F(BleConnectionManager, test_app_unregister) {
 
   EXPECT_CALL(*test::mock_acl_manager_, CreateLeConnection(address1_hci, true)).Times(1);
   EXPECT_TRUE(direct_connect_add(CLIENT1, address1));
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 
   EXPECT_CALL(*test::mock_acl_manager_, CreateLeConnection(address2_hci, false)).Times(1);
   EXPECT_TRUE(background_connect_add(CLIENT1, address2));
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 
   EXPECT_CALL(*test::mock_acl_manager_, CreateLeConnection(address2_hci, true)).Times(1);
   EXPECT_TRUE(direct_connect_add(CLIENT2, address2));
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 
   EXPECT_CALL(*test::mock_acl_manager_, CancelLeConnect(address1_hci)).Times(1);
   on_app_deregistered(CLIENT1);
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 
   EXPECT_CALL(*test::mock_acl_manager_, CancelLeConnect(address2_hci)).Times(1);
   on_app_deregistered(CLIENT2);
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 }
 
 /** Verify adding device to both direct connection and background connection. */
@@ -273,7 +274,7 @@ TEST_F(BleConnectionManager, test_direct_and_background_connect) {
   EXPECT_TRUE(direct_connect_add(CLIENT1, address1));
   EXPECT_TRUE(background_connect_add(CLIENT1, address1));
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 
   EXPECT_CALL(*AlarmMock::Get(), AlarmFree(_)).Times(1);
   // not removing from acceptlist yet, as the background connection is still
@@ -284,7 +285,7 @@ TEST_F(BleConnectionManager, test_direct_and_background_connect) {
   EXPECT_CALL(*test::mock_acl_manager_, CancelLeConnect(_)).Times(1);
   EXPECT_TRUE(background_connect_remove(CLIENT1, address1));
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 }
 
 TEST_F(BleConnectionManager, test_target_announement_connect) {
@@ -302,7 +303,7 @@ TEST_F(BleConnectionManager, test_add_targeted_announement_when_allow_list_used)
   EXPECT_TRUE(background_connect_add(CLIENT1, address1));
   EXPECT_TRUE(background_connect_targeted_announcement_add(CLIENT2, address1));
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 }
 
 TEST_F(BleConnectionManager, test_add_background_connect_when_targeted_announcement_are_enabled) {
@@ -315,7 +316,7 @@ TEST_F(BleConnectionManager, test_add_background_connect_when_targeted_announcem
   EXPECT_TRUE(background_connect_targeted_announcement_add(CLIENT2, address1));
 
   EXPECT_TRUE(background_connect_add(CLIENT1, address1));
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 }
 
 TEST_F(BleConnectionManager, test_re_add_background_connect_to_allow_list) {
@@ -325,7 +326,7 @@ TEST_F(BleConnectionManager, test_re_add_background_connect_to_allow_list) {
   EXPECT_TRUE(background_connect_targeted_announcement_add(CLIENT2, address1));
 
   EXPECT_TRUE(background_connect_add(CLIENT1, address1));
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 
   /* Now remove app using targeted announcement and expect device
    * to be added to white list
@@ -335,11 +336,11 @@ TEST_F(BleConnectionManager, test_re_add_background_connect_to_allow_list) {
   EXPECT_CALL(*test::mock_acl_manager_, CreateLeConnection(address1_hci, false)).Times(1);
 
   EXPECT_TRUE(background_connect_remove(CLIENT2, address1));
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 
   EXPECT_CALL(*test::mock_acl_manager_, CancelLeConnect(_)).Times(1);
   EXPECT_TRUE(background_connect_remove(CLIENT1, address1));
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 }
 
 TEST_F(BleConnectionManager, test_re_add_to_allow_list_after_timeout_with_multiple_clients) {
@@ -352,7 +353,7 @@ TEST_F(BleConnectionManager, test_re_add_to_allow_list_after_timeout_with_multip
 
   EXPECT_TRUE(background_connect_add(CLIENT1, address1));
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 
   EXPECT_CALL(*AlarmMock::Get(), AlarmSetOnMloop(_, _, _, _))
           .Times(1)
@@ -360,7 +361,7 @@ TEST_F(BleConnectionManager, test_re_add_to_allow_list_after_timeout_with_multip
   // Start direct connect attempt...
   EXPECT_TRUE(direct_connect_add(CLIENT2, address1));
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 
   // simulate timeout seconds passed, alarm executing
   EXPECT_CALL(*localConnTimeoutMock, OnConnectionTimedOut(CLIENT2, address1)).Times(1);
@@ -369,7 +370,7 @@ TEST_F(BleConnectionManager, test_re_add_to_allow_list_after_timeout_with_multip
   EXPECT_CALL(*AlarmMock::Get(), AlarmFree(_)).Times(1);
   alarm_callback(alarm_data);
 
-  Mock::VerifyAndClearExpectations(test::mock_acl_manager_);
+  Mock::VerifyAndClearExpectations(test::mock_acl_manager_.get());
 }
 
 }  // namespace connection_manager
diff --git a/system/test/mock/mock_main_shim_entry.cc b/system/test/mock/mock_main_shim_entry.cc
index 5d68f11b9d..e8c649b6cf 100644
--- a/system/test/mock/mock_main_shim_entry.cc
+++ b/system/test/mock/mock_main_shim_entry.cc
@@ -38,7 +38,7 @@ namespace bluetooth {
 namespace hci {
 namespace testing {
 
-MockAclManager* mock_acl_manager_{nullptr};
+std::unique_ptr<MockAclManager> mock_acl_manager_;
 MockControllerInterface* mock_controller_{nullptr};
 HciInterface* mock_hci_layer_{nullptr};
 os::Handler* mock_gd_shim_handler_{nullptr};
@@ -58,7 +58,7 @@ class Dumpsys;
 
 namespace shim {
 
-hci::AclManager* GetAclManager() { return hci::testing::mock_acl_manager_; }
+hci::AclManager* GetAclManager() { return hci::testing::mock_acl_manager_.get(); }
 hci::ControllerInterface* GetController() { return hci::testing::mock_controller_; }
 hci::HciInterface* GetHciLayer() { return hci::testing::mock_hci_layer_; }
 hci::LeAdvertisingManager* GetAdvertising() { return hci::testing::mock_le_advertising_manager_; }
diff --git a/system/test/mock/mock_main_shim_entry.h b/system/test/mock/mock_main_shim_entry.h
index ca84a27193..b82b6b8122 100644
--- a/system/test/mock/mock_main_shim_entry.h
+++ b/system/test/mock/mock_main_shim_entry.h
@@ -15,6 +15,7 @@
  */
 
 #include <functional>
+#include <memory>
 
 #include "hci/acl_manager_mock.h"
 #include "hci/controller_interface_mock.h"
@@ -28,7 +29,7 @@ namespace bluetooth {
 namespace hci {
 namespace testing {
 
-extern MockAclManager* mock_acl_manager_;
+extern std::unique_ptr<MockAclManager> mock_acl_manager_;
 extern MockControllerInterface* mock_controller_;
 extern HciInterface* mock_hci_layer_;
 extern os::Handler* mock_gd_shim_handler_;