From a9e3dd56fa8973f78522905a6e2d3af1223d987f Mon Sep 17 00:00:00 2001
From: fangJinliang1 <fangjinliang1@huawei.com>
Date: Mon, 8 May 2023 17:25:40 +0800
Subject: [PATCH] fix function name

Signed-off-by: fangJinliang1 <fangjinliang1@huawei.com>
Change-Id: I4b3530d22c10b98379549c68e41515de6c74badb
---
 .../bundle_manager_helper_branch_test.cpp     | 26 ++---
 .../mock_service_registry.cpp                 |  2 +-
 .../distributed_database_branch_test.cpp      | 70 +++++++-------
 .../mock_distributed_flow_control.cpp         |  4 +-
 .../mock_distributed_kv_data_manager.cpp      |  8 +-
 .../mock_single_kv_store.cpp                  |  4 +-
 ...buted_notification_manager_branch_test.cpp | 26 ++---
 .../mock_distributed_database.cpp             |  8 +-
 .../distributed_preferences_branch_test.cpp   | 22 ++---
 .../mock_distributed_preferences_database.cpp |  8 +-
 .../distributed_preferences_database_test.cpp | 40 ++++----
 .../mock_distributed_flow_control.cpp         |  4 +-
 .../mock_distributed_kv_data_manager.cpp      |  2 +-
 .../mock_single_kv_store.cpp                  |  2 +-
 ...uted_screen_status_manager_branch_test.cpp | 96 +++++++++----------
 .../mock_distributed_flow_control.cpp         |  4 +-
 .../mock_distributed_kv_data_manager.cpp      |  6 +-
 .../mock_single_kv_store.cpp                  |  2 +-
 18 files changed, 167 insertions(+), 167 deletions(-)

diff --git a/services/ans/test/unittest/bundle_manager_helper_branch_test/bundle_manager_helper_branch_test.cpp b/services/ans/test/unittest/bundle_manager_helper_branch_test/bundle_manager_helper_branch_test.cpp
index 6d94d0df4..c6337f000 100755
--- a/services/ans/test/unittest/bundle_manager_helper_branch_test/bundle_manager_helper_branch_test.cpp
+++ b/services/ans/test/unittest/bundle_manager_helper_branch_test/bundle_manager_helper_branch_test.cpp
@@ -23,7 +23,7 @@
 #undef private
 #undef protected
 
-extern void mockGetSystemAbilityManager(bool mockRet);
+extern void MockGetSystemAbilityManager(bool mockRet);
 
 using namespace testing::ext;
 namespace OHOS {
@@ -44,7 +44,7 @@ public:
 HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelperTest_00100, Function | SmallTest | Level1)
 {
     BundleManagerHelper bundleManagerHelper;
-    mockGetSystemAbilityManager(false);
+    MockGetSystemAbilityManager(false);
     int32_t uid = 1;
     EXPECT_EQ("", bundleManagerHelper.GetBundleNameByUid(uid));
 }
@@ -57,7 +57,7 @@ HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelperTest_00100, Function
 HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_00200, Function | SmallTest | Level1)
 {
     BundleManagerHelper bundleManagerHelper;
-    mockGetSystemAbilityManager(true);
+    MockGetSystemAbilityManager(true);
     int32_t uid = 1;
     EXPECT_EQ("", bundleManagerHelper.GetBundleNameByUid(uid));
 }
@@ -70,7 +70,7 @@ HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_00200, Function | Sm
 HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_00300, Function | SmallTest | Level1)
 {
     BundleManagerHelper bundleManagerHelper;
-    mockGetSystemAbilityManager(false);
+    MockGetSystemAbilityManager(false);
     int32_t uid = 1;
     EXPECT_EQ(false, bundleManagerHelper.IsSystemApp(uid));
 }
@@ -83,7 +83,7 @@ HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_00300, Function | Sm
 HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_00400, Function | SmallTest | Level1)
 {
     BundleManagerHelper bundleManagerHelper;
-    mockGetSystemAbilityManager(true);
+    MockGetSystemAbilityManager(true);
     int32_t uid = 1;
     EXPECT_EQ(false, bundleManagerHelper.IsSystemApp(uid));
 }
