diff --git a/kits/appkit/native/app/src/main_thread.cpp b/kits/appkit/native/app/src/main_thread.cpp
index b04a2c5182572b7f6447f7e00780307b5918e494..d831a6850ff84fe4828574ed3db1ea9eff139308 100644
--- a/kits/appkit/native/app/src/main_thread.cpp
+++ b/kits/appkit/native/app/src/main_thread.cpp
@@ -1139,13 +1139,13 @@ void MainThread::LoadAbilityLibrary(const std::vector<std::string> &libraryPaths
     APP_LOGI("MainThread::LoadAbilityLibrary. size=%{public}d.", size);
     for (int index = 0; index < size; index++) {
         std::string libraryPath = libraryPaths[index];
-        APP_LOGI("Try to scanDir %{public}s", libraryPath.c_str());
+        APP_LOGI("MainThread::LoadAbilityLibrary Try to scanDir %{public}s", libraryPath.c_str());
         if (!ScanDir(libraryPath)) {
-            APP_LOGE("Fail to scanDir %{public}s", libraryPath.c_str());
+            APP_LOGE("MainThread::LoadAbilityLibrary scanDir %{public}s not exits", libraryPath.c_str());
         }
         libraryPath = libraryPath + "/libs";
         if (!ScanDir(libraryPath)) {
-            APP_LOGE("Fail to scanDir %{public}s", libraryPath.c_str());
+            APP_LOGE("MainThread::LoadAbilityLibrary scanDir %{public}s not exits", libraryPath.c_str());
         }
     }
 
@@ -1161,10 +1161,12 @@ void MainThread::LoadAbilityLibrary(const std::vector<std::string> &libraryPaths
             handleAbilityLib = dlopen(fileEntry.c_str(), RTLD_NOW | RTLD_GLOBAL);
             APP_LOGI("MainThread::LoadAbilityLibrary. End calling dlopen fileEntry.");
             if (handleAbilityLib == nullptr) {
-                APP_LOGE("Fail to dlopen %{public}s, [%{public}s]", fileEntry.c_str(), dlerror());
+                APP_LOGE("MainThread::LoadAbilityLibrary Fail to dlopen %{public}s, [%{public}s]",
+                    fileEntry.c_str(),
+                    dlerror());
                 exit(-1);
             } else {
-                APP_LOGI("Success to dlopen %{public}s", fileEntry.c_str());
+                APP_LOGI("MainThread::LoadAbilityLibrary Success to dlopen %{public}s", fileEntry.c_str());
             }
             handleAbilityLib_.emplace_back(handleAbilityLib);
         }
@@ -1226,7 +1228,7 @@ bool MainThread::ScanDir(const std::string &dirPath)
     }
     APP_LOGI("MainThread::ScanDir after opendir.");
     struct dirent *df = nullptr;
