From 3244438255f1049a7b5cccd9853f1905c4b875bb Mon Sep 17 00:00:00 2001 From: chenliming Date: Thu, 11 Sep 2025 22:43:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?description:=E4=BF=AE=E5=A4=8Dtdd=20fail?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenliming --- services/common/include/hilog_tag_wrapper.h | 2 +- test/unittest/ability_manager_service_first_test/BUILD.gn | 1 - test/unittest/ability_manager_service_sixth_test/BUILD.gn | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/services/common/include/hilog_tag_wrapper.h b/services/common/include/hilog_tag_wrapper.h index c87425eb837..15f285de862 100644 --- a/services/common/include/hilog_tag_wrapper.h +++ b/services/common/include/hilog_tag_wrapper.h @@ -190,7 +190,7 @@ inline const char* GetDomainName6(AAFwkLogTag tag) inline std::string GetAbbreviatedFileName(const std::string& fileName) { - std::map abbreviatedFileNameMap { + static std::map abbreviatedFileNameMap { { "ability_manager_client", "AMC" }, { "app_running_manager", "ARM" }, { "ability_connect_manager", "ACM" }, diff --git a/test/unittest/ability_manager_service_first_test/BUILD.gn b/test/unittest/ability_manager_service_first_test/BUILD.gn index 73b7da4790c..5059ab254bd 100644 --- a/test/unittest/ability_manager_service_first_test/BUILD.gn +++ b/test/unittest/ability_manager_service_first_test/BUILD.gn @@ -45,7 +45,6 @@ ohos_unittest("ability_manager_service_first_test") { "${ability_runtime_services_path}/abilitymgr/src/utils/window_options_utils.cpp", "ability_manager_service_first_test.cpp", "mock/src/mock_my_flag.cpp", - "mock/src/mock_permission_verification.cpp", ] configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] diff --git a/test/unittest/ability_manager_service_sixth_test/BUILD.gn b/test/unittest/ability_manager_service_sixth_test/BUILD.gn index 6f326eeea24..5f6850cdac9 100644 --- a/test/unittest/ability_manager_service_sixth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_sixth_test/BUILD.gn @@ -51,7 +51,6 @@ ohos_unittest("ability_manager_service_sixth_test") { "ability_manager_service_sixth_test.cpp", "mock/src/mock_my_flag.cpp", "mock/src/mock_parameters.cpp", - "mock/src/mock_permission_verification.cpp", ] configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] -- Gitee From cebeb2c650342cbd1873bc5dce5e27d90105bc82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=A5=E7=BB=B4?= Date: Thu, 11 Sep 2025 23:58:38 +0000 Subject: [PATCH 2/3] update test/unittest/ability_manager_service_sixth_test/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 查维 --- test/unittest/ability_manager_service_sixth_test/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/ability_manager_service_sixth_test/BUILD.gn b/test/unittest/ability_manager_service_sixth_test/BUILD.gn index 5f6850cdac9..50533785b0d 100644 --- a/test/unittest/ability_manager_service_sixth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_sixth_test/BUILD.gn @@ -51,6 +51,7 @@ ohos_unittest("ability_manager_service_sixth_test") { "ability_manager_service_sixth_test.cpp", "mock/src/mock_my_flag.cpp", "mock/src/mock_parameters.cpp", + "mock/src/mock_permission_verification.cpp", ] configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] @@ -72,7 +73,6 @@ ohos_unittest("ability_manager_service_sixth_test") { "${ability_runtime_services_path}/abilitymgr:wantagent_manager", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:event_report", - "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] -- Gitee From db95d5a73a89f7020e443f241672bb9efdd4597e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=A5=E7=BB=B4?= Date: Thu, 11 Sep 2025 23:59:26 +0000 Subject: [PATCH 3/3] update test/unittest/ability_manager_service_first_test/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 查维 --- test/unittest/ability_manager_service_first_test/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/ability_manager_service_first_test/BUILD.gn b/test/unittest/ability_manager_service_first_test/BUILD.gn index 5059ab254bd..6582a8da136 100644 --- a/test/unittest/ability_manager_service_first_test/BUILD.gn +++ b/test/unittest/ability_manager_service_first_test/BUILD.gn @@ -45,6 +45,7 @@ ohos_unittest("ability_manager_service_first_test") { "${ability_runtime_services_path}/abilitymgr/src/utils/window_options_utils.cpp", "ability_manager_service_first_test.cpp", "mock/src/mock_my_flag.cpp", + "mock/src/mock_permission_verification.cpp", ] configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] @@ -57,7 +58,6 @@ ohos_unittest("ability_manager_service_first_test") { "${ability_runtime_native_path}/ability/native:auto_startup_callback", "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", ] -- Gitee