@@ -96,7 +96,7 @@ HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_00400, Function | Sm
 HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_00500, Function | SmallTest | Level1)
 {
     BundleManagerHelper bundleManagerHelper;
-    mockGetSystemAbilityManager(true);
+    MockGetSystemAbilityManager(true);
     bundleManagerHelper.Connect();
     std::string bundle = "aa";
     int32_t userId = 1;
@@ -112,7 +112,7 @@ HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_00500, Function | Sm
 HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_00600, Function | SmallTest | Level1)
 {
     BundleManagerHelper bundleManagerHelper;
-    mockGetSystemAbilityManager(false);
+    MockGetSystemAbilityManager(false);
     bundleManagerHelper.Connect();
     std::string bundle = "aa";
     int32_t userId = 1;
@@ -141,7 +141,7 @@ HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_00800, Function | Sm
 {
     std::shared_ptr<BundleManagerHelper> bundleManagerHelper = std::make_shared<BundleManagerHelper>();
     ASSERT_NE(nullptr, bundleManagerHelper);
-    mockGetSystemAbilityManager(true);
+    MockGetSystemAbilityManager(true);
     bundleManagerHelper->Connect();
 }
 
@@ -154,7 +154,7 @@ HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_00900, Function | Sm
 {
     std::shared_ptr<BundleManagerHelper> bundleManagerHelper = std::make_shared<BundleManagerHelper>();
     ASSERT_NE(nullptr, bundleManagerHelper);
-    mockGetSystemAbilityManager(false);
+    MockGetSystemAbilityManager(false);
     // test Connect and bundleMgr_ == nullptr
     bundleManagerHelper->Connect();
 }
@@ -168,7 +168,7 @@ HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_01000, Function | Sm
 {
     std::shared_ptr<BundleManagerHelper> bundleManagerHelper = std::make_shared<BundleManagerHelper>();
     ASSERT_NE(nullptr, bundleManagerHelper);
-    mockGetSystemAbilityManager(false);
+    MockGetSystemAbilityManager(false);
     bundleManagerHelper->Connect();
     // test Connect and bundleMgr_ != nullptr
     bundleManagerHelper->Connect();
@@ -183,7 +183,7 @@ HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_01100, Function | Sm
 {
     std::shared_ptr<BundleManagerHelper> bundleManagerHelper = std::make_shared<BundleManagerHelper>();
     ASSERT_NE(nullptr, bundleManagerHelper);
-    mockGetSystemAbilityManager(false);
+    MockGetSystemAbilityManager(false);
     bundleManagerHelper->Connect();
     bundleManagerHelper->Disconnect();
 }
@@ -208,7 +208,7 @@ HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_01200, Function | Sm
 HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_01300, Function | SmallTest | Level1)
 {
     BundleManagerHelper bundleManagerHelper;
-    mockGetSystemAbilityManager(true);
+    MockGetSystemAbilityManager(true);
     std::string bundle = "aa";
     int32_t userId = 1;
     EXPECT_EQ(-1, bundleManagerHelper.GetDefaultUidByBundleName(bundle, userId));
@@ -222,7 +222,7 @@ HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_01300, Function | Sm
 HWTEST_F(BundleManagerHelperBranchTest, BundleManagerHelper_01400, Function | SmallTest | Level1)
 {
     BundleManagerHelper bundleManagerHelper;
-    mockGetSystemAbilityManager(false);
+    MockGetSystemAbilityManager(false);
     std::string bundle = "aa";
     int32_t userId = 1;
     EXPECT_EQ(-1, bundleManagerHelper.GetDefaultUidByBundleName(bundle, userId));
diff --git a/services/ans/test/unittest/bundle_manager_helper_branch_test/mock_service_registry.cpp b/services/ans/test/unittest/bundle_manager_helper_branch_test/mock_service_registry.cpp
index 9b972cbe6..e6d1d346a 100755
--- a/services/ans/test/unittest/bundle_manager_helper_branch_test/mock_service_registry.cpp
+++ b/services/ans/test/unittest/bundle_manager_helper_branch_test/mock_service_registry.cpp
@@ -22,7 +22,7 @@ namespace {
     bool g_mockGetSystemAbilityManagerRet = true;
 }
 
-void mockGetSystemAbilityManager(bool mockRet)
+void MockGetSystemAbilityManager(bool mockRet)
 {
     g_mockGetSystemAbilityManagerRet = mockRet;
 }
diff --git a/services/distributed/test/unittest/distributed_database_branch_test/distributed_database_branch_test.cpp b/services/distributed/test/unittest/distributed_database_branch_test/distributed_database_branch_test.cpp
index 4ef9d9e1c..9dc2f3425 100755
--- a/services/distributed/test/unittest/distributed_database_branch_test/distributed_database_branch_test.cpp
+++ b/services/distributed/test/unittest/distributed_database_branch_test/distributed_database_branch_test.cpp
@@ -22,14 +22,14 @@
 #include "ans_inner_errors.h"
 #include "mock_single_kv_store.h"
 
-extern void mockStartWatchDeviceChange(bool mockRet);
-extern void mockGetSingleKvStore(bool mockRet);
-extern void mockSubscribeKvStore(bool mockRet);
-extern void mockKvStoreFlowControl(bool mockRet);
-extern void mockRemoveDeviceData(bool mockRet);
-extern void mockKvManagerFlowControl(bool mockRet);
-extern void mockGetLocalDevice(bool mockRet);
-extern void mockGetDeviceList(bool mockRet);
+extern void MockStartWatchDeviceChange(bool mockRet);
+extern void MockGetSingleKvStore(bool mockRet);
+extern void MockSubscribeKvStore(bool mockRet);
+extern void MockKvStoreFlowControl(bool mockRet);
+extern void MockRemoveDeviceData(bool mockRet);
+extern void MockKvManagerFlowControl(bool mockRet);
+extern void MockGetLocalDevice(bool mockRet);
+extern void MockGetDeviceList(bool mockRet);
 
 using namespace testing::ext;
 using namespace OHOS::DistributedKv;
@@ -114,7 +114,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_0100, Func
 {
     ASSERT_NE(nullptr, database_);
     database_->kvDataManager_ = nullptr;
-    mockStartWatchDeviceChange(false);
+    MockStartWatchDeviceChange(false);
     EXPECT_EQ(true, database_->CheckKvDataManager());
 }
 
@@ -127,7 +127,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_0200, Func
 {
     ASSERT_NE(nullptr, database_);
     database_->kvDataManager_ = nullptr;
-    mockStartWatchDeviceChange(false);
+    MockStartWatchDeviceChange(false);
     database_->GetKvStore();
 }
 
@@ -140,7 +140,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_0300, Func
 {
     ASSERT_NE(nullptr, database_);
     database_->kvDataManager_ = std::make_unique<DistributedKv::DistributedKvDataManager>();
-    mockGetSingleKvStore(false);
+    MockGetSingleKvStore(false);
     database_->GetKvStore();
 }
 
@@ -153,7 +153,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_0400, Func
 {
     ASSERT_NE(nullptr, database_);
     database_->kvDataManager_ = std::make_unique<DistributedKv::DistributedKvDataManager>();
-    mockGetSingleKvStore(true);
+    MockGetSingleKvStore(true);
     database_->kvStore_ = nullptr;
     database_->GetKvStore();
 }
@@ -168,12 +168,12 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_0500, Func
     ASSERT_NE(nullptr, database_);
     database_->kvDataManager_ = std::make_unique<DistributedKv::DistributedKvDataManager>();
     // set GetSingleKvStore is Status::SUCCESS
-    mockGetSingleKvStore(true);
+    MockGetSingleKvStore(true);
     // set kvStore_ is not nullptr
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     database_->kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
     // set SubscribeKvStore != Status::SUCCESS
-    mockSubscribeKvStore(false);
+    MockSubscribeKvStore(false);
     database_->GetKvStore();
 }
 
@@ -209,7 +209,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_0800, Func
 {
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     database_->kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(false);
+    MockKvStoreFlowControl(false);
     std::string key = "<key>";
     std::string value = "<value>";
     EXPECT_EQ(false, database_->PutToDistributedDB(key, value));
@@ -224,7 +224,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_0900, Func
 {
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     database_->kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(true);
+    MockKvStoreFlowControl(true);
     std::string key = "<key>";
     std::string value = "<value>";
     EXPECT_EQ(false, database_->PutToDistributedDB(key, value));
@@ -252,7 +252,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_1100, Func
 {
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     database_->kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(false);
+    MockKvStoreFlowControl(false);
     std::string key = "<key>";
     std::string value = "<value>";
     EXPECT_EQ(false, database_->GetFromDistributedDB(key, value));
@@ -267,7 +267,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_1200, Func
 {
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     database_->kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(true);
+    MockKvStoreFlowControl(true);
     std::string key = "<key>";
     std::string value = "<value>";
     EXPECT_EQ(false, database_->GetFromDistributedDB(key, value));
@@ -297,7 +297,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_1400, Func
 {
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     database_->kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(false);
+    MockKvStoreFlowControl(false);
     std::string prefixKey = "<prefixKey>";
     Entry entry;
     std::vector<Entry> entries;
@@ -314,7 +314,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_1500, Func
 {
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     database_->kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(true);
+    MockKvStoreFlowControl(true);
     std::string prefixKey = "<prefixKey>";
     Entry entry;
     std::vector<Entry> entries;
@@ -331,7 +331,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_1600, Func
 {
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     database_->kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(false);
+    MockKvStoreFlowControl(false);
     std::string key = "<key>";
     EXPECT_EQ(false, database_->DeleteToDistributedDB(key));
 }
@@ -345,7 +345,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_1700, Func
 {
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     database_->kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(true);
+    MockKvStoreFlowControl(true);
     std::string key = "<key>";
     EXPECT_EQ(false, database_->DeleteToDistributedDB(key));
 }
@@ -371,7 +371,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_1900, Func
 {
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     database_->kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(false);
+    MockKvStoreFlowControl(false);
     std::string deviceId = "<deviceId>";
     EXPECT_EQ(false, database_->ClearDataByDevice(deviceId));
 }
@@ -385,8 +385,8 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_2000, Func
 {
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     database_->kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(true);
-    mockRemoveDeviceData(false);
+    MockKvStoreFlowControl(true);
+    MockRemoveDeviceData(false);
     std::string deviceId = "<deviceId>";
     EXPECT_EQ(false, database_->ClearDataByDevice(deviceId));
 }
@@ -400,8 +400,8 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_2100, Func
 {
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     database_->kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(true);
-    mockRemoveDeviceData(true);
+    MockKvStoreFlowControl(true);
+    MockRemoveDeviceData(true);
     std::string deviceId = "<deviceId>";
     EXPECT_EQ(true, database_->ClearDataByDevice(deviceId));
 }
@@ -426,7 +426,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_2200, Func
 HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_2300, Function | SmallTest | Level1)
 {
     database_->kvDataManager_ = std::make_unique<DistributedKv::DistributedKvDataManager>();
-    mockKvManagerFlowControl(false);
+    MockKvManagerFlowControl(false);
     std::string deviceId = "<deviceId>";
     EXPECT_EQ(false, database_->GetLocalDeviceId(deviceId));
 }
@@ -451,7 +451,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_2400, Func
 HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_2500, Function | SmallTest | Level1)
 {
     database_->kvDataManager_ = std::make_unique<DistributedKv::DistributedKvDataManager>();
-    mockKvManagerFlowControl(false);
+    MockKvManagerFlowControl(false);
     DistributedHardware::DmDeviceInfo localInfo;
     EXPECT_EQ(false, database_->GetLocalDeviceInfo(localInfo));
 }
@@ -464,8 +464,8 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_2500, Func
 HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_2600, Function | SmallTest | Level1)
 {
     database_->kvDataManager_ = std::make_unique<DistributedKv::DistributedKvDataManager>();
-    mockKvManagerFlowControl(true);
-    mockGetLocalDevice(false);
+    MockKvManagerFlowControl(true);
+    MockGetLocalDevice(false);
     DistributedHardware::DmDeviceInfo localInfo;
     EXPECT_EQ(true, database_->GetLocalDeviceInfo(localInfo));
 }
@@ -490,7 +490,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_2700, Func
 HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_2800, Function | SmallTest | Level1)
 {
     database_->kvDataManager_ = std::make_unique<DistributedKv::DistributedKvDataManager>();
-    mockKvManagerFlowControl(false);
+    MockKvManagerFlowControl(false);
     std::vector<DistributedHardware::DmDeviceInfo> deviceList;
     EXPECT_EQ(false, database_->GetDeviceInfoList(deviceList));
 }
@@ -503,8 +503,8 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_2800, Func
 HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_2900, Function | SmallTest | Level1)
 {
     database_->kvDataManager_ = std::make_unique<DistributedKv::DistributedKvDataManager>();
-    mockKvManagerFlowControl(true);
-    mockGetDeviceList(false);
+    MockKvManagerFlowControl(true);
+    MockGetDeviceList(false);
     std::vector<DistributedHardware::DmDeviceInfo> deviceList;
     EXPECT_EQ(true, database_->GetDeviceInfoList(deviceList));
 }
@@ -528,7 +528,7 @@ HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_3000, Func
 HWTEST_F(DistributedDatabaseBranchTest, DistributedDatabaseBranchTest_3100, Function | SmallTest | Level1)
 {
     database_->kvDataManager_ = std::make_unique<DistributedKv::DistributedKvDataManager>();
-    mockKvManagerFlowControl(false);
+    MockKvManagerFlowControl(false);
     EXPECT_EQ(false, database_->RecreateDistributedDB());
 }
 }  // namespace Notification
diff --git a/services/distributed/test/unittest/distributed_database_branch_test/mock_distributed_flow_control.cpp b/services/distributed/test/unittest/distributed_database_branch_test/mock_distributed_flow_control.cpp
index 988bcd249..4b0b89ff6 100755
--- a/services/distributed/test/unittest/distributed_database_branch_test/mock_distributed_flow_control.cpp
+++ b/services/distributed/test/unittest/distributed_database_branch_test/mock_distributed_flow_control.cpp
@@ -20,12 +20,12 @@ namespace {
     bool g_mockKvManagerFlowControlRet = true;
 }
 
-void mockKvStoreFlowControl(bool mockRet)
+void MockKvStoreFlowControl(bool mockRet)
 {
     g_mockKvStoreFlowControlRet = mockRet;
 }
 
-void mockKvManagerFlowControl(bool mockRet)
+void MockKvManagerFlowControl(bool mockRet)
 {
     g_mockKvManagerFlowControlRet = mockRet;
 }
diff --git a/services/distributed/test/unittest/distributed_database_branch_test/mock_distributed_kv_data_manager.cpp b/services/distributed/test/unittest/distributed_database_branch_test/mock_distributed_kv_data_manager.cpp
index 181ccc129..e22aa63a4 100755
--- a/services/distributed/test/unittest/distributed_database_branch_test/mock_distributed_kv_data_manager.cpp
+++ b/services/distributed/test/unittest/distributed_database_branch_test/mock_distributed_kv_data_manager.cpp
@@ -24,22 +24,22 @@ namespace {
     bool g_mockGetDeviceListRet = true;
 }
 
-void mockStartWatchDeviceChange(bool mockRet)
+void MockStartWatchDeviceChange(bool mockRet)
 {
     g_mockStartWatchDeviceChangeRet = mockRet;
 }
 
-void mockGetSingleKvStore(bool mockRet)
+void MockGetSingleKvStore(bool mockRet)
 {
     g_mockGetSingleKvStoreRet = mockRet;
 }
 
-void mockGetLocalDevice(bool mockRet)
+void MockGetLocalDevice(bool mockRet)
 {
     g_mockGetLocalDeviceRet = mockRet;
 }
 
-void mockGetDeviceList(bool mockRet)
+void MockGetDeviceList(bool mockRet)
 {
     g_mockGetDeviceListRet = mockRet;
 }
diff --git a/services/distributed/test/unittest/distributed_database_branch_test/mock_single_kv_store.cpp b/services/distributed/test/unittest/distributed_database_branch_test/mock_single_kv_store.cpp
index 3185c841e..66b717ce0 100755
--- a/services/distributed/test/unittest/distributed_database_branch_test/mock_single_kv_store.cpp
+++ b/services/distributed/test/unittest/distributed_database_branch_test/mock_single_kv_store.cpp
@@ -21,12 +21,12 @@ namespace {
     bool g_mockRemoveDeviceDataRet = true;
 }
 
-void mockSubscribeKvStore(bool mockRet)
+void MockSubscribeKvStore(bool mockRet)
 {
     g_mockSubscribeKvStoreRet = mockRet;
 }
 
-void mockRemoveDeviceData(bool mockRet)
+void MockRemoveDeviceData(bool mockRet)
 {
     g_mockRemoveDeviceDataRet = mockRet;
 }
diff --git a/services/distributed/test/unittest/distributed_notification_manager_branch_test/distributed_notification_manager_branch_test.cpp b/services/distributed/test/unittest/distributed_notification_manager_branch_test/distributed_notification_manager_branch_test.cpp
index 9647c57bf..31b39deff 100755
--- a/services/distributed/test/unittest/distributed_notification_manager_branch_test/distributed_notification_manager_branch_test.cpp
+++ b/services/distributed/test/unittest/distributed_notification_manager_branch_test/distributed_notification_manager_branch_test.cpp
@@ -21,10 +21,10 @@
 #include "distributed_notification_manager.h"
 
 using namespace testing::ext;
-extern void mockOnDeviceConnected(bool mockRet);
-extern void mockGetEntriesFromDistributedDB(bool mockRet);
-extern void mockGetDeviceInfoList(bool mockRet);
-extern void mockGetLocalDeviceId(bool mockRet);
+extern void MockOnDeviceConnected(bool mockRet);
+extern void MockGetEntriesFromDistributedDB(bool mockRet);
+extern void MockGetDeviceInfoList(bool mockRet);
+extern void MockGetLocalDeviceId(bool mockRet);
 
 namespace OHOS {
 namespace Notification {
@@ -76,7 +76,7 @@ HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManage
 HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManager_00200, Function | SmallTest | Level1)
 {
     ASSERT_NE(nullptr, distributedManager_);
-    mockOnDeviceConnected(false);
+    MockOnDeviceConnected(false);
     distributedManager_->OnDeviceConnected("test");
 }
 
@@ -88,7 +88,7 @@ HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManage
 HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManager_00300, Function | SmallTest | Level1)
 {
     ASSERT_NE(nullptr, distributedManager_);
-    mockGetEntriesFromDistributedDB(false);
+    MockGetEntriesFromDistributedDB(false);
     distributedManager_->OnDeviceDisconnected("test");
 }
 
@@ -100,7 +100,7 @@ HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManage
 HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManager_00400, Function | SmallTest | Level1)
 {
     ASSERT_NE(nullptr, distributedManager_);
-    mockGetEntriesFromDistributedDB(true);
+    MockGetEntriesFromDistributedDB(true);
     distributedManager_->OnDeviceDisconnected("test");
 }
 
@@ -208,7 +208,7 @@ HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManage
  */
 HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManager_01000, Function | SmallTest | Level1)
 {
-    mockGetLocalDeviceId(true);
+    MockGetLocalDeviceId(true);
     std::string bundleName = "aa";
     std::string label = "bb";
     int32_t id = 1;
@@ -223,7 +223,7 @@ HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManage
  */
 HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManager_01100, Function | SmallTest | Level1)
 {
-    mockGetLocalDeviceId(true);
+    MockGetLocalDeviceId(true);
     std::string bundleName = "aa";
     std::string label = "bb";
     int32_t id = 1;
@@ -238,7 +238,7 @@ HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManage
  */
 HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManager_01200, Function | SmallTest | Level1)
 {
-    mockGetLocalDeviceId(true);
+    MockGetLocalDeviceId(true);
     sptr<NotificationRequest> request = new NotificationRequest(1000);
     request->SetLabel("<label>");
 
@@ -256,7 +256,7 @@ HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManage
  */
 HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManager_01300, Function | SmallTest | Level1)
 {
-    mockGetLocalDeviceId(false);
+    MockGetLocalDeviceId(false);
     std::string bundleName = "aa";
     std::string label = "bb";
     int32_t id = 1;
@@ -284,7 +284,7 @@ HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManage
  */
 HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManager_01500, Function | SmallTest | Level1)
 {
-    mockGetEntriesFromDistributedDB(false);
+    MockGetEntriesFromDistributedDB(false);
     std::vector<sptr<NotificationRequest>> requestList;
     EXPECT_EQ(
         distributedManager_->GetCurrentDistributedNotification(requestList), ERR_ANS_DISTRIBUTED_OPERATION_FAILED);
@@ -297,7 +297,7 @@ HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManage
  */
 HWTEST_F(DistributedNotificationManagerBranchTest, DistributedNotificationManager_01600, Function | SmallTest | Level1)
 {
-    mockGetEntriesFromDistributedDB(true);
+    MockGetEntriesFromDistributedDB(true);
     std::vector<sptr<NotificationRequest>> requestList;
     EXPECT_EQ(
         distributedManager_->GetCurrentDistributedNotification(requestList), ERR_OK);
diff --git a/services/distributed/test/unittest/distributed_notification_manager_branch_test/mock_distributed_database.cpp b/services/distributed/test/unittest/distributed_notification_manager_branch_test/mock_distributed_database.cpp
index b8e771696..77fc20f6a 100755
--- a/services/distributed/test/unittest/distributed_notification_manager_branch_test/mock_distributed_database.cpp
+++ b/services/distributed/test/unittest/distributed_notification_manager_branch_test/mock_distributed_database.cpp
@@ -24,22 +24,22 @@ namespace {
     bool g_mockGetLocalDeviceIdRet = true;
 }
 
-void mockOnDeviceConnected(bool mockRet)
+void MockOnDeviceConnected(bool mockRet)
 {
     g_mockOnDeviceConnectedRet = mockRet;
 }
 
-void mockGetEntriesFromDistributedDB(bool mockRet)
+void MockGetEntriesFromDistributedDB(bool mockRet)
 {
     g_mockGetEntriesFromDistributedDBRet = mockRet;
 }
 
-void mockGetDeviceInfoList(bool mockRet)
+void MockGetDeviceInfoList(bool mockRet)
 {
     g_mockGetDeviceInfoListRet = mockRet;
 }
 
-void mockGetLocalDeviceId(bool mockRet)
+void MockGetLocalDeviceId(bool mockRet)
 {
     g_mockGetLocalDeviceIdRet = mockRet;
 }
diff --git a/services/distributed/test/unittest/distributed_preferences_branch_test/distributed_preferences_branch_test.cpp b/services/distributed/test/unittest/distributed_preferences_branch_test/distributed_preferences_branch_test.cpp
index d4be3acc9..58f5c25f3 100755
--- a/services/distributed/test/unittest/distributed_preferences_branch_test/distributed_preferences_branch_test.cpp
+++ b/services/distributed/test/unittest/distributed_preferences_branch_test/distributed_preferences_branch_test.cpp
@@ -22,10 +22,10 @@
 #include "distributed_preferences.h"
 #include "distributed_preferences_info.h"
 
-extern void mockGetEntriesFromDistributedDB(bool mockRet);
-extern void mockPutToDistributedDB(bool mockRet);
-extern void mockDeleteToDistributedDB(bool mockRet);
-extern void mockClearDatabase(bool mockRet);
+extern void MockGetEntriesFromDistributedDB(bool mockRet);
+extern void MockPutToDistributedDB(bool mockRet);
+extern void MockDeleteToDistributedDB(bool mockRet);
+extern void MockClearDatabase(bool mockRet);
 
 using namespace testing::ext;
 namespace OHOS {
@@ -88,7 +88,7 @@ HWTEST_F(DistributedPreferencesBranchTest, DistributedPreferencesBranchTest_0020
  */
 HWTEST_F(DistributedPreferencesBranchTest, DistributedPreferencesBranchTest_00300, Function | SmallTest | Level1)
 {
-    mockGetEntriesFromDistributedDB(false);
+    MockGetEntriesFromDistributedDB(false);
     EXPECT_EQ(distributedPreferences_->InitDistributedAllInfo(), false);
 }
 
@@ -99,7 +99,7 @@ HWTEST_F(DistributedPreferencesBranchTest, DistributedPreferencesBranchTest_0030
  */
 HWTEST_F(DistributedPreferencesBranchTest, DistributedPreferencesBranchTest_00400, Function | SmallTest | Level1)
 {
-    mockGetEntriesFromDistributedDB(true);
+    MockGetEntriesFromDistributedDB(true);
     EXPECT_EQ(distributedPreferences_->InitDistributedAllInfo(), true);
 }
 
@@ -124,7 +124,7 @@ HWTEST_F(DistributedPreferencesBranchTest, DistributedPreferencesBranchTest_0050
 HWTEST_F(DistributedPreferencesBranchTest, DistributedPreferencesBranchTest_00600, Function | SmallTest | Level1)
 {
     bool isEnable = true;
-    mockPutToDistributedDB(false);
+    MockPutToDistributedDB(false);
     EXPECT_EQ(distributedPreferences_->SetDistributedEnable(isEnable), ERR_ANS_DISTRIBUTED_OPERATION_FAILED);
 }
 
@@ -149,7 +149,7 @@ HWTEST_F(DistributedPreferencesBranchTest, DistributedPreferencesBranchTest_0080
 {
     sptr<NotificationBundleOption> bundleOption = new NotificationBundleOption("<bundleName>", 783);
     bool isEnable = true;
-    mockPutToDistributedDB(false);
+    MockPutToDistributedDB(false);
     EXPECT_EQ(distributedPreferences_->SetDistributedBundleEnable(bundleOption, isEnable),
         ERR_ANS_DISTRIBUTED_OPERATION_FAILED);
 }
@@ -185,7 +185,7 @@ HWTEST_F(DistributedPreferencesBranchTest, DistributedPreferencesBranchTest_0100
 HWTEST_F(DistributedPreferencesBranchTest, DistributedPreferencesBranchTest_01100, Function | SmallTest | Level1)
 {
     sptr<NotificationBundleOption> bundleOption = new NotificationBundleOption("<bundleName>", 783);
-    mockDeleteToDistributedDB(false);
+    MockDeleteToDistributedDB(false);
     EXPECT_EQ(
         distributedPreferences_->DeleteDistributedBundleInfo(bundleOption), ERR_ANS_DISTRIBUTED_OPERATION_FAILED);
 }
@@ -197,7 +197,7 @@ HWTEST_F(DistributedPreferencesBranchTest, DistributedPreferencesBranchTest_0110
  */
 HWTEST_F(DistributedPreferencesBranchTest, DistributedPreferencesBranchTest_01200, Function | SmallTest | Level1)
 {
-    mockClearDatabase(false);
+    MockClearDatabase(false);
     EXPECT_EQ(distributedPreferences_->ClearDataInRestoreFactorySettings(), ERR_ANS_DISTRIBUTED_OPERATION_FAILED);
 }
 
@@ -208,7 +208,7 @@ HWTEST_F(DistributedPreferencesBranchTest, DistributedPreferencesBranchTest_0120
  */
 HWTEST_F(DistributedPreferencesBranchTest, DistributedPreferencesBranchTest_01300, Function | SmallTest | Level1)
 {
-    mockPutToDistributedDB(false);
+    MockPutToDistributedDB(false);
     int32_t userId = 1;
     bool enabled = true;
     EXPECT_EQ(distributedPreferences_->SetSyncEnabledWithoutApp(userId, enabled), ERR_ANS_DISTRIBUTED_OPERATION_FAILED);
diff --git a/services/distributed/test/unittest/distributed_preferences_branch_test/mock_distributed_preferences_database.cpp b/services/distributed/test/unittest/distributed_preferences_branch_test/mock_distributed_preferences_database.cpp
index eeb8e0472..2338065b1 100755
--- a/services/distributed/test/unittest/distributed_preferences_branch_test/mock_distributed_preferences_database.cpp
+++ b/services/distributed/test/unittest/distributed_preferences_branch_test/mock_distributed_preferences_database.cpp
@@ -22,22 +22,22 @@ namespace {
     bool g_mockClearDatabaseRet = true;
 }
 
-void mockGetEntriesFromDistributedDB(bool mockRet)
+void MockGetEntriesFromDistributedDB(bool mockRet)
 {
     g_mockGetEntriesFromDistributedDBRet = mockRet;
 }
 
-void mockPutToDistributedDB(bool mockRet)
+void MockPutToDistributedDB(bool mockRet)
 {
     g_mockPutToDistributedDBRet = mockRet;
 }
 
-void mockDeleteToDistributedDB(bool mockRet)
+void MockDeleteToDistributedDB(bool mockRet)
 {
     g_mockDeleteToDistributedDBRet = mockRet;
 }
 
-void mockClearDatabase(bool mockRet)
+void MockClearDatabase(bool mockRet)
 {
     g_mockClearDatabaseRet = mockRet;
 }
diff --git a/services/distributed/test/unittest/distributed_preferences_database_test/distributed_preferences_database_test.cpp b/services/distributed/test/unittest/distributed_preferences_database_test/distributed_preferences_database_test.cpp
index 235078299..622861978 100755
--- a/services/distributed/test/unittest/distributed_preferences_database_test/distributed_preferences_database_test.cpp
+++ b/services/distributed/test/unittest/distributed_preferences_database_test/distributed_preferences_database_test.cpp
@@ -22,10 +22,10 @@
 
 #include "mock_single_kv_store.h"
 
-extern void mockKvStoreFlowControl(bool mockRet);
-extern void mockGet(bool mockRet);
-extern void mockKvManagerFlowControl(bool mockRet);
-extern void mockCloseKvStore(bool mockRet);
+extern void MockKvStoreFlowControl(bool mockRet);
+extern void MockGet(bool mockRet);
+extern void MockKvManagerFlowControl(bool mockRet);
+extern void MockCloseKvStore(bool mockRet);
 
 using namespace testing::ext;
 using namespace OHOS::DistributedKv;
@@ -104,7 +104,7 @@ HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_0050
     DistributedPreferencesDatabase distributedPreferencesDatabase;
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedPreferencesDatabase.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(false);
+    MockKvStoreFlowControl(false);
     std::string key = "aa";
     std::string value = "bb";
     EXPECT_EQ(false, distributedPreferencesDatabase.PutToDistributedDB(key, value));
@@ -120,7 +120,7 @@ HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_0060
     DistributedPreferencesDatabase distributedPreferencesDatabase;
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedPreferencesDatabase.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(true);
+    MockKvStoreFlowControl(true);
     std::string key = "aa";
     std::string value = "bb";
     EXPECT_EQ(false, distributedPreferencesDatabase.PutToDistributedDB(key, value));
@@ -150,7 +150,7 @@ HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_0080
     DistributedPreferencesDatabase distributedPreferencesDatabase;
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedPreferencesDatabase.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(false);
+    MockKvStoreFlowControl(false);
     std::string key = "aa";
     std::string value = "bb";
     EXPECT_EQ(false, distributedPreferencesDatabase.GetFromDistributedDB(key, value));
@@ -166,8 +166,8 @@ HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_0090
     DistributedPreferencesDatabase distributedPreferencesDatabase;
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedPreferencesDatabase.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(true);
-    mockGet(true);
+    MockKvStoreFlowControl(true);
+    MockGet(true);
     std::string key = "aa";
     std::string value = "bb";
     EXPECT_EQ(false, distributedPreferencesDatabase.GetFromDistributedDB(key, value));
@@ -183,8 +183,8 @@ HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_0100
     DistributedPreferencesDatabase distributedPreferencesDatabase;
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedPreferencesDatabase.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(true);
-    mockGet(false);
+    MockKvStoreFlowControl(true);
+    MockGet(false);
     std::string key = "aa";
     std::string value = "bb";
     EXPECT_EQ(true, distributedPreferencesDatabase.GetFromDistributedDB(key, value));
@@ -214,7 +214,7 @@ HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_0120
     DistributedPreferencesDatabase distributedPreferencesDatabase;
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedPreferencesDatabase.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(false);
+    MockKvStoreFlowControl(false);
     std::string prefixKey = "aa";
     std::vector<Entry> entries;
     EXPECT_EQ(false, distributedPreferencesDatabase.GetEntriesFromDistributedDB(prefixKey, entries));
@@ -230,7 +230,7 @@ HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_0130
     DistributedPreferencesDatabase distributedPreferencesDatabase;
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedPreferencesDatabase.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(true);
+    MockKvStoreFlowControl(true);
     std::string prefixKey = "aa";
     std::vector<Entry> entries;
     EXPECT_EQ(false, distributedPreferencesDatabase.GetEntriesFromDistributedDB(prefixKey, entries));
@@ -259,7 +259,7 @@ HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_0150
     DistributedPreferencesDatabase distributedPreferencesDatabase;
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedPreferencesDatabase.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(false);
+    MockKvStoreFlowControl(false);
     std::string key = "aa";
     EXPECT_EQ(false, distributedPreferencesDatabase.DeleteToDistributedDB(key));
 }
@@ -274,7 +274,7 @@ HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_0160
     DistributedPreferencesDatabase distributedPreferencesDatabase;
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedPreferencesDatabase.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
-    mockKvStoreFlowControl(true);
+    MockKvStoreFlowControl(true);
     std::string key = "aa";
     EXPECT_EQ(false, distributedPreferencesDatabase.DeleteToDistributedDB(key));
 }
@@ -287,7 +287,7 @@ HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_0160
 HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_01700, Function | SmallTest | Level1)
 {
     DistributedPreferencesDatabase distributedPreferencesDatabase;
-    mockKvManagerFlowControl(false);
+    MockKvManagerFlowControl(false);
     EXPECT_EQ(false, distributedPreferencesDatabase.ClearDatabase());
 }
 
@@ -299,8 +299,8 @@ HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_0170
 HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_01800, Function | SmallTest | Level1)
 {
     DistributedPreferencesDatabase distributedPreferencesDatabase;
-    mockKvManagerFlowControl(true);
-    mockCloseKvStore(false);
+    MockKvManagerFlowControl(true);
+    MockCloseKvStore(false);
     EXPECT_EQ(false, distributedPreferencesDatabase.ClearDatabase());
 }
 
@@ -312,8 +312,8 @@ HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_0180
 HWTEST_F(DistributedPreferencesDatabaseTest, DistributedPreferencesDatabase_01900, Function | SmallTest | Level1)
 {
     DistributedPreferencesDatabase distributedPreferencesDatabase;
-    mockKvManagerFlowControl(true);
-    mockCloseKvStore(true);
+    MockKvManagerFlowControl(true);
+    MockCloseKvStore(true);
     EXPECT_EQ(false, distributedPreferencesDatabase.ClearDatabase());
 }
 }  // namespace Notification
diff --git a/services/distributed/test/unittest/distributed_preferences_database_test/mock_distributed_flow_control.cpp b/services/distributed/test/unittest/distributed_preferences_database_test/mock_distributed_flow_control.cpp
index 7594a0db5..d0d353fe2 100755
--- a/services/distributed/test/unittest/distributed_preferences_database_test/mock_distributed_flow_control.cpp
+++ b/services/distributed/test/unittest/distributed_preferences_database_test/mock_distributed_flow_control.cpp
@@ -20,12 +20,12 @@ namespace {
     bool g_mockKvManagerFlowControlRet = true;
 }
 
-void mockKvStoreFlowControl(bool mockRet)
+void MockKvStoreFlowControl(bool mockRet)
 {
     g_mockKvStoreFlowControlRet = mockRet;
 }
 
-void mockKvManagerFlowControl(bool mockRet)
+void MockKvManagerFlowControl(bool mockRet)
 {
     g_mockKvManagerFlowControlRet = mockRet;
 }
diff --git a/services/distributed/test/unittest/distributed_preferences_database_test/mock_distributed_kv_data_manager.cpp b/services/distributed/test/unittest/distributed_preferences_database_test/mock_distributed_kv_data_manager.cpp
index 20ed102ee..7e62e7831 100755
--- a/services/distributed/test/unittest/distributed_preferences_database_test/mock_distributed_kv_data_manager.cpp
+++ b/services/distributed/test/unittest/distributed_preferences_database_test/mock_distributed_kv_data_manager.cpp
@@ -19,7 +19,7 @@ namespace {
     bool g_mockCloseKvStoreRet = true;
 }
 
-void mockCloseKvStore(bool mockRet)
+void MockCloseKvStore(bool mockRet)
 {
     g_mockCloseKvStoreRet = mockRet;
 }
diff --git a/services/distributed/test/unittest/distributed_preferences_database_test/mock_single_kv_store.cpp b/services/distributed/test/unittest/distributed_preferences_database_test/mock_single_kv_store.cpp
index 1ee38da68..88eae08f9 100755
--- a/services/distributed/test/unittest/distributed_preferences_database_test/mock_single_kv_store.cpp
+++ b/services/distributed/test/unittest/distributed_preferences_database_test/mock_single_kv_store.cpp
@@ -20,7 +20,7 @@ namespace {
     bool g_mockGetRet = true;
 }
 
-void mockGet(bool mockRet)
+void MockGet(bool mockRet)
 {
     g_mockGetRet = mockRet;
 }
diff --git a/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/distributed_screen_status_manager_branch_test.cpp b/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/distributed_screen_status_manager_branch_test.cpp
index 96c93f44e..e94264047 100755
--- a/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/distributed_screen_status_manager_branch_test.cpp
+++ b/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/distributed_screen_status_manager_branch_test.cpp
@@ -22,12 +22,12 @@
 #include "ans_inner_errors.h"
 #include "mock_single_kv_store.h"
 
-extern void mockGetDeviceList(bool mockRet);
-extern void mockStartWatchDeviceChange(bool mockRet);
-extern void mockKvManagerFlowControl(bool mockRet);
-extern void mockKvStoreFlowControl(bool mockRet);
-extern void mockGetEntries(bool mockRet);
-extern void mockGetLocalDevice(bool mockRet);
+extern void MockGetDeviceList(bool mockRet);
+extern void MockStartWatchDeviceChange(bool mockRet);
+extern void MockKvManagerFlowControl(bool mockRet);
+extern void MockKvStoreFlowControl(bool mockRet);
+extern void MockGetEntries(bool mockRet);
+extern void MockGetLocalDevice(bool mockRet);
 
 using namespace testing::ext;
 using namespace OHOS::DistributedKv;
@@ -54,7 +54,7 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_0100, Funct
 {
     DistributedScreenStatusManager distributedScreenStatusManager;
     distributedScreenStatusManager.kvDataManager_ = nullptr;
-    mockStartWatchDeviceChange(false);
+    MockStartWatchDeviceChange(false);
     EXPECT_EQ(true, distributedScreenStatusManager.CheckKvDataManager());
 }
 
@@ -68,8 +68,8 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_0200, Funct
     std::shared_ptr<DistributedScreenStatusManager> distributedScreenStatusManager =
         std::make_shared<DistributedScreenStatusManager>();
     ASSERT_NE(nullptr, distributedScreenStatusManager);
-    mockGetDeviceList(false);
-    mockStartWatchDeviceChange(true);
+    MockGetDeviceList(false);
+    MockStartWatchDeviceChange(true);
     std::string deviceId = "aa";
     distributedScreenStatusManager->OnDeviceDisconnected(deviceId);
 }
@@ -84,8 +84,8 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_0300, Funct
     std::shared_ptr<DistributedScreenStatusManager> distributedScreenStatusManager =
         std::make_shared<DistributedScreenStatusManager>();
     ASSERT_NE(nullptr, distributedScreenStatusManager);
-    mockGetDeviceList(true);
-    mockStartWatchDeviceChange(true);
+    MockGetDeviceList(true);
+    MockStartWatchDeviceChange(true);
     std::string deviceId = "aa";
     distributedScreenStatusManager->OnDeviceDisconnected(deviceId);
 }
@@ -125,8 +125,8 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_0600, Funct
     std::shared_ptr<DistributedScreenStatusManager> distributedScreenStatusManager =
         std::make_shared<DistributedScreenStatusManager>();
     ASSERT_NE(nullptr, distributedScreenStatusManager);
-    mockGetDeviceList(true);
-    mockStartWatchDeviceChange(true);
+    MockGetDeviceList(true);
+    MockStartWatchDeviceChange(true);
     distributedScreenStatusManager->kvStore_ = nullptr;
     std::string deviceId = "aa";
     distributedScreenStatusManager->OnDeviceDisconnected(deviceId);
@@ -142,7 +142,7 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_0700, Funct
     std::shared_ptr<DistributedScreenStatusManager> distributedScreenStatusManager =
         std::make_shared<DistributedScreenStatusManager>();
     ASSERT_NE(nullptr, distributedScreenStatusManager);
-    mockStartWatchDeviceChange(false);
+    MockStartWatchDeviceChange(false);
     distributedScreenStatusManager->GetKvDataManager();
 }
 
@@ -156,7 +156,7 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_0800, Funct
     std::shared_ptr<DistributedScreenStatusManager> distributedScreenStatusManager =
         std::make_shared<DistributedScreenStatusManager>();
     ASSERT_NE(nullptr, distributedScreenStatusManager);
-    mockStartWatchDeviceChange(false);
+    MockStartWatchDeviceChange(false);
     distributedScreenStatusManager->GetKvStore();
 }
 
@@ -170,7 +170,7 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_0900, Funct
     std::shared_ptr<DistributedScreenStatusManager> distributedScreenStatusManager =
         std::make_shared<DistributedScreenStatusManager>();
     ASSERT_NE(nullptr, distributedScreenStatusManager);
-    mockStartWatchDeviceChange(true);
+    MockStartWatchDeviceChange(true);
     distributedScreenStatusManager->GetKvStore();
 }
 
@@ -185,7 +185,7 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_1000, Funct
         std::make_shared<DistributedScreenStatusManager>();
     ASSERT_NE(nullptr, distributedScreenStatusManager);
     distributedScreenStatusManager->kvDataManager_ = nullptr;
-    mockStartWatchDeviceChange(false);
+    MockStartWatchDeviceChange(false);
     std::string deviceId = "aa";
     distributedScreenStatusManager->OnDeviceDisconnected(deviceId);
 }