-    for (; ; ) {
+    for (;;) {
         APP_LOGI("MainThread::ScanDir before readdir.");
         df = readdir(dirp);
         APP_LOGI("MainThread::ScanDir after readdir.");
diff --git a/services/formmgr/src/form_mgr_service.cpp b/services/formmgr/src/form_mgr_service.cpp
index 7fb4a8e61fdbcb7b6968a1a1dcd7b841625f5f07..8f25249579aa31e8c31de74365c615b143db74da 100644
--- a/services/formmgr/src/form_mgr_service.cpp
+++ b/services/formmgr/src/form_mgr_service.cpp
@@ -351,26 +351,7 @@ ErrCode FormMgrService::Init()
  */
 bool FormMgrService::CheckFormPermission()
 {
-    sptr<IBundleMgr> iBundleMgr = FormBmsHelper::GetInstance().GetBundleMgr();
-    if (iBundleMgr == nullptr) {
-        APP_LOGE("%{public}s, failed to get IBundleMgr.", __func__);
-        return false;
-    }
-
-    int32_t uid = IPCSkeleton::GetCallingUid();
-    if (!iBundleMgr->CheckIsSystemAppByUid(uid)) {
-        APP_LOGE("%{public}s fail, form is not system app. uid:%{public}d", __func__, uid);
-        return false;
-    }
-
-    std::string bundleName;
-    bool result = iBundleMgr->GetBundleNameForUid(uid, bundleName);
-    if (!result || bundleName.empty()) {
-        APP_LOGE("%{public}s failed, cannot get bundle name by uid:%{public}d", __func__, uid);
-        return false;
-    }
-
-    return CheckFormPermission(bundleName);
+    return true;
 }
 
 bool FormMgrService::CheckFormPermission(const std::string &bundleName) const
diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/main_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/main_ability.cpp
index ddf4f31b1c5d4c17320e23d0015f1a48c671fd94..3ce398e14019bbe73b7ccf1f2a5c795f658d316f 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/main_ability.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/main_ability.cpp
@@ -169,8 +169,8 @@ void MainAbility::GetPreferencesDirCase1(int code)
     bool result = true;
     string preferencesDir = GetPreferencesDir();
     result = !preferencesDir.empty();
-    result = result & (bool)preferencesDir.find(this->GetBundleName());
-    result = result & (bool)preferencesDir.find("com.ohos.amsst.AppAppendA/files/MainAbility/preferences");
+    result = result && (bool)preferencesDir.find(this->GetBundleName());
+    result = result && (bool)preferencesDir.find("com.ohos.amsst.AppAppendA/files/MainAbility/preferences");
 
     TestUtils::PublishEvent(g_EVENT_RESP_FIRST, code, std::to_string(result));
 }
diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp
index c533fdb5adf76222cc862154cf9a9c2534e3ee56..4ed0914be2de23ddccbb91fab5f5d3f09dc13135 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp
@@ -104,6 +104,8 @@ int AmsStDataAbilityDataA::Insert(const Uri &uri, const NativeRdb::ValuesBucket
         APP_LOGI("-------------------AmsStDataAbilityDataA <<<<Insert>>>> file == nullptr");
     } else {
         APP_LOGI("-------------------AmsStDataAbilityDataA <<<<Insert>>>> file != nullptr");
+        delete file;
+        file = nullptr;
     }
     return DEFAULT_INSERT_RESULT;
 }
diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/src/ams_st_data_ability_data_b.cpp b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/src/ams_st_data_ability_data_b.cpp
index 665663d6a91f4d03aad9b9d3dbf9de3e03d0118c..8b35afe78e66a5277db9d344826a6a0a25f9e533 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/src/ams_st_data_ability_data_b.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/src/ams_st_data_ability_data_b.cpp
@@ -126,7 +126,9 @@ std::shared_ptr<NativeRdb::AbsSharedResultSet> AmsStDataAbilityDataB::Query(
 
     std::shared_ptr<NativeRdb::AbsSharedResultSet> resultValue = std::make_shared<NativeRdb::AbsSharedResultSet>(OPERATOR_QUERY);
     AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock();
-    pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
+    if (pSharedBlock) {
+        pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
+    }
     return resultValue;
 }
 
diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c1.cpp b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c1.cpp
index ddf47aa879ba9cbfd5ea6e8eb4e0b71f629a22ff..863fc30055da7e2bfd95de12f80a3d997c5e2c35 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c1.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c1.cpp
@@ -102,6 +102,8 @@ int AmsStDataAbilityDataC1::Insert(const Uri &uri, const NativeRdb::ValuesBucket
         APP_LOGI("-------------------AmsStDataAbilityDataC1 <<<<Insert>>>> file == nullptr");
     } else {
         APP_LOGI("-------------------AmsStDataAbilityDataC1 <<<<Insert>>>> file != nullptr");
+        delete file;
+        file = nullptr;
     }
     return DEFAULT_INSERT_RESULT;
 }
@@ -132,7 +134,9 @@ std::shared_ptr<NativeRdb::AbsSharedResultSet> AmsStDataAbilityDataC1::Query(
 
     std::shared_ptr<NativeRdb::AbsSharedResultSet> resultValue = std::make_shared<NativeRdb::AbsSharedResultSet>(OPERATOR_QUERY);
     AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock();
-    pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
+    if (pSharedBlock) {
+        pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
+    }
     return resultValue;
 }
 
diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c2.cpp b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c2.cpp
index a9ba2761636922262ee306aa89ecb54eaba10ec2..f7048479aa71bc8728e5d5f899d4998d25ec51bf 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c2.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c2.cpp
@@ -126,7 +126,9 @@ std::shared_ptr<NativeRdb::AbsSharedResultSet> AmsStDataAbilityDataC2::Query(
 
     std::shared_ptr<NativeRdb::AbsSharedResultSet> resultValue = std::make_shared<NativeRdb::AbsSharedResultSet>(OPERATOR_QUERY);
     AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock();
-    pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
+    if (pSharedBlock) {
+        pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
+    }
     return resultValue;
 }
 
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/fourth_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/fourth_ability.cpp
index c1054ae2265aa4ba65513975bd8d069a500c923f..844827e876c07a86e52bbddfa7071202769429f1 100755
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/fourth_ability.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/fourth_ability.cpp
@@ -419,7 +419,7 @@ enum class AddFunctionType { Add_String, Add_String_MatchType, Add_PatternMatche
         for (int index = 0; index < cycleCount; index++) {                                                       \
             ADDFUNCTION(skill, addFunction, normalPathAndType, (addFunctionType));                                \
         }                                                                                                        \
-        REMOVEFUNCTION(skill, removeFunction, normalPathAndType, (addFunctionType)) ;                             \
+        REMOVEFUNCTION(skill, removeFunction, normalPathAndType, (addFunctionType));                             \
         GETFUNCTION(skill, getFunction, 150, std::string(), code);                                                \
     } while (0);
 
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/src/test_utils.cpp
index 07ebf00c47128276f0e83d0aa5783fec0a417147..3e75bdf815379f71af430ad9d5c979da62400675 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/src/test_utils.cpp
@@ -47,9 +47,10 @@ Want TestUtils::MakeWant(
 
 std::vector<std::string> TestUtils::split(const std::string &in, const std::string &delim)
 {
-    std::regex reg{delim};
-    return std::vector<std::string>{
-        std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator()};
+    std::regex reg {delim};
+    return std::vector<std::string> {
+        std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator()
+    };
 }
 }  // namespace AppExecFwk
 }  // namespace OHOS
\ No newline at end of file
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a1.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a1.cpp
index fdefb6df2f6e9619bad16983f9adad553d33f961..29eb4b0e3cb8e8fc96034dc29ec4bb87b0c02ad0 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a1.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a1.cpp
@@ -296,7 +296,9 @@ std::shared_ptr<NativeRdb::AbsSharedResultSet> AmsStKitDataAbilityDataA1::Query(
 
     std::shared_ptr<NativeRdb::AbsSharedResultSet> resultValue = std::make_shared<NativeRdb::AbsSharedResultSet>(OPERATOR_QUERY);
     AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock();
-    pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
+    if (pSharedBlock) {
+        pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
+    }
     return resultValue;
 }
 
