diff --git a/frameworks/kits/test/mock/DemoObServer/mock_ability_manager_client.h b/frameworks/kits/test/mock/DemoObServer/mock_ability_manager_client.h
index 96997c597d..4481f6e9fd 100644
--- a/frameworks/kits/test/mock/DemoObServer/mock_ability_manager_client.h
+++ b/frameworks/kits/test/mock/DemoObServer/mock_ability_manager_client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -56,11 +56,11 @@ sptr<AAFwk::IAbilityScheduler> AAFwk::AbilityManagerClient::AcquireDataAbility(
         retval = remoteProxy;
 
         if (retval == nullptr) {
-        GTEST_LOG_(INFO) << "mock_ability_thread_for_data_observer:mock result retval is  nullptr called";
+            GTEST_LOG_(INFO) << "mock_ability_thread_for_data_observer:mock result retval is nullptr called";
         }
     } else {
         retval = iter->second;
-        GTEST_LOG_(INFO) << "mock_ability_manager_client:find data is  not null called";
+        GTEST_LOG_(INFO) << "mock_ability_manager_client:find data is not null called";
     }
 
     return retval;
diff --git a/frameworks/kits/test/mock/DemoObServer/mock_ability_thread_for_data_observer.h b/frameworks/kits/test/mock/DemoObServer/mock_ability_thread_for_data_observer.h
index 5a54b21ffc..8a3e95caa1 100644
--- a/frameworks/kits/test/mock/DemoObServer/mock_ability_thread_for_data_observer.h
+++ b/frameworks/kits/test/mock/DemoObServer/mock_ability_thread_for_data_observer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -35,17 +35,17 @@ sptr<AppExecFwk::AbilityThread> MockCreateAbilityThread()
 {
     sptr<AppExecFwk::AbilityThread> abilitythread(new (std::nothrow) AppExecFwk::AbilityThread());
     if (abilitythread == nullptr) {
-        GTEST_LOG_(INFO) << "mock_ability_thread_for_data_observer:mock abilityhreadptr is  nullptr called";
+        GTEST_LOG_(INFO) << "mock_ability_thread_for_data_observer:mock abilityhreadptr is nullptr called";
     }
 
     std::shared_ptr<OHOSApplication> application = std::make_shared<OHOSApplication>();
     if (application == nullptr) {
-        GTEST_LOG_(INFO) << "mock_ability_thread_for_data_observer:mock applicationptr is  nullptr called";
+        GTEST_LOG_(INFO) << "mock_ability_thread_for_data_observer:mock applicationptr is nullptr called";
     }
 
     std::shared_ptr<AbilityInfo> info = std::make_shared<AbilityInfo>();
     if (info == nullptr) {
-        GTEST_LOG_(INFO) << "mock_ability_thread_for_data_observer:mock AbilityInfo::info is  nullptr called";
+        GTEST_LOG_(INFO) << "mock_ability_thread_for_data_observer:mock AbilityInfo::info is nullptr called";
     }
 
     info->name = std::string("MockAbilityTest");
diff --git a/interfaces/innerkits/form_manager/include/form_provider_proxy.h b/interfaces/innerkits/form_manager/include/form_provider_proxy.h
index e2e59e1bdc..36d777f295 100644
--- a/interfaces/innerkits/form_manager/include/form_provider_proxy.h
+++ b/interfaces/innerkits/form_manager/include/form_provider_proxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/interfaces/innerkits/form_manager/include/form_supply_proxy.h b/interfaces/innerkits/form_manager/include/form_supply_proxy.h
index 095130a673..fae7b2543a 100644
--- a/interfaces/innerkits/form_manager/include/form_supply_proxy.h
+++ b/interfaces/innerkits/form_manager/include/form_supply_proxy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/interfaces/innerkits/form_manager/src/form_provider_data.cpp b/interfaces/innerkits/form_manager/src/form_provider_data.cpp
index da96cab7fa..668571485c 100755
--- a/interfaces/innerkits/form_manager/src/form_provider_data.cpp
+++ b/interfaces/innerkits/form_manager/src/form_provider_data.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -13,13 +13,14 @@
  * limitations under the License.
  */
 
+#include "form_provider_data.h"
+
 #include <cinttypes>
 #include <fstream>
 #include <iostream>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "form_provider_data.h"
 #include "hilog_wrapper.h"
 #include "message_parcel.h"
 #include "string_ex.h"
diff --git a/interfaces/innerkits/form_manager/src/form_provider_proxy.cpp b/interfaces/innerkits/form_manager/src/form_provider_proxy.cpp
index edef08731a..5aee19cf26 100644
--- a/interfaces/innerkits/form_manager/src/form_provider_proxy.cpp
+++ b/interfaces/innerkits/form_manager/src/form_provider_proxy.cpp
@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "appexecfwk_errors.h"
 #include "form_provider_proxy.h"
+#include "appexecfwk_errors.h"
 #include "string_ex.h"
 
 namespace OHOS {
diff --git a/interfaces/innerkits/form_manager/src/form_supply_proxy.cpp b/interfaces/innerkits/form_manager/src/form_supply_proxy.cpp
index 9c6429c672..5f972b44cf 100644
--- a/interfaces/innerkits/form_manager/src/form_supply_proxy.cpp
+++ b/interfaces/innerkits/form_manager/src/form_supply_proxy.cpp
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
+#include "form_supply_proxy.h"
 #include "appexecfwk_errors.h"
 #include "form_constants.h"
-#include "form_supply_proxy.h"
 #include "string_ex.h"
 
 namespace OHOS {
diff --git a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp
index 4aa93b8b61..782927ff8f 100644
--- a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp
+++ b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -55,7 +55,7 @@ napi_value ParseBundleName(napi_env env, std::string &bundleName, napi_value arg
     napi_get_value_string_utf8(env, args, buf, NapiAbilityMgr::BUFFER_LENGTH_MAX, &len);
     HILOG_INFO("bundleName= [%{public}s].", buf);
     bundleName = std::string(buf);
-    // create reutrn
+    // create return
     napi_value ret = 0;
     NAPI_CALL(env, napi_create_int32(env, 0, &ret));
     return ret;
@@ -383,7 +383,7 @@ napi_value NAPI_QueryRecentAbilityMissionInfosWrap(
             &async_callback_info.asyncWork);
 
         NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
-        // create reutrn
+        // create return
         napi_value ret = 0;
         NAPI_CALL(env, napi_create_int32(env, 1, &ret));
         return ret;
@@ -520,7 +520,7 @@ napi_value NAPI_GetpreviousAbilityMissionInfosWrap(napi_env env, napi_callback_i
             &async_callback_info.asyncWork);
 
         NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
-        // create reutrn
+        // create return
         napi_value ret = 0;
         NAPI_CALL(env, napi_create_int32(env, 1, &ret));
         return ret;
@@ -653,7 +653,7 @@ napi_value NAPI_QueryRunningAbilityMissionInfosWrap(
             &async_callback_info.asyncWork);
 
         NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
-        // create reutrn
+        // create return
         napi_value ret = 0;
         NAPI_CALL(env, napi_create_int32(env, 0, &ret));
         return ret;
@@ -786,7 +786,7 @@ napi_value NAPI_GetActiveAbilityMissionInfosWrap(
             &async_callback_info.asyncWork);
 
         NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
-        // create reutrn
+        // create return
         napi_value ret = 0;
         NAPI_CALL(env, napi_create_int32(env, 0, &ret));
         return ret;
@@ -914,7 +914,7 @@ napi_value NAPI_GetAllRunningProcessesWrap(
             &async_callback_info.asyncWork);
 
         NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
-        // create reutrn
+        // create return
         napi_value ret = 0;
         NAPI_CALL(env, napi_create_int32(env, 0, &ret));
         return ret;
@@ -1032,7 +1032,7 @@ napi_value NAPI_GetActiveProcessInfosWrap(
             &async_callback_info.asyncWork);
 
         NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
-        // create reutrn
+        // create return
         napi_value ret = 0;
         NAPI_CALL(env, napi_create_int32(env, 0, &ret));
         return ret;
@@ -1150,7 +1150,7 @@ napi_value NAPI_RemoveMissionWrap(
             &async_callback_info.asyncWork);
 
         NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
-        // create reutrn
+        // create return
         napi_value ret = 0;
         NAPI_CALL(env, napi_create_int32(env, 0, &ret));
         return ret;
@@ -1276,7 +1276,7 @@ napi_value NAPI_RemoveMissionsWrap(
             &async_callback_info.asyncWork);
 
         NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
-        // create reutrn
+        // create return
         napi_value ret = 0;
         NAPI_CALL(env, napi_create_int32(env, 0, &ret));
         return ret;
@@ -1413,7 +1413,7 @@ napi_value NAPI_ClearMissionsWrap(
             &async_callback_info.asyncWork);
 
         NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
-        // create reutrn
+        // create return
         napi_value ret = 0;
         NAPI_CALL(env, napi_create_int32(env, 0, &ret));
         return ret;
@@ -1531,7 +1531,7 @@ napi_value NAPI_MoveMissionToTopWrap(
             &async_callback_info.asyncWork);
 
         NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
-        // create reutrn
+        // create return
         napi_value ret = 0;
         NAPI_CALL(env, napi_create_int32(env, 0, &ret));
         return ret;
@@ -1656,7 +1656,7 @@ napi_value NAPI_KillProcessesByBundleNameWrap(
             &async_callback_info.asyncWork);
 
         NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
-        // create reutrn
+        // create return
         napi_value ret = 0;
         NAPI_CALL(env, napi_create_int32(env, 0, &ret));
         return ret;
@@ -1780,7 +1780,7 @@ napi_value NAPI_ClearUpApplicationDataWrap(napi_env env, napi_callback_info info
             &async_callback_info.asyncWork);
 
         NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork));
-        // create reutrn
+        // create return
         napi_value ret = 0;
         NAPI_CALL(env, napi_create_int32(env, 0, &ret));
         return ret;
@@ -1908,7 +1908,7 @@ napi_value NAPI_GetAbilityMissionSnapshotWrap(
             &async_callback_info->asyncWork);
 
         NAPI_CALL(env, napi_queue_async_work(env, async_callback_info->asyncWork));
-        // create reutrn
+        // create return
         napi_value ret = 0;
         NAPI_CALL(env, napi_create_int32(env, 0, &ret));
         return ret;
@@ -2226,7 +2226,7 @@ napi_value NAPI_GetSystemMemoryAttr(napi_env env, napi_callback_info info)
     HILOG_INFO("%{public}s argc = [%{public}zu]", __func__, argc);
 
     if (argc == 0) {
-        // promiss
+        // promise
         ret = GetSystemMemoryAttrPromiss(env);
     } else if (argc == 1) {
         // async
diff --git a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.h b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.h
index 4a6a6dbc27..3f1a04ef08 100644
--- a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.h
+++ b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/services/abilitymgr/include/screenshot_response.h b/services/abilitymgr/include/screenshot_response.h
index 31994844bb..c640bf5e1f 100644
--- a/services/abilitymgr/include/screenshot_response.h
+++ b/services/abilitymgr/include/screenshot_response.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp
index 42974f672d..a0c52400df 100755
--- a/services/abilitymgr/src/ability_connect_manager.cpp
+++ b/services/abilitymgr/src/ability_connect_manager.cpp
@@ -69,6 +69,7 @@ int AbilityConnectManager::TerminateAbility(const std::shared_ptr<AbilityRecord>
         });
 
     if (!targetAbility) {
+         HILOG_ERROR("targetAbility error.");
         return NO_FOUND_ABILITY_BY_CALLER;
     }
     if (result != ERR_OK) {
diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp
index d564aeee67..f7445b8be2 100644
--- a/services/abilitymgr/src/ability_manager_service.cpp
+++ b/services/abilitymgr/src/ability_manager_service.cpp
@@ -218,7 +218,7 @@ bool AbilityManagerService::Init()
             HILOG_INFO("file exists");
             return;
         }
-        HILOG_INFO("no such file,creat...");
+        HILOG_INFO("no such file,create...");
         std::ofstream outFile(AmsWhiteList::AMS_WHITE_LIST_FILE_PATH, std::ios::out);
         outFile.close();
     };
@@ -3639,7 +3639,7 @@ int AbilityManagerService::CheckCallPermissions(const AbilityRequest &abilityReq
         std::string bundleName;
         bool result = bms->GetBundleNameForUid(callerUid, bundleName);
         if (!result) {
-            HILOG_ERROR("GetBundleNameForUid frome bms fail.");
+            HILOG_ERROR("GetBundleNameForUid from bms fail.");
             return RESOLVE_CALL_NO_PERMISSIONS;
         }
         if (bundleName != abilityInfo.bundleName && callerUid != targetUid && !isTargetSystemApp) {
diff --git a/services/abilitymgr/src/screenshot_response.cpp b/services/abilitymgr/src/screenshot_response.cpp
index 7ffe506cd0..47ab18297b 100644
--- a/services/abilitymgr/src/screenshot_response.cpp
+++ b/services/abilitymgr/src/screenshot_response.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/services/formmgr/include/form_host_callback.h b/services/formmgr/include/form_host_callback.h
index fafe033c00..83009cfa7e 100644
--- a/services/formmgr/include/form_host_callback.h
+++ b/services/formmgr/include/form_host_callback.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/services/formmgr/include/form_host_record.h b/services/formmgr/include/form_host_record.h
index b50a992c17..cc4dd8d7a4 100644
--- a/services/formmgr/include/form_host_record.h
+++ b/services/formmgr/include/form_host_record.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License")_;
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/services/formmgr/src/form_host_callback.cpp b/services/formmgr/src/form_host_callback.cpp
index b634cf2fce..06a8f09d44 100644
--- a/services/formmgr/src/form_host_callback.cpp
+++ b/services/formmgr/src/form_host_callback.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -13,11 +13,12 @@
  * limitations under the License.
  */
 
+#include "form_host_callback.h"
+
 #include <cinttypes>
 
 #include "appexecfwk_errors.h"
 #include "app_log_wrapper.h"
-#include "form_host_callback.h"
 #include "form_host_interface.h"
 #include "form_task_mgr.h"
 #include "string_ex.h"
diff --git a/services/formmgr/src/form_host_record.cpp b/services/formmgr/src/form_host_record.cpp
index e634837bca..9b646474ed 100644
--- a/services/formmgr/src/form_host_record.cpp
+++ b/services/formmgr/src/form_host_record.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -57,7 +57,7 @@ bool FormHostRecord::Contains(int64_t formId) const
 /**
  * @brief Set refresh enable flag.
  * @param formId The Id of the form.
- * @param flag True for enbale, false for disable.
+ * @param flag True for enable, false for disable.
  */
 void FormHostRecord::SetEnableRefresh(int64_t formId, bool flag)
 {
@@ -69,7 +69,7 @@ void FormHostRecord::SetEnableRefresh(int64_t formId, bool flag)
 /**
  * @brief Refresh enable or not.
  * @param formId The Id of the form.
- * @return true on enbale, false on disable..
+ * @return true on enable, false on disable..
  */
 bool FormHostRecord::IsEnableRefresh(int64_t formId) const
 {
@@ -82,7 +82,7 @@ bool FormHostRecord::IsEnableRefresh(int64_t formId) const
 /**
  * @brief Set need refresh enable flag.
  * @param formId The Id of the form.
- * @param flag True for enbale, false for disable.
+ * @param flag True for enable, false for disable.
  */
 void FormHostRecord::SetNeedRefresh(int64_t formId, bool flag)
 {
@@ -91,7 +91,7 @@ void FormHostRecord::SetNeedRefresh(int64_t formId, bool flag)
 /**
  * @brief Need Refresh enable or not.
  * @param formId The Id of the form.
- * @return true on enbale, false on disable..
+ * @return true on enable, false on disable..
  */
 bool FormHostRecord::IsNeedRefresh(int64_t formId) const
 {
diff --git a/services/formmgr/src/form_msg_event_connection.cpp b/services/formmgr/src/form_msg_event_connection.cpp
index e975c26311..d05cea7f99 100644
--- a/services/formmgr/src/form_msg_event_connection.cpp
+++ b/services/formmgr/src/form_msg_event_connection.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
+#include "form_msg_event_connection.h"
+
 #include <cinttypes>
 
 #include "appexecfwk_errors.h"
 #include "app_log_wrapper.h"
 #include "form_constants.h"
-#include "form_msg_event_connection.h"
 #include "form_supply_callback.h"
 #include "form_task_mgr.h"
 #include "ipc_types.h"
diff --git a/services/formmgr/src/form_refresh_connection.cpp b/services/formmgr/src/form_refresh_connection.cpp
index 598857f3da..916ba902fb 100644
--- a/services/formmgr/src/form_refresh_connection.cpp
+++ b/services/formmgr/src/form_refresh_connection.cpp
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
+#include "form_refresh_connection.h"
+
 #include <cinttypes>
 
 #include "appexecfwk_errors.h"
 #include "app_log_wrapper.h"
 #include "form_constants.h"
-#include "form_refresh_connection.h"
 #include "form_supply_callback.h"
 #include "form_task_mgr.h"
 #include "ipc_types.h"
diff --git a/services/formmgr/test/mock/src/mock_form_host_client.cpp b/services/formmgr/test/mock/src/mock_form_host_client.cpp
index 1186c15206..8c70e7e66a 100644
--- a/services/formmgr/test/mock/src/mock_form_host_client.cpp
+++ b/services/formmgr/test/mock/src/mock_form_host_client.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include "mock_form_host_client.h"
 #include <gtest/gtest.h>
 #include "appexecfwk_errors.h"
 #include "app_log_wrapper.h"
 #include "errors.h"
-#include "mock_form_host_client.h"
 #include "string_ex.h"
 
 namespace OHOS {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/fifth_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/fifth_ability.cpp
index a99add0aa9..98b82ab1c9 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/fifth_ability.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/fifth_ability.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -621,7 +621,7 @@ void FifthAbility::WantParamsMarshallingCase7(int code)
     wParams.Marshalling(in);
     WantParams *wantParamsOut = WantParams::Unmarshalling(in);
 #ifdef WANT_PARAM_USE_LONG
-    bool result = (Long)::Unbox(ILong::Query(wantParamsOut->GetParam(key))) == value);
+    bool result = (Long)::Unbox(ILong::Query(wantParamsOut->GetParam(key))) == value;
 #else
     bool result = (String::Unbox(IString::Query(wantParamsOut->GetParam(key))) == strValue);
 #endif
diff --git a/tools/aa/src/test_observer_proxy.cpp b/tools/aa/src/test_observer_proxy.cpp
index e064f4a40d..5cc6c41819 100644
--- a/tools/aa/src/test_observer_proxy.cpp
+++ b/tools/aa/src/test_observer_proxy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -42,7 +42,7 @@ void TestObserverProxy::TestStatus(const std::string &msg, const int &resultCode
 
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
-        HILOG_ERROR("Failed to send cmd to service due to remote objetc is null");
+        HILOG_ERROR("Failed to send cmd to service due to remote object is null");
         return;
     }
 
@@ -78,7 +78,7 @@ void TestObserverProxy::TestFinished(const std::string &msg, const int &resultCo
 
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
-        HILOG_ERROR("Failed to send cmd to service due to remote objetc is null");
+        HILOG_ERROR("Failed to send cmd to service due to remote object is null");
         return;
     }
 
@@ -116,7 +116,7 @@ ShellCommandResult TestObserverProxy::ExecuteShellCommand(
 
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
-        HILOG_ERROR("Failed to send cmd to service due to remote objetc is null");
+        HILOG_ERROR("Failed to send cmd to service due to remote object is null");
         return result;
     }