@@ -200,7 +200,7 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_1100, Funct
     DistributedScreenStatusManager distributedScreenStatusManager;
     // set CheckKvDataManager is false
     distributedScreenStatusManager.kvDataManager_ = nullptr;
-    mockStartWatchDeviceChange(false);
+    MockStartWatchDeviceChange(false);
     // set kvStore_ is nullptr
     distributedScreenStatusManager.kvStore_ = nullptr;
     bool isUsing = true;
@@ -216,14 +216,14 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_1200, Funct
 {
     DistributedScreenStatusManager distributedScreenStatusManager;
     // set CheckKvDataManager is true
-    mockStartWatchDeviceChange(true);
+    MockStartWatchDeviceChange(true);
     // set kvStore_ is not nullptr
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedScreenStatusManager.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
     // set KvManagerFlowControl is false
-    mockKvManagerFlowControl(false);
+    MockKvManagerFlowControl(false);
     // set KvStoreFlowControl is false
-    mockKvStoreFlowControl(false);
+    MockKvStoreFlowControl(false);
     bool isUsing = true;
     EXPECT_EQ(ERR_ANS_DISTRIBUTED_OPERATION_FAILED, distributedScreenStatusManager.CheckRemoteDevicesIsUsing(isUsing));
 }
@@ -237,16 +237,16 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_1300, Funct
 {
     DistributedScreenStatusManager distributedScreenStatusManager;
     // set CheckKvDataManager is true
-    mockStartWatchDeviceChange(true);
+    MockStartWatchDeviceChange(true);
     // set kvStore_ is not nullptr
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedScreenStatusManager.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
     // set KvManagerFlowControl is true
-    mockKvManagerFlowControl(true);
+    MockKvManagerFlowControl(true);
     // set KvStoreFlowControl is true
-    mockKvStoreFlowControl(true);
+    MockKvStoreFlowControl(true);
     // set status != DistributedKv::Status::SUCCESS
-    mockGetDeviceList(false);
+    MockGetDeviceList(false);
     bool isUsing = true;
     EXPECT_EQ(ERR_OK, distributedScreenStatusManager.CheckRemoteDevicesIsUsing(isUsing));
 }