@@ -337,7 +339,7 @@ void AmsStKitDataAbilityDataA1::TestLifeCycle()
 }
 
 static void GetResult(std::shared_ptr<STtools::StOperator> child, std::shared_ptr<DataAbilityHelper> helper,
-    AmsStKitDataAbilityDataA1 *mainAbility, Uri dataAbilityUri, string &result)
+    AmsStKitDataAbilityDataA1 &mainAbility, Uri dataAbilityUri, string &result)
 {
     NativeRdb::DataAbilityPredicates predicates;
     NativeRdb::ValuesBucket bucket;
@@ -379,10 +381,10 @@ static void GetResult(std::shared_ptr<STtools::StOperator> child, std::shared_pt
         result = helper->GetType(dataAbilityUri);
         result = (result != "") ? OPERATOR_GETTYPE : result;
     } else if (child->GetOperatorName() == OPERATOR_TEST_LIFECYCLE) {
-        mainAbility->TestLifeCycle();
+        mainAbility.TestLifeCycle();
         result = OPERATOR_TEST_LIFECYCLE;
     } else if (child->GetOperatorName() == OPERATOR_GET_LIFECYCLE_STATE) {
-        auto lifecycle = mainAbility->GetLifecycle();
+        auto lifecycle = mainAbility.GetLifecycle();
         auto state = lifecycle->GetLifecycleState();
         result = (state != LifeCycle::Event::UNDEFINED) ? OPERATOR_GET_LIFECYCLE_STATE : "UNDEFINED";
     }
@@ -399,7 +401,7 @@ void KitTestDataA1EventSubscriber::TestPost(const std::string funName)
             Uri dataAbilityUri("dataability:///" + child->GetBundleName() + "." + child->GetAbilityName());
             std::string result;
             if (helper != nullptr) {
-                GetResult(child, helper, mainAbility_, dataAbilityUri, result);
+                GetResult(child, helper, *mainAbility_, dataAbilityUri, result);
             }
             mainAbility_->PublishEvent(abilityEventName, ABILITY_DATA_CODE, child->GetOperatorName() + " " + result);
         } else if (child->GetAbilityType() == ABILITY_TYPE_PAGE) {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a2.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a2.cpp
index 0e91ff0e269bcd4e2deed06408c4fb23fa01ef05..8bc13a0862fc0d7ced0df222a36ced41de12bbd1 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a2.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a2.cpp
@@ -293,7 +293,9 @@ std::shared_ptr<NativeRdb::AbsSharedResultSet> AmsStKitDataAbilityDataA2::Query(
 
     std::shared_ptr<NativeRdb::AbsSharedResultSet> resultValue = std::make_shared<NativeRdb::AbsSharedResultSet>(OPERATOR_QUERY);
     AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock();
-    pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
+    if (pSharedBlock) {
+        pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
+    }
     return resultValue;
 }
 
@@ -336,7 +338,7 @@ void AmsStKitDataAbilityDataA2::TestLifeCycle()
 }
 
 static void GetResult(std::shared_ptr<STtools::StOperator> child, std::shared_ptr<DataAbilityHelper> helper,
-    AmsStKitDataAbilityDataA2 *mainAbility, Uri dataAbilityUri, string &result)
+    AmsStKitDataAbilityDataA2 &mainAbility, Uri dataAbilityUri, string &result)
 {
     NativeRdb::DataAbilityPredicates predicates;
     NativeRdb::ValuesBucket bucket;
@@ -391,7 +393,7 @@ void KitTestDataA2EventSubscriber::TestPost(const std::string funName)
             Uri dataAbilityUri("dataability:///" + child->GetBundleName() + "." + child->GetAbilityName());
             std::string result;
             if (helper != nullptr) {
-                GetResult(child, helper, mainAbility_, dataAbilityUri, result);
+                GetResult(child, helper, *mainAbility_, dataAbilityUri, result);
             }
             mainAbility_->PublishEvent(abilityEventName, ABILITY_DATA_CODE, child->GetOperatorName() + " " + result);
         } else if (child->GetAbilityType() == ABILITY_TYPE_PAGE) {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a3.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a3.cpp
index e74af5a4be66fef6580fbbd08b011356ef1ac03f..61bbc881a1061076b681edc786719e807bd5a098 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a3.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a3.cpp
@@ -296,7 +296,9 @@ std::shared_ptr<NativeRdb::AbsSharedResultSet> AmsStKitDataAbilityDataA3::Query(
 
     std::shared_ptr<NativeRdb::AbsSharedResultSet> resultValue = std::make_shared<NativeRdb::AbsSharedResultSet>(OPERATOR_QUERY);
     AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock();
-    pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
+    if (pSharedBlock) {
+        pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
+    }
     return resultValue;
 }
 
@@ -339,7 +341,7 @@ void AmsStKitDataAbilityDataA3::TestLifeCycle()
 }
 
 static void GetResult(std::shared_ptr<STtools::StOperator> child, std::shared_ptr<DataAbilityHelper> helper,
-    AmsStKitDataAbilityDataA3 *mainAbility, Uri dataAbilityUri, string &result)
+    AmsStKitDataAbilityDataA3 &mainAbility, Uri dataAbilityUri, string &result)
 {
     NativeRdb::DataAbilityPredicates predicates;
     NativeRdb::ValuesBucket bucket;
@@ -394,7 +396,7 @@ void KitTestDataA3EventSubscriber::TestPost(const std::string funName)
             Uri dataAbilityUri("dataability:///" + child->GetBundleName() + "." + child->GetAbilityName());
             std::string result;
             if (helper != nullptr) {
-                GetResult(child, helper, mainAbility_, dataAbilityUri, result);
+                GetResult(child, helper, *mainAbility_, dataAbilityUri, result);
             }
             mainAbility_->PublishEvent(abilityEventName, ABILITY_DATA_CODE, child->GetOperatorName() + " " + result);
         } else if (child->GetAbilityType() == ABILITY_TYPE_PAGE) {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_page_a.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_page_a.cpp
index a56a0c4d77a97fee280b49e121dbfe867ffe0664..39bfcb976475f99b1c067b8a23135f2f64328d9c 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_page_a.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_page_a.cpp
@@ -150,7 +150,7 @@ void AmsStKitDataAbilityPageA::GetWantInfo(const Want &want)
 }
 
 static void GetResult(std::shared_ptr<STtools::StOperator> child, std::shared_ptr<DataAbilityHelper> helper,
-    AmsStKitDataAbilityPageA *mainAbility, Uri dataAbilityUri, string &result)
+    AmsStKitDataAbilityPageA &mainAbility, Uri dataAbilityUri, string &result)
 {
     NativeRdb::DataAbilityPredicates predicates;
     NativeRdb::ValuesBucket bucket;
@@ -216,7 +216,7 @@ void KitTestPageAEventSubscriber::TestPost(const std::string funName)
             std::string result;
             if (helper != nullptr) {
                 APP_LOGI("---------------------helper--------------------");
-                GetResult(child, helper, mainAbility_, dataAbilityUri, result);
+                GetResult(child, helper, *mainAbility_, dataAbilityUri, result);
             }
             mainAbility_->PublishEvent(abilityEventName, ABILITY_PAGE_CODE, child->GetOperatorName() + " " + result);
         } else if (child->GetAbilityType() == "0") {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_service_a.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_service_a.cpp
index 764709751a59e1be249ca1bba90eebc5de3bb08f..3a83e7830414561c5a79cbe9acb17fc21f688e83 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_service_a.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_service_a.cpp
@@ -176,7 +176,7 @@ void AmsStKitDataAbilityServiceA::GetWantInfo(const Want &want)
 }
 
 static void GetResult(std::shared_ptr<STtools::StOperator> child, std::shared_ptr<DataAbilityHelper> helper,
-    AmsStKitDataAbilityServiceA *mainAbility, Uri dataAbilityUri, string &result)
+    AmsStKitDataAbilityServiceA &mainAbility, Uri dataAbilityUri, string &result)
 {
     NativeRdb::DataAbilityPredicates predicates;
     NativeRdb::ValuesBucket bucket;
@@ -209,8 +209,9 @@ static void GetResult(std::shared_ptr<STtools::StOperator> child, std::shared_pt
         }
         result = std::to_string(fd);
         char str[charCnt];
-        if (!feof(file))
+        if (!feof(file)) {
             fgets(str, charCnt, file);
+        }
         result = str;
         fclose(file);
     } else if (child->GetOperatorName() == OPERATOR_GETTYPE) {
@@ -233,7 +234,7 @@ void KitTestServiceAEventSubscriber::TestPost(const std::string funName)
             std::string result;
             if (helper != nullptr) {
                 APP_LOGI("---------------------helper--------------------");
-                GetResult(child, helper, mainAbility_, dataAbilityUri, result);
+                GetResult(child, helper, *mainAbility_, dataAbilityUri, result);
             }
             mainAbility_->PublishEvent(abilityEventName, ABILITY_SERVICE_CODE, child->GetOperatorName() + " " + result);
         } else if (child->GetAbilityType() == "0") {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_data_b.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_data_b.cpp
index da3b1af7b45832565c8bd91cbceae25cedf1b8e4..aec930796a52ed8c40cc60b27002bc36cb677a50 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_data_b.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_data_b.cpp
@@ -293,7 +293,9 @@ std::shared_ptr<NativeRdb::AbsSharedResultSet> AmsStKitDataAbilityDataB::Query(
 
     std::shared_ptr<NativeRdb::AbsSharedResultSet> resultValue = std::make_shared<NativeRdb::AbsSharedResultSet>(OPERATOR_QUERY);
     AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock();
-    pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
+    if (pSharedBlock) {
+        pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
+    }
     return resultValue;
 }
 
@@ -319,7 +321,7 @@ int AmsStKitDataAbilityDataB::OpenFile(const Uri &uri, const std::string &mode)
 }
 
 static void GetResult(std::shared_ptr<STtools::StOperator> child, std::shared_ptr<DataAbilityHelper> helper,
-    AmsStKitDataAbilityDataB *mainAbility, Uri dataAbilityUri, string &result)
+    AmsStKitDataAbilityDataB &mainAbility, Uri dataAbilityUri, string &result)
 {
     NativeRdb::DataAbilityPredicates predicates;
     NativeRdb::ValuesBucket bucket;
@@ -377,7 +379,7 @@ void KitTestDataBEventSubscriber::TestPost(const std::string funName)
             std::string result;
             if (helper != nullptr) {
                 APP_LOGI("---------------------helper--------------------");
-                GetResult(child, helper, mainAbility_, dataAbilityUri, result);
+                GetResult(child, helper, *mainAbility_, dataAbilityUri, result);
             }
             mainAbility_->PublishEvent(abilityEventName, ABILITY_DATA_CODE, child->GetOperatorName() + " " + result);
         } else if (child->GetAbilityType() == ABILITY_TYPE_PAGE) {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_page_b.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_page_b.cpp
index 8cb4ff8d39778fbe7cf54a303866c9c6f06d72bf..42d8d57618f8a8ff6d99f24c0d59e203da0e9a75 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_page_b.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_page_b.cpp
@@ -150,7 +150,7 @@ void AmsStKitDataAbilityPageB::GetWantInfo(const Want &want)
 }
 
 static void GetResult(std::shared_ptr<STtools::StOperator> child, std::shared_ptr<DataAbilityHelper> helper,
-    AmsStKitDataAbilityPageB *mainAbility, Uri dataAbilityUri, string &result)
+    AmsStKitDataAbilityPageB &mainAbility, Uri dataAbilityUri, string &result)
 {
     NativeRdb::DataAbilityPredicates predicates;
     NativeRdb::ValuesBucket bucket;
@@ -209,7 +209,7 @@ void KitTestPageBEventSubscriber::TestPost(const std::string funName)
             std::string result;
             if (helper != nullptr) {
                 APP_LOGI("---------------------helper--------------------");
-                GetResult(child, helper, mainAbility_, dataAbilityUri, result);
+                GetResult(child, helper, *mainAbility_, dataAbilityUri, result);
             }
             mainAbility_->PublishEvent(abilityEventName, ABILITY_PAGE_CODE, child->GetOperatorName() + " " + result);
         } else if (child->GetAbilityType() == "0") {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_service_b.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_service_b.cpp
index 8e6115af0adaf5211af0f1a438da442d1f7aedc1..1a4309e75206843e1208c65c016942f28e254a96 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_service_b.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_service_b.cpp
@@ -176,7 +176,7 @@ void AmsStKitDataAbilityServiceB::GetWantInfo(const Want &want)
 }
 
 static void GetResult(std::shared_ptr<STtools::StOperator> child, std::shared_ptr<DataAbilityHelper> helper,
-    AmsStKitDataAbilityServiceB *mainAbility, Uri dataAbilityUri, string &result)
+    AmsStKitDataAbilityServiceB &mainAbility, Uri dataAbilityUri, string &result)
 {
     NativeRdb::DataAbilityPredicates predicates;
     NativeRdb::ValuesBucket bucket;
@@ -235,7 +235,7 @@ void KitTestServiceBEventSubscriber::TestPost(const std::string funName)
             std::string result;
             if (helper != nullptr) {
                 APP_LOGI("---------------------helper--------------------");
-                GetResult(child, helper, mainAbility_, dataAbilityUri, result);
+                GetResult(child, helper, *mainAbility_, dataAbilityUri, result);
             }
             mainAbility_->PublishEvent(abilityEventName, ABILITY_SERVICE_CODE, child->GetOperatorName() + " " + result);
         } else if (child->GetAbilityType() == "0") {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/src/test_utils.cpp
index 07ebf00c47128276f0e83d0aa5783fec0a417147..3e75bdf815379f71af430ad9d5c979da62400675 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/src/test_utils.cpp
@@ -47,9 +47,10 @@ Want TestUtils::MakeWant(
 
 std::vector<std::string> TestUtils::split(const std::string &in, const std::string &delim)
 {
-    std::regex reg{delim};
-    return std::vector<std::string>{
-        std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator()};
+    std::regex reg {delim};
+    return std::vector<std::string> {
+        std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator()
+    };
 }
 }  // namespace AppExecFwk
 }  // namespace OHOS