@@ -260,18 +260,18 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_1400, Funct
 {
     DistributedScreenStatusManager distributedScreenStatusManager;
     // set CheckKvDataManager is true
-    mockStartWatchDeviceChange(true);
+    MockStartWatchDeviceChange(true);
     // set kvStore_ is not nullptr
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedScreenStatusManager.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
     // set KvManagerFlowControl is true
-    mockKvManagerFlowControl(true);
+    MockKvManagerFlowControl(true);
     // set KvStoreFlowControl is true
-    mockKvStoreFlowControl(true);
+    MockKvStoreFlowControl(true);
     // set status == DistributedKv::Status::SUCCESS
-    mockGetDeviceList(true);
+    MockGetDeviceList(true);
     // set status != DistributedKv::Status::SUCCESS
-    mockGetEntries(false);
+    MockGetEntries(false);
     bool isUsing = true;
     EXPECT_EQ(ERR_ANS_DISTRIBUTED_GET_INFO_FAILED, distributedScreenStatusManager.CheckRemoteDevicesIsUsing(isUsing));
 }
@@ -285,18 +285,18 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_1500, Funct
 {
     DistributedScreenStatusManager distributedScreenStatusManager;
     // set CheckKvDataManager is true
-    mockStartWatchDeviceChange(true);
+    MockStartWatchDeviceChange(true);
     // set kvStore_ is not nullptr
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedScreenStatusManager.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
     // set KvManagerFlowControl is true
-    mockKvManagerFlowControl(true);
+    MockKvManagerFlowControl(true);
     // set KvStoreFlowControl is true
-    mockKvStoreFlowControl(true);
+    MockKvStoreFlowControl(true);
     // set status == DistributedKv::Status::SUCCESS
-    mockGetDeviceList(true);
+    MockGetDeviceList(true);
     // set status == DistributedKv::Status::SUCCESS
-    mockGetEntries(true);
+    MockGetEntries(true);
     bool isUsing = true;
     EXPECT_EQ(ERR_OK, distributedScreenStatusManager.CheckRemoteDevicesIsUsing(isUsing));
 }
@@ -310,18 +310,18 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_1600, Funct
 {
     DistributedScreenStatusManager distributedScreenStatusManager;
     // set CheckKvDataManager is true
-    mockStartWatchDeviceChange(true);
+    MockStartWatchDeviceChange(true);
     // set kvStore_ is not nullptr
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedScreenStatusManager.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
     // set KvManagerFlowControl is true
-    mockKvManagerFlowControl(true);
+    MockKvManagerFlowControl(true);
     // set KvStoreFlowControl is true
-    mockKvStoreFlowControl(true);
+    MockKvStoreFlowControl(true);
     // set status == DistributedKv::Status::SUCCESS
-    mockGetDeviceList(true);
+    MockGetDeviceList(true);
     // set status == DistributedKv::Status::SUCCESS
-    mockGetEntries(true);
+    MockGetEntries(true);
     bool isUsing = false;
     EXPECT_EQ(ERR_OK, distributedScreenStatusManager.CheckRemoteDevicesIsUsing(isUsing));
 }
@@ -338,9 +338,9 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_1700, Funct
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedScreenStatusManager.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
     // set KvManagerFlowControl is false
-    mockKvManagerFlowControl(false);
+    MockKvManagerFlowControl(false);
     // set KvStoreFlowControl is false
-    mockKvStoreFlowControl(false);
+    MockKvStoreFlowControl(false);
     bool screenOn = true;
     EXPECT_EQ(ERR_ANS_DISTRIBUTED_OPERATION_FAILED, distributedScreenStatusManager.SetLocalScreenStatus(screenOn));
 }