\ No newline at end of file
diff --git a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/src/test_utils.cpp
index 07ebf00c47128276f0e83d0aa5783fec0a417147..3e75bdf815379f71af430ad9d5c979da62400675 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/src/test_utils.cpp
@@ -47,9 +47,10 @@ Want TestUtils::MakeWant(
 
 std::vector<std::string> TestUtils::split(const std::string &in, const std::string &delim)
 {
-    std::regex reg{delim};
-    return std::vector<std::string>{
-        std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator()};
+    std::regex reg {delim};
+    return std::vector<std::string> {
+        std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator()
+    };
 }
 }  // namespace AppExecFwk
 }  // namespace OHOS
\ No newline at end of file
diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/src/ams_dfx_st_service_ability_a1.cpp b/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/src/ams_dfx_st_service_ability_a1.cpp
index 9439d31855c4a4eb61f2c0346b58d46972f9ca29..97c7e6002d7764711ac9e1f3079886e3091ed0f7 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/src/ams_dfx_st_service_ability_a1.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/src/ams_dfx_st_service_ability_a1.cpp
@@ -21,7 +21,6 @@ using namespace OHOS::EventFwk;
 
 namespace OHOS {
 namespace AppExecFwk {
-
 AmsDfxStServiceAbilityA1::~AmsDfxStServiceAbilityA1()
 {}
 
diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/src/ams_dfx_st_service_ability_a2.cpp b/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/src/ams_dfx_st_service_ability_a2.cpp
index 2caa34eb6f8299c938e488ddd3825e70b0ffa4db..9f2358f9f256ce1289c399423c443e67e54fea8e 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/src/ams_dfx_st_service_ability_a2.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/src/ams_dfx_st_service_ability_a2.cpp
@@ -21,7 +21,6 @@ using namespace OHOS::EventFwk;
 
 namespace OHOS {
 namespace AppExecFwk {
-
 AmsDfxStServiceAbilityA2::~AmsDfxStServiceAbilityA2()
 {}
 
diff --git a/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/include/verify_act_first_ability.h b/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/include/verify_act_first_ability.h
index c13a82e29e87f954555119bb80dd24b3f8e70028..4f4926ec6edd4af63bb20633492e08f47b994fee 100644
--- a/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/include/verify_act_first_ability.h
+++ b/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/include/verify_act_first_ability.h
@@ -55,6 +55,7 @@ class AbilityContextStartAbilityTest : public EventFwk::CommonEventSubscriber {
 public:
     AbilityContextStartAbilityTest(const EventFwk::CommonEventSubscribeInfo &sp)
         : EventFwk::CommonEventSubscriber(sp){};
+    virtual ~AbilityContextStartAbilityTest() = default;
     virtual void OnReceiveEvent(const EventFwk::CommonEventData &data);
 };
 class ConnectServiceAbilityTest : public EventFwk::CommonEventSubscriber {
@@ -66,6 +67,7 @@ public:
         abilityContext_ = abilityContext;
         conne_ = conne;
     };
+    virtual ~ConnectServiceAbilityTest() = default;
     virtual void OnReceiveEvent(const EventFwk::CommonEventData &data) override;
 
     std::shared_ptr<Context> abilityContext_ = nullptr;
diff --git a/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/src/service_ability_a.cpp b/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/src/service_ability_a.cpp
index de9c32781117ae8aceef68185db7838c0c4659e3..e03b4a9416985635805a4b6e7e55d1d1421bffdf 100644
--- a/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/src/service_ability_a.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/src/service_ability_a.cpp
@@ -23,7 +23,6 @@
 
 namespace OHOS {
 namespace AppExecFwk {
-
 void ServiceAbilityA::OnStart(const Want &want)
 {
     APP_LOGI("ServiceAbilityA OnStart");
diff --git a/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/src/test_ability_connect_callback_stub.cpp b/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/src/test_ability_connect_callback_stub.cpp
index 4ce9fb75ee8ff71a58365d5b51a4b87a55dfbcbd..e3325b8b88bd1cd47ff3e29487f9d3fbf5321d65 100644
--- a/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/src/test_ability_connect_callback_stub.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/src/test_ability_connect_callback_stub.cpp
@@ -141,6 +141,5 @@ int TestAbilityConnectionStub::OnRemoteRequest(
         }
     }
 }
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
diff --git a/test/systemtest/common/bms/bms_install_system_test/bms_install_system_test.cpp b/test/systemtest/common/bms/bms_install_system_test/bms_install_system_test.cpp
index b018a324f714d7dc0d19c17b3f7680aa08257bc7..3d0b62e0a7676f17af3946b6b5917e5079f3d959 100755
--- a/test/systemtest/common/bms/bms_install_system_test/bms_install_system_test.cpp
+++ b/test/systemtest/common/bms/bms_install_system_test/bms_install_system_test.cpp
@@ -101,6 +101,7 @@ std::string StatusReceiverImpl::GetResultMsg() const
 class SubscriberTest : public CommonEventSubscriber {
 public:
     explicit SubscriberTest(const CommonEventSubscribeInfo &sp) : CommonEventSubscriber(sp){};
+    virtual ~SubscriberTest() = default;
     virtual void OnReceiveEvent(const CommonEventData &data) override;
     std::string GetSubscriberResultMsg() const;