@@ -357,11 +357,11 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_1800, Funct
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedScreenStatusManager.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
     // set KvManagerFlowControl is true
-    mockKvManagerFlowControl(true);
+    MockKvManagerFlowControl(true);
     // set KvStoreFlowControl is true
-    mockKvStoreFlowControl(true);
+    MockKvStoreFlowControl(true);
     // set status != DistributedKv::Status::SUCCESS
-    mockGetLocalDevice(false);
+    MockGetLocalDevice(false);
     bool screenOn = true;
     EXPECT_EQ(ERR_ANS_DISTRIBUTED_OPERATION_FAILED, distributedScreenStatusManager.SetLocalScreenStatus(screenOn));
 }
@@ -378,11 +378,11 @@ HWTEST_F(DistributedScreenStatusManagerBranchTest, DistributedScreen_1900, Funct
     std::shared_ptr<MockSingleKvStore> kvStore = std::make_shared<MockSingleKvStore>();
     distributedScreenStatusManager.kvStore_ = std::static_pointer_cast<SingleKvStore>(kvStore);
     // set KvManagerFlowControl is true
-    mockKvManagerFlowControl(true);
+    MockKvManagerFlowControl(true);
     // set KvStoreFlowControl is true
-    mockKvStoreFlowControl(true);
+    MockKvStoreFlowControl(true);
     // set status == DistributedKv::Status::SUCCESS
-    mockGetLocalDevice(true);
+    MockGetLocalDevice(true);
     bool screenOn = true;
     EXPECT_EQ(ERR_ANS_DISTRIBUTED_OPERATION_FAILED, distributedScreenStatusManager.SetLocalScreenStatus(screenOn));
 }
diff --git a/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/mock_distributed_flow_control.cpp b/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/mock_distributed_flow_control.cpp
index 049fc79bc..63cfff2a5 100755
--- a/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/mock_distributed_flow_control.cpp
+++ b/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/mock_distributed_flow_control.cpp
@@ -20,12 +20,12 @@ namespace {
     bool g_mockKvStoreFlowControlRet = true;
 }
 
-void mockKvManagerFlowControl(bool mockRet)
+void MockKvManagerFlowControl(bool mockRet)
 {
     g_mockKvManagerFlowControlRet = mockRet;
 }
 
-void mockKvStoreFlowControl(bool mockRet)
+void MockKvStoreFlowControl(bool mockRet)
 {
     g_mockKvStoreFlowControlRet = mockRet;
 }
diff --git a/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/mock_distributed_kv_data_manager.cpp b/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/mock_distributed_kv_data_manager.cpp
index c7351bd44..b3650d606 100755
--- a/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/mock_distributed_kv_data_manager.cpp
+++ b/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/mock_distributed_kv_data_manager.cpp
@@ -23,17 +23,17 @@ namespace {
     bool g_mockGetLocalDeviceRet = true;
 }
 
-void mockGetDeviceList(bool mockRet)
+void MockGetDeviceList(bool mockRet)
 {
     g_mockGetDeviceListRet = mockRet;
 }
 
-void mockStartWatchDeviceChange(bool mockRet)
+void MockStartWatchDeviceChange(bool mockRet)
 {
     g_mockStartWatchDeviceChangeRet = mockRet;
 }
 
-void mockGetLocalDevice(bool mockRet)
+void MockGetLocalDevice(bool mockRet)
 {
     g_mockGetLocalDeviceRet = mockRet;
 }
diff --git a/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/mock_single_kv_store.cpp b/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/mock_single_kv_store.cpp
index 5a54ce109..4e868fde5 100755
--- a/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/mock_single_kv_store.cpp
+++ b/services/distributed/test/unittest/distributed_screen_status_manager_branch_test/mock_single_kv_store.cpp
@@ -20,7 +20,7 @@ namespace {
     bool g_mockGetEntriesRet = true;
 }
 
-void mockGetEntries(bool mockRet) {
+void MockGetEntries(bool mockRet) {
     g_mockGetEntriesRet = mockRet;
 }
 
-- 
Gitee