From 684fe3659cba72c555ec7382be728dc782295828 Mon Sep 17 00:00:00 2001 From: zero-cyc Date: Sat, 22 Jan 2022 09:55:57 +0800 Subject: [PATCH] chenlien@huawei.com Signed-off-by: zero-cyc Change-Id: I16944d1959f32e4d567ddb1d649ef64a2ff3cc51 --- frameworks/ans/core/BUILD.gn | 6 +- frameworks/ans/native/BUILD.gn | 5 - .../native/src/notification_action_button.cpp | 2 +- .../ans/native/src/notification_request.cpp | 2 +- .../native/src/notification_user_input.cpp | 2 +- frameworks/ans/native/test/unittest/BUILD.gn | 10 +- frameworks/ans/test/moduletest/BUILD.gn | 71 +----------- frameworks/ans/test/moduletest/mock/blob.cpp | 2 - .../mock/distributed_kv_data_manager.cpp | 3 +- .../moduletest/mock/mock_event_handler.cpp | 1 - frameworks/wantagent/BUILD.gn | 6 +- .../wantagent/src/want_agent_helper.cpp | 2 +- .../completed_dispatcher_test/BUILD.gn | 7 +- .../test/unittest/pending_want_test/BUILD.gn | 3 +- .../test/unittest/trigger_Info_test/BUILD.gn | 7 +- .../unittest/want_agent_helper_test/BUILD.gn | 3 +- .../unittest/want_agent_info_test/BUILD.gn | 7 +- .../test/unittest/want_agent_test/BUILD.gn | 7 +- interfaces/kits/napi/ans/BUILD.gn | 2 +- .../kits/napi/ans/src/reminder/BUILD.gn | 5 +- interfaces/kits/napi/wantagent/BUILD.gn | 6 +- services/ans/BUILD.gn | 17 +-- services/ans/test/unittest/BUILD.gn | 24 +--- services/ans/test/unittest/mock/blob.cpp | 2 - .../mock/distributed_kv_data_manager.cpp | 3 +- .../test/unittest/mock/mock_event_handler.cpp | 1 - services/distributed/BUILD.gn | 1 + services/distributed/test/unittest/BUILD.gn | 19 +-- .../test/unittest/mock/mock_event_handler.cpp | 2 - services/test/moduletest/BUILD.gn | 26 +---- services/test/moduletest/mock/blob.cpp | 2 - .../mock/distributed_kv_data_manager.cpp | 3 +- .../moduletest/mock/mock_event_handler.cpp | 1 - test/common/acts/BUILD.gn | 1 - .../acts/actsnotificationfuzztest/BUILD.gn | 4 +- test/resource/ansSTSlotGroupTest/BUILD.gn | 3 +- test/systemtest/acts/ansDump/BUILD.gn | 1 - tools/dump/BUILD.gn | 9 +- .../dump/include/notification_shell_command.h | 4 +- tools/dump/include/shell_command.h | 59 ++++++++++ tools/dump/src/notification_shell_command.cpp | 2 - tools/dump/src/shell_command.cpp | 109 ++++++++++++++++++ 42 files changed, 229 insertions(+), 223 deletions(-) create mode 100644 tools/dump/include/shell_command.h create mode 100644 tools/dump/src/shell_command.cpp diff --git a/frameworks/ans/core/BUILD.gn b/frameworks/ans/core/BUILD.gn index 346ddd631..8bd4d57f7 100644 --- a/frameworks/ans/core/BUILD.gn +++ b/frameworks/ans/core/BUILD.gn @@ -27,9 +27,6 @@ config("public_ans_core_config") { "${core_path}/include", "${interfaces_path}/innerkits/ans/native/include", "${interfaces_path}/innerkits/wantAgent/include", - "//foundation/aafwk/standard/frameworks/kits/content/cpp/src/ohos/aafwk/content/", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", "//utils/native/base/include", "//third_party/json/single_include", "//third_party/jsoncpp/include", @@ -86,9 +83,7 @@ ohos_shared_library("ans_core") { deps = [ "${frameworks_path}/wantagent:wantagent_innerkits", - "//base/miscservices/time/services:time_service", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", - "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] @@ -101,6 +96,7 @@ ohos_shared_library("ans_core") { "ipc:ipc_core", "multimedia_image_standard:image_native", "samgr_standard:samgr_proxy", + "time_native:time_service", ] part_name = "ans_standard" diff --git a/frameworks/ans/native/BUILD.gn b/frameworks/ans/native/BUILD.gn index 831a1d1f9..df025a7a4 100644 --- a/frameworks/ans/native/BUILD.gn +++ b/frameworks/ans/native/BUILD.gn @@ -25,10 +25,6 @@ config("ans_innerkits_public_config") { "${interfaces_path}/ans/native/include", "${frameworks_path}/ans/core/common/include", "${frameworks_path}/ans/core/include", - "//foundation/aafwk/standard/frameworks/kits/content/cpp/src/ohos/aafwk/content/", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", "//third_party/json/single_include", "//third_party/jsoncpp/include", "//utils/system/safwk/native/include", @@ -39,7 +35,6 @@ config("ans_innerkits_public_config") { ohos_shared_library("ans_innerkits") { include_dirs = [ "${interfaces_path}/ans/native/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", "//utils/system/safwk/native/include", "//third_party/jsoncpp/include", ] diff --git a/frameworks/ans/native/src/notification_action_button.cpp b/frameworks/ans/native/src/notification_action_button.cpp index ebe29e886..b61dbf836 100644 --- a/frameworks/ans/native/src/notification_action_button.cpp +++ b/frameworks/ans/native/src/notification_action_button.cpp @@ -17,8 +17,8 @@ #include "ans_image_util.h" #include "ans_log_wrapper.h" +#include "ohos/aafwk/content/want_params_wrapper.h" #include "want_agent_helper.h" -#include "want_params_wrapper.h" namespace OHOS { namespace Notification { diff --git a/frameworks/ans/native/src/notification_request.cpp b/frameworks/ans/native/src/notification_request.cpp index 463ffe7df..98900bcb1 100644 --- a/frameworks/ans/native/src/notification_request.cpp +++ b/frameworks/ans/native/src/notification_request.cpp @@ -17,8 +17,8 @@ #include "ans_image_util.h" #include "ans_log_wrapper.h" +#include "ohos/aafwk/content/want_params_wrapper.h" #include "want_agent_helper.h" -#include "want_params_wrapper.h" namespace OHOS { namespace Notification { diff --git a/frameworks/ans/native/src/notification_user_input.cpp b/frameworks/ans/native/src/notification_user_input.cpp index 335b87467..337eeb50c 100644 --- a/frameworks/ans/native/src/notification_user_input.cpp +++ b/frameworks/ans/native/src/notification_user_input.cpp @@ -16,7 +16,7 @@ #include "notification_user_input.h" #include "ans_log_wrapper.h" -#include "want_params_wrapper.h" +#include "ohos/aafwk/content/want_params_wrapper.h" namespace OHOS { namespace Notification { diff --git a/frameworks/ans/native/test/unittest/BUILD.gn b/frameworks/ans/native/test/unittest/BUILD.gn index 4ab96c039..4662527a8 100644 --- a/frameworks/ans/native/test/unittest/BUILD.gn +++ b/frameworks/ans/native/test/unittest/BUILD.gn @@ -23,18 +23,10 @@ ohos_unittest("ans_reminder_unit_test") { include_dirs = [ ".", "include", - "//foundation/appexecfwk/standard/libs/libeventhandler/src", "//utils/native/base/include", "//utils/system/safwk/native/include", "/${services_path}/ans/include", "${services_path}/ans/test/unittest/mock/include", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/autils", - "//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/include", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/log", - "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", - "//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/src", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/dfx", - "//developtools/bytrace_standard/interfaces/innerkits/native/include", ] sources = [ @@ -59,7 +51,9 @@ ohos_unittest("ans_reminder_unit_test") { "appexecfwk_standard:appexecfwk_base", "appexecfwk_standard:appexecfwk_core", "appexecfwk_standard:libeventhandler", + "bytrace_standard:bytrace_core", "ces_standard:cesfwk_innerkits", + "distributeddatamgr:distributeddata_inner", "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/frameworks/ans/test/moduletest/BUILD.gn b/frameworks/ans/test/moduletest/BUILD.gn index ee0f7dffb..9c8579d91 100644 --- a/frameworks/ans/test/moduletest/BUILD.gn +++ b/frameworks/ans/test/moduletest/BUILD.gn @@ -22,10 +22,7 @@ config("public_ans_config") { "${core_path}/common/include", "//utils/native/base/include", "${services_path}/ans/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "${core_path}/include", - - #"//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content/", ] } @@ -37,18 +34,11 @@ ohos_moduletest("ans_fw_module_test") { "${interfaces_path}/ans/native/include", "${frameworks_path}/ans/core/common/include", "${frameworks_path}/ans/core/include", - "//foundation/appexecfwk/standard/libs/libeventhandler/src", "//utils/native/base/include", "//utils/system/safwk/native/include", "//base/notification/ans_standard/services/ans/include", "//third_party/json/include", - "//foundation/communication/utils/include", - "//foundation/communication/ipc/ipc/native/src/core/include", - "//foundation/communication/ipc/utils/include", - "//foundation/communication/ipc/ipc/softbus_temp", "//base/notification/ans_standard/interfaces/innerkits/ans/native/test/moduletest/mock/include", - "//foundation/distributedschedule/samgr/services/samgr/native/include", - "//foundation/communication/ipc/interfaces/innerkits/libdbinder/include", "//base/notification/ces_standard/interfaces/innerkits/native/include", "//base/notification/ans_standard/interfaces/innerkits/ans/native/include", "//base/notification/ans_standard/interfaces/innerkits/wantagent/include", @@ -59,9 +49,6 @@ ohos_moduletest("ans_fw_module_test") { "//utils/native/base/include", "//third_party/jsoncpp/include", "//base/notification/ans_standard/frameworks/ans/test/moduletest/mock/include", - "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include/", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/autils/", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/log/", ] sources = [ @@ -98,10 +85,10 @@ ohos_moduletest("ans_fw_module_test") { "ability_runtime:app_manager", "ability_runtime:want", "appexecfwk_standard:appexecfwk_base", - "appexecfwk_standard:appexecfwk_base", "appexecfwk_standard:appexecfwk_core", "appexecfwk_standard:libeventhandler", "ces_standard:cesfwk_innerkits", + "distributeddatamgr:distributeddata_inner", "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", @@ -122,21 +109,11 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "${interfaces_path}/ans/native/include", "${frameworks_path}/ans/core/common/include", "${frameworks_path}/ans/core/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/libs/libeventhandler/src", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//utils/native/base/include", "//utils/system/safwk/native/include", "//base/notification/ans_standard/services/ans/include", "//third_party/json/include", - "//foundation/communication/utils/include", - "//foundation/communication/ipc/ipc/native/src/core/include", - "//foundation/communication/ipc/utils/include", - "//foundation/communication/ipc/ipc/softbus_temp", "//base/notification/ans_standard/interfaces/innerkits/ans/native/test/moduletest/mock/include", - "//foundation/distributedschedule/samgr/services/samgr/native/include", - "//foundation/communication/ipc/interfaces/innerkits/libdbinder/include", "//base/notification/ces_standard/interfaces/innerkits/native/include", "//base/notification/ans_standard/interfaces/innerkits/ans/native/include", "//base/notification/ans_standard/interfaces/innerkits/wantagent/include", @@ -147,14 +124,6 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "//utils/native/base/include", "//third_party/jsoncpp/include", "//base/notification/ans_standard/frameworks/ans/test/moduletest/mock/include", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/autils", - "//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/include", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/log", - "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", - "//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/src", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/dfx", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", - "//developtools/bytrace_standard/interfaces/innerkits/native/include", ] sources = [ @@ -179,7 +148,6 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "${frameworks_path}/ans/native:ans_innerkits", "${frameworks_path}/wantagent:wantagent_innerkits", "${services_path}/ans:libans", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -198,6 +166,7 @@ ohos_moduletest("ans_innerkits_module_publish_test") { "appexecfwk_standard:appexecfwk_core", "appexecfwk_standard:libeventhandler", "ces_standard:cesfwk_innerkits", + "distributeddatamgr:distributeddata_inner", "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", @@ -218,21 +187,11 @@ ohos_moduletest("ans_innerkits_module_slot_test") { "${interfaces_path}/ans/native/include", "${frameworks_path}/ans/core/common/include", "${frameworks_path}/ans/core/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/libs/libeventhandler/src", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//utils/native/base/include", "//utils/system/safwk/native/include", "//base/notification/ans_standard/services/ans/include", "//third_party/json/include", - "//foundation/communication/utils/include", - "//foundation/communication/ipc/ipc/native/src/core/include", - "//foundation/communication/ipc/utils/include", - "//foundation/communication/ipc/ipc/softbus_temp", "//base/notification/ans_standard/interfaces/innerkits/ans/native/test/moduletest/mock/include", - "//foundation/distributedschedule/samgr/services/samgr/native/include", - "//foundation/communication/ipc/interfaces/innerkits/libdbinder/include", "//base/notification/ces_standard/interfaces/innerkits/native/include", "//base/notification/ans_standard/interfaces/innerkits/ans/native/include", "//base/notification/ans_standard/interfaces/innerkits/wantagent/include", @@ -243,13 +202,6 @@ ohos_moduletest("ans_innerkits_module_slot_test") { "//utils/native/base/include", "//third_party/jsoncpp/include", "//base/notification/ans_standard/frameworks/ans/test/moduletest/mock/include", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/autils", - "//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/include", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/log", - "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", - "//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/src", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/dfx", - "//developtools/bytrace_standard/interfaces/innerkits/native/include", ] sources = [ @@ -289,6 +241,7 @@ ohos_moduletest("ans_innerkits_module_slot_test") { "appexecfwk_standard:appexecfwk_core", "appexecfwk_standard:libeventhandler", "ces_standard:cesfwk_innerkits", + "distributeddatamgr:distributeddata_inner", "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", @@ -309,21 +262,11 @@ ohos_moduletest("ans_innerkits_module_setting_test") { "${interfaces_path}/ans/native/include", "${frameworks_path}/ans/core/common/include", "${frameworks_path}/ans/core/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", - "//foundation/appexecfwk/standard/libs/libeventhandler/src", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//utils/native/base/include", "//utils/system/safwk/native/include", "//base/notification/ans_standard/services/ans/include", "//third_party/json/include", - "//foundation/communication/utils/include", - "//foundation/communication/ipc/ipc/native/src/core/include", - "//foundation/communication/ipc/utils/include", - "//foundation/communication/ipc/ipc/softbus_temp", "//base/notification/ans_standard/interfaces/innerkits/ans/native/test/moduletest/mock/include", - "//foundation/distributedschedule/samgr/services/samgr/native/include", - "//foundation/communication/ipc/interfaces/innerkits/libdbinder/include", "//base/notification/ces_standard/interfaces/innerkits/native/include", "//base/notification/ans_standard/interfaces/innerkits/ans/native/include", "//base/notification/ans_standard/interfaces/innerkits/wantagent/include", @@ -334,13 +277,6 @@ ohos_moduletest("ans_innerkits_module_setting_test") { "//utils/native/base/include", "//third_party/jsoncpp/include", "//base/notification/ans_standard/frameworks/ans/test/moduletest/mock/include", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/autils", - "//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/include", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/log", - "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", - "//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/src", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/dfx", - "//developtools/bytrace_standard/interfaces/innerkits/native/include", ] sources = [ @@ -380,6 +316,7 @@ ohos_moduletest("ans_innerkits_module_setting_test") { "appexecfwk_standard:appexecfwk_core", "appexecfwk_standard:libeventhandler", "ces_standard:cesfwk_innerkits", + "distributeddatamgr:distributeddata_inner", "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/frameworks/ans/test/moduletest/mock/blob.cpp b/frameworks/ans/test/moduletest/mock/blob.cpp index 93d2c3470..540888d0f 100644 --- a/frameworks/ans/test/moduletest/mock/blob.cpp +++ b/frameworks/ans/test/moduletest/mock/blob.cpp @@ -17,7 +17,6 @@ #include "blob.h" #include -#include "log_print.h" namespace OHOS { namespace DistributedKv { @@ -111,7 +110,6 @@ bool Blob::Empty() const uint8_t Blob::operator[](size_t n) const { if (n >= Size()) { - ZLOGE("Trying to get a out-of-range Blob member."); return 0; } return blob_[n]; diff --git a/frameworks/ans/test/moduletest/mock/distributed_kv_data_manager.cpp b/frameworks/ans/test/moduletest/mock/distributed_kv_data_manager.cpp index 86852f17a..cc1b371db 100644 --- a/frameworks/ans/test/moduletest/mock/distributed_kv_data_manager.cpp +++ b/frameworks/ans/test/moduletest/mock/distributed_kv_data_manager.cpp @@ -16,7 +16,6 @@ #define LOG_TAG "DistributedKvDataManager" #include "distributed_kv_data_manager.h" -#include "constant.h" #include "mock_single_kv_store.h" #include "types.h" @@ -31,7 +30,7 @@ DistributedKvDataManager::~DistributedKvDataManager() Status DistributedKvDataManager::GetSingleKvStore(const Options &options, const AppId &appId, const StoreId &storeId, std::shared_ptr &kvStore) { - std::string storeIdTmp = Constant::TrimCopy(storeId.storeId); + std::string storeIdTmp = storeId.storeId; kvStore = std::make_shared(); AnsTestSingleKvStore::InsertMockKvStore(appId, storeId, kvStore); return Status::SUCCESS; diff --git a/frameworks/ans/test/moduletest/mock/mock_event_handler.cpp b/frameworks/ans/test/moduletest/mock/mock_event_handler.cpp index bdadec57f..1bdf27e03 100644 --- a/frameworks/ans/test/moduletest/mock/mock_event_handler.cpp +++ b/frameworks/ans/test/moduletest/mock/mock_event_handler.cpp @@ -14,7 +14,6 @@ */ #include "event_handler.h" -#include "event_handler_utils.h" namespace OHOS { namespace AppExecFwk { diff --git a/frameworks/wantagent/BUILD.gn b/frameworks/wantagent/BUILD.gn index 906888f13..ee4c79b1b 100644 --- a/frameworks/wantagent/BUILD.gn +++ b/frameworks/wantagent/BUILD.gn @@ -26,9 +26,6 @@ config("wantagent_innerkits_public_config") { "//base/global/resmgr_standard/interfaces/innerkits/include", "//foundation/aafwk/standard/frameworks/kits/ability/native/include", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include", - "//foundation/aafwk/standard/frameworks/kits/content/cpp/src/ohos/aafwk/content/", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr", @@ -61,7 +58,6 @@ ohos_shared_library("wantagent_innerkits") { public_configs = [ ":wantagent_innerkits_public_config" ] deps = [ - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/services/abilitymgr:abilityms", @@ -70,10 +66,12 @@ ohos_shared_library("wantagent_innerkits") { external_deps = [ "ability_runtime:ability_manager", + "ability_runtime:abilitykit_native", "ability_runtime:app_manager", "ability_runtime:want", "appexecfwk_standard:appexecfwk_base", "appexecfwk_standard:appexecfwk_core", + "appexecfwk_standard:libeventhandler", "ces_standard:cesfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/frameworks/wantagent/src/want_agent_helper.cpp b/frameworks/wantagent/src/want_agent_helper.cpp index 4c6030334..58f13b142 100644 --- a/frameworks/wantagent/src/want_agent_helper.cpp +++ b/frameworks/wantagent/src/want_agent_helper.cpp @@ -17,9 +17,9 @@ #include "ability_manager_client.h" #include "hilog_wrapper.h" +#include "ohos/aafwk/content/want_params_wrapper.h" #include "pending_want.h" #include "want_agent_log_wrapper.h" -#include "want_params_wrapper.h" #include "want_sender_info.h" #include "want_sender_interface.h" diff --git a/frameworks/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn b/frameworks/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn index 45a699277..83587c2b9 100644 --- a/frameworks/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn @@ -19,10 +19,7 @@ module_output_path = "ans_standard/wantagent" ohos_unittest("completed_dispatcher_test") { module_out_path = module_output_path - include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/want/include", - "//foundation/aafwk/standard/services/abilitymgr/include", - ] + include_dirs = [ "//foundation/aafwk/standard/services/abilitymgr/include" ] sources = [ "completed_dispatcher_test.cpp" ] @@ -34,7 +31,6 @@ ohos_unittest("completed_dispatcher_test") { deps = [ "${core_path}:ans_core", "${frameworks_path}/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//third_party/googletest:gmock_main", @@ -44,6 +40,7 @@ ohos_unittest("completed_dispatcher_test") { external_deps = [ "ability_runtime:ability_manager", + "ability_runtime:abilitykit_native", "ability_runtime:app_manager", "ability_runtime:base", "ability_runtime:want", diff --git a/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn b/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn index d32c1281b..6e3099ab1 100644 --- a/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn @@ -20,7 +20,6 @@ module_output_path = "ans_standard/wantagent" ohos_unittest("pending_want_test") { module_out_path = module_output_path include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/want/include", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime", "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", @@ -38,7 +37,6 @@ ohos_unittest("pending_want_test") { deps = [ "${core_path}:ans_core", "${frameworks_path}/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/services/abilitymgr:abilityms", @@ -49,6 +47,7 @@ ohos_unittest("pending_want_test") { external_deps = [ "ability_runtime:ability_manager", + "ability_runtime:abilitykit_native", "ability_runtime:app_manager", "ability_runtime:base", "ability_runtime:want", diff --git a/frameworks/wantagent/test/unittest/trigger_Info_test/BUILD.gn b/frameworks/wantagent/test/unittest/trigger_Info_test/BUILD.gn index 7e5420aeb..c1f05358a 100644 --- a/frameworks/wantagent/test/unittest/trigger_Info_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/trigger_Info_test/BUILD.gn @@ -19,10 +19,7 @@ module_output_path = "ans_standard/wantagent" ohos_unittest("trigger_Info_test") { module_out_path = module_output_path - include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/want/include", - "//foundation/aafwk/standard/services/abilitymgr/include", - ] + include_dirs = [ "//foundation/aafwk/standard/services/abilitymgr/include" ] sources = [ "trigger_Info_test.cpp" ] @@ -34,7 +31,6 @@ ohos_unittest("trigger_Info_test") { deps = [ "${core_path}:ans_core", "${frameworks_path}/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//third_party/googletest:gmock_main", @@ -44,6 +40,7 @@ ohos_unittest("trigger_Info_test") { external_deps = [ "ability_runtime:ability_manager", + "ability_runtime:abilitykit_native", "ability_runtime:app_manager", "ability_runtime:base", "ability_runtime:want", diff --git a/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn b/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn index 3c9a82961..42ebaf1f4 100644 --- a/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn @@ -21,7 +21,6 @@ ohos_unittest("want_agent_helper_test") { module_out_path = module_output_path include_dirs = [ "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime", - "//foundation/aafwk/standard/interfaces/innerkits/want/include", "//foundation/aafwk/standard/services/abilitymgr/include", ] @@ -35,7 +34,6 @@ ohos_unittest("want_agent_helper_test") { deps = [ "${core_path}:ans_core", "${frameworks_path}/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/services/abilitymgr:abilityms", @@ -46,6 +44,7 @@ ohos_unittest("want_agent_helper_test") { external_deps = [ "ability_runtime:ability_manager", + "ability_runtime:abilitykit_native", "ability_runtime:app_manager", "ability_runtime:base", "ability_runtime:want", diff --git a/frameworks/wantagent/test/unittest/want_agent_info_test/BUILD.gn b/frameworks/wantagent/test/unittest/want_agent_info_test/BUILD.gn index 505288814..7d29fdf0e 100644 --- a/frameworks/wantagent/test/unittest/want_agent_info_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/want_agent_info_test/BUILD.gn @@ -19,10 +19,7 @@ module_output_path = "ans_standard/wantagent" ohos_unittest("want_agent_info_test") { module_out_path = module_output_path - include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/want/include", - "//foundation/aafwk/standard/services/abilitymgr/include", - ] + include_dirs = [ "//foundation/aafwk/standard/services/abilitymgr/include" ] sources = [ "want_agent_info_test.cpp" ] @@ -34,7 +31,6 @@ ohos_unittest("want_agent_info_test") { deps = [ "${core_path}:ans_core", "${frameworks_path}/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//third_party/googletest:gmock_main", @@ -44,6 +40,7 @@ ohos_unittest("want_agent_info_test") { external_deps = [ "ability_runtime:ability_manager", + "ability_runtime:abilitykit_native", "ability_runtime:app_manager", "ability_runtime:base", "ability_runtime:want", diff --git a/frameworks/wantagent/test/unittest/want_agent_test/BUILD.gn b/frameworks/wantagent/test/unittest/want_agent_test/BUILD.gn index c7e09ce38..c08997e88 100644 --- a/frameworks/wantagent/test/unittest/want_agent_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/want_agent_test/BUILD.gn @@ -19,10 +19,7 @@ module_output_path = "ans_standard/wantagent" ohos_unittest("want_agent_test") { module_out_path = module_output_path - include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/want/include", - "//foundation/aafwk/standard/services/abilitymgr/include", - ] + include_dirs = [ "//foundation/aafwk/standard/services/abilitymgr/include" ] sources = [ "want_agent_test.cpp" ] @@ -34,7 +31,6 @@ ohos_unittest("want_agent_test") { deps = [ "${core_path}:ans_core", "${frameworks_path}/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//third_party/googletest:gmock_main", @@ -44,6 +40,7 @@ ohos_unittest("want_agent_test") { external_deps = [ "ability_runtime:ability_manager", + "ability_runtime:abilitykit_native", "ability_runtime:app_manager", "ability_runtime:base", "ability_runtime:want", diff --git a/interfaces/kits/napi/ans/BUILD.gn b/interfaces/kits/napi/ans/BUILD.gn index 5ec86aa4a..97c13373e 100644 --- a/interfaces/kits/napi/ans/BUILD.gn +++ b/interfaces/kits/napi/ans/BUILD.gn @@ -67,7 +67,6 @@ ohos_shared_library("notification") { "${frameworks_path}/ans/core:ans_core", "${frameworks_path}/ans/native:ans_innerkits", "${frameworks_path}/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", "//foundation/multimedia/image_standard/interfaces/innerkits:image", "//third_party/jsoncpp:jsoncpp", @@ -76,6 +75,7 @@ ohos_shared_library("notification") { ] external_deps = [ + "ability_runtime:abilitykit_native", "ability_runtime:base", "ability_runtime:want", "appexecfwk_standard:appexecfwk_base", diff --git a/interfaces/kits/napi/ans/src/reminder/BUILD.gn b/interfaces/kits/napi/ans/src/reminder/BUILD.gn index cc01c0760..b51f48bb2 100644 --- a/interfaces/kits/napi/ans/src/reminder/BUILD.gn +++ b/interfaces/kits/napi/ans/src/reminder/BUILD.gn @@ -35,7 +35,6 @@ ohos_shared_library("reminderagent") { include_dirs = [ "//foundation/aafwk/standard/frameworks/kits/ability/native/include", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common", - "//foundation/ace/napi/interfaces/kits/napi", "//foundation/multimedia/image_standard/interfaces/kits/js/common/include/", "../../include", "//third_party/node/src", @@ -57,9 +56,7 @@ ohos_shared_library("reminderagent") { "${frameworks_path}/ans/core:ans_core", "${frameworks_path}/ans/native:ans_innerkits", "${frameworks_path}/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", - "//foundation/ace/napi:ace_napi", "//foundation/multimedia/image_standard/interfaces/innerkits:image", "//third_party/jsoncpp:jsoncpp", "//third_party/libuv:uv_static", @@ -67,11 +64,13 @@ ohos_shared_library("reminderagent") { ] external_deps = [ + "ability_runtime:abilitykit_native", "ability_runtime:want", "appexecfwk_standard:appexecfwk_base", "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "napi:ace_napi", ] relative_install_dir = "module" diff --git a/interfaces/kits/napi/wantagent/BUILD.gn b/interfaces/kits/napi/wantagent/BUILD.gn index aa6721afb..c8671f52d 100644 --- a/interfaces/kits/napi/wantagent/BUILD.gn +++ b/interfaces/kits/napi/wantagent/BUILD.gn @@ -16,7 +16,6 @@ import("//build/ohos.gni") ohos_shared_library("wantagent") { include_dirs = [ - "//foundation/ace/napi/interfaces/kits", "//third_party/node/src", "//foundation/aafwk/standard/services/common/include", "//utils/system/safwk/native/include", @@ -36,17 +35,14 @@ ohos_shared_library("wantagent") { deps = [ "${frameworks_path}/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/appkit:app_context", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common", - "//foundation/ace/napi:ace_napi", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", ] external_deps = [ + "ability_runtime:abilitykit_native", "ability_runtime:app_manager", "ability_runtime:want", "appexecfwk_standard:appexecfwk_base", diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn index a3de29582..c8d570535 100644 --- a/services/ans/BUILD.gn +++ b/services/ans/BUILD.gn @@ -19,14 +19,7 @@ group("ans_targets") { } config("public_ans_config") { - include_dirs = [ - "${services_path}/ans/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//base/account/os_account/interfaces/innerkits/osaccount/native/include", - "//base/account/os_account/frameworks/common/database/include/", - "//base/account/os_account/frameworks/common/account_error/include", - "//base/account/os_account/frameworks/common/log/include", - ] + include_dirs = [ "${services_path}/ans/include" ] defines = [ "APP_LOG_TAG = \"Ans\"", "LOG_DOMAIN = 0xD002200", @@ -63,11 +56,6 @@ ohos_shared_library("libans") { "${core_path}:ans_core", "${frameworks_path}/ans/native:ans_innerkits", "${frameworks_path}/wantagent:wantagent_innerkits", - "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//base/miscservices/time/services:time_service", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr", "//utils/native/base:utils", ] @@ -82,8 +70,11 @@ ohos_shared_library("libans") { } external_deps = [ + "ability_runtime:abilitykit_native", "distributeddatamgr:distributeddata_inner", "multimedia_image_standard:image_native", + "os_account_standard:os_account_innerkits", + "time_native:time_service", ] external_deps += ans_standard_external_deps diff --git a/services/ans/test/unittest/BUILD.gn b/services/ans/test/unittest/BUILD.gn index 85e1aa696..46202d3d4 100644 --- a/services/ans/test/unittest/BUILD.gn +++ b/services/ans/test/unittest/BUILD.gn @@ -22,25 +22,10 @@ ohos_unittest("ans_unit_test") { include_dirs = [ ".", "include", - "//base/miscservices/time/interfaces/innerkits/include", - "//base/miscservices/time/services/time_manager/include", - "//base/miscservices/time/utils/native/include", - "//foundation/appexecfwk/standard/libs/libeventhandler/src", "//utils/native/base/include", "//utils/system/safwk/native/include", "/${services_path}/ans/include", "${services_path}/ans/test/unittest/mock/include", - "//base/account/os_account/interfaces/innerkits/osaccount/native/include", - "//base/account/os_account/frameworks/common/database/include/", - "//base/account/os_account/frameworks/common/account_error/include", - "//base/account/os_account/frameworks/common/log/include", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/autils", - "//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/include", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/log", - "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", - "//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/src", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/dfx", - "//developtools/bytrace_standard/interfaces/innerkits/native/include", ] defines = [] @@ -79,11 +64,6 @@ ohos_unittest("ans_unit_test") { "${core_path}:ans_core", "${frameworks_path}/ans/native:ans_innerkits", "${frameworks_path}/wantagent:wantagent_innerkits", - "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//base/miscservices/time/services:time_service", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner", - "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -95,19 +75,23 @@ ohos_unittest("ans_unit_test") { } external_deps = [ + "ability_runtime:abilitykit_native", "ability_runtime:app_manager", "ability_runtime:want", "appexecfwk_standard:appexecfwk_base", "appexecfwk_standard:appexecfwk_core", "appexecfwk_standard:libeventhandler", "ces_standard:cesfwk_innerkits", + "distributeddatamgr:distributeddata_inner", "dmsfwk_standard:zuri", "hitrace_native:libhitrace", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "multimedia_image_standard:image_native", + "os_account_standard:os_account_innerkits", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "time_native:time_service", ] subsystem_name = "notification" diff --git a/services/ans/test/unittest/mock/blob.cpp b/services/ans/test/unittest/mock/blob.cpp index 93d2c3470..540888d0f 100644 --- a/services/ans/test/unittest/mock/blob.cpp +++ b/services/ans/test/unittest/mock/blob.cpp @@ -17,7 +17,6 @@ #include "blob.h" #include -#include "log_print.h" namespace OHOS { namespace DistributedKv { @@ -111,7 +110,6 @@ bool Blob::Empty() const uint8_t Blob::operator[](size_t n) const { if (n >= Size()) { - ZLOGE("Trying to get a out-of-range Blob member."); return 0; } return blob_[n]; diff --git a/services/ans/test/unittest/mock/distributed_kv_data_manager.cpp b/services/ans/test/unittest/mock/distributed_kv_data_manager.cpp index a22302341..8e348f6da 100644 --- a/services/ans/test/unittest/mock/distributed_kv_data_manager.cpp +++ b/services/ans/test/unittest/mock/distributed_kv_data_manager.cpp @@ -16,7 +16,6 @@ #define LOG_TAG "DistributedKvDataManager" #include "distributed_kv_data_manager.h" -#include "constant.h" #include "mock_single_kv_store.h" #include "types.h" @@ -31,7 +30,7 @@ DistributedKvDataManager::~DistributedKvDataManager() Status DistributedKvDataManager::GetSingleKvStore(const Options &options, const AppId &appId, const StoreId &storeId, std::shared_ptr &kvStore) { - std::string storeIdTmp = Constant::TrimCopy(storeId.storeId); + std::string storeIdTmp = storeId.storeId; kvStore = std::make_shared(); return Status::SUCCESS; } diff --git a/services/ans/test/unittest/mock/mock_event_handler.cpp b/services/ans/test/unittest/mock/mock_event_handler.cpp index bdadec57f..1bdf27e03 100644 --- a/services/ans/test/unittest/mock/mock_event_handler.cpp +++ b/services/ans/test/unittest/mock/mock_event_handler.cpp @@ -14,7 +14,6 @@ */ #include "event_handler.h" -#include "event_handler_utils.h" namespace OHOS { namespace AppExecFwk { diff --git a/services/distributed/BUILD.gn b/services/distributed/BUILD.gn index d826ffb49..43dd48487 100644 --- a/services/distributed/BUILD.gn +++ b/services/distributed/BUILD.gn @@ -51,6 +51,7 @@ ohos_shared_library("libans_distributed") { "dmsfwk_standard:zuri", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimedia_image_standard:image_native", "utils_base:utils", ] diff --git a/services/distributed/test/unittest/BUILD.gn b/services/distributed/test/unittest/BUILD.gn index 5cdcfe733..347c7abeb 100644 --- a/services/distributed/test/unittest/BUILD.gn +++ b/services/distributed/test/unittest/BUILD.gn @@ -28,14 +28,6 @@ ohos_unittest("ans_distributed_unit_test") { module_out_path = "ans_standard/unittest" include_dirs = [ "/${services_path}/distributed/include", - "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", - "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include", - "//foundation/aafwk/standard/interfaces/innerkits/base/include", - "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", - "//foundation/appexecfwk/standard/libs/libeventhandler/src", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", - "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", "//utils/native/base/include", ] @@ -74,7 +66,16 @@ ohos_unittest("ans_distributed_unit_test") { "//utils/native/base:utils", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "ability_runtime:base", + "ability_runtime:want", + "appexecfwk_standard:appexecfwk_base", + "distributeddatamgr:distributeddata_inner", + "hitrace_native:libhitrace", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + "multimedia_image_standard:image_native", + ] subsystem_name = "notification" part_name = "ans_standard" diff --git a/services/distributed/test/unittest/mock/mock_event_handler.cpp b/services/distributed/test/unittest/mock/mock_event_handler.cpp index 1dff51f9e..e317c0c54 100644 --- a/services/distributed/test/unittest/mock/mock_event_handler.cpp +++ b/services/distributed/test/unittest/mock/mock_event_handler.cpp @@ -15,8 +15,6 @@ #include "event_handler.h" -#include "event_handler_utils.h" - namespace OHOS { namespace AppExecFwk { std::shared_ptr EventHandler::Current() diff --git a/services/test/moduletest/BUILD.gn b/services/test/moduletest/BUILD.gn index 4e3900a93..a3567518a 100644 --- a/services/test/moduletest/BUILD.gn +++ b/services/test/moduletest/BUILD.gn @@ -21,23 +21,10 @@ ohos_moduletest("ans_module_test") { module_out_path = module_output_path include_dirs = [ "include", - "//base/miscservices/time/interfaces/innerkits/include", - "//foundation/appexecfwk/standard/libs/libeventhandler/src", "//utils/native/base/include", "//utils/system/safwk/native/include", "${services_path}/ans/include", "${services_path}/test/moduletest/mock/include", - "//base/account/os_account/interfaces/innerkits/osaccount/native/include", - "//base/account/os_account/frameworks/common/database/include/", - "//base/account/os_account/frameworks/common/account_error/include", - "//base/account/os_account/frameworks/common/log/include", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/autils", - "//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/include", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/log", - "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include", - "//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/src", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/include/dfx", - "//developtools/bytrace_standard/interfaces/innerkits/native/include", ] sources = [ @@ -54,8 +41,6 @@ ohos_moduletest("ans_module_test") { "${services_path}/ans/src/reminder_event_manager.cpp", "${services_path}/ans/src/reminder_timer_info.cpp", "${services_path}/ans/src/system_event_observer.cpp", - "//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_snapshot.cpp", - "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/adapter/autils/src/constant.cpp", "ans_module_test.cpp", "mock/blob.cpp", "mock/distributed_kv_data_manager.cpp", @@ -72,31 +57,28 @@ ohos_moduletest("ans_module_test") { "${core_path}:ans_core", "${frameworks_path}/ans/native:ans_innerkits", "${frameworks_path}/wantagent:wantagent_innerkits", - "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", - "//base/miscservices/time/services:time_service", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", - "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner", - "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr", - "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] external_deps = [ + "ability_runtime:abilitykit_native", "ability_runtime:app_manager", "ability_runtime:want", "appexecfwk_standard:appexecfwk_base", "appexecfwk_standard:appexecfwk_core", "appexecfwk_standard:libeventhandler", "ces_standard:cesfwk_innerkits", + "distributeddatamgr:distributeddata_inner", "dmsfwk_standard:zuri", "hitrace_native:libhitrace", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "multimedia_image_standard:image_native", + "os_account_standard:os_account_innerkits", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", + "time_native:time_service", ] subsystem_name = "notification" diff --git a/services/test/moduletest/mock/blob.cpp b/services/test/moduletest/mock/blob.cpp index 93d2c3470..540888d0f 100644 --- a/services/test/moduletest/mock/blob.cpp +++ b/services/test/moduletest/mock/blob.cpp @@ -17,7 +17,6 @@ #include "blob.h" #include -#include "log_print.h" namespace OHOS { namespace DistributedKv { @@ -111,7 +110,6 @@ bool Blob::Empty() const uint8_t Blob::operator[](size_t n) const { if (n >= Size()) { - ZLOGE("Trying to get a out-of-range Blob member."); return 0; } return blob_[n]; diff --git a/services/test/moduletest/mock/distributed_kv_data_manager.cpp b/services/test/moduletest/mock/distributed_kv_data_manager.cpp index a22302341..8e348f6da 100644 --- a/services/test/moduletest/mock/distributed_kv_data_manager.cpp +++ b/services/test/moduletest/mock/distributed_kv_data_manager.cpp @@ -16,7 +16,6 @@ #define LOG_TAG "DistributedKvDataManager" #include "distributed_kv_data_manager.h" -#include "constant.h" #include "mock_single_kv_store.h" #include "types.h" @@ -31,7 +30,7 @@ DistributedKvDataManager::~DistributedKvDataManager() Status DistributedKvDataManager::GetSingleKvStore(const Options &options, const AppId &appId, const StoreId &storeId, std::shared_ptr &kvStore) { - std::string storeIdTmp = Constant::TrimCopy(storeId.storeId); + std::string storeIdTmp = storeId.storeId; kvStore = std::make_shared(); return Status::SUCCESS; } diff --git a/services/test/moduletest/mock/mock_event_handler.cpp b/services/test/moduletest/mock/mock_event_handler.cpp index bdadec57f..1bdf27e03 100644 --- a/services/test/moduletest/mock/mock_event_handler.cpp +++ b/services/test/moduletest/mock/mock_event_handler.cpp @@ -14,7 +14,6 @@ */ #include "event_handler.h" -#include "event_handler_utils.h" namespace OHOS { namespace AppExecFwk { diff --git a/test/common/acts/BUILD.gn b/test/common/acts/BUILD.gn index d93e92f64..190963cd3 100644 --- a/test/common/acts/BUILD.gn +++ b/test/common/acts/BUILD.gn @@ -23,7 +23,6 @@ config("ansfwk_kits_test_config") { "//foundation/appexecfwk/standard/services/bundlemgr/include", "//utils/system/safwk/native/include", "${services_path}/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", "//foundation/distributedschedule/safwk/services/safwk/include", ] diff --git a/test/common/acts/actsnotificationfuzztest/BUILD.gn b/test/common/acts/actsnotificationfuzztest/BUILD.gn index 439047e4b..218219a34 100644 --- a/test/common/acts/actsnotificationfuzztest/BUILD.gn +++ b/test/common/acts/actsnotificationfuzztest/BUILD.gn @@ -31,7 +31,6 @@ ohos_systemtest("ActsNotificationFuzzTest") { include_dirs = [ "//utils/native/base/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", "//base/notification/ans_standard/frameworks/ans/core/include", "//base/notification/ans_standard/interfaces/innerkits/ans/native/include", "//base/notification/ans_standard/services/ans/include", @@ -39,7 +38,6 @@ ohos_systemtest("ActsNotificationFuzzTest") { "//foundation/appexecfwk/standard/kits/appkit/native/app/include", "//foundation/appexecfwk/adapter/interfaces/innerkits/appexecfwk_base/include", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", "//foundation/aafwk/standard/frameworks/kits/ability/native/include", "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include", @@ -64,7 +62,6 @@ ohos_systemtest("ActsNotificationFuzzTest") { "//base/notification/ces_standard/frameworks/common:libevent_common", "//base/notification/ces_standard/frameworks/native:cesfwk_innerkits", "//foundation/aafwk/standard/common/task_dispatcher:appkit_dispatcher_td", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client", @@ -78,6 +75,7 @@ ohos_systemtest("ActsNotificationFuzzTest") { ] external_deps = [ "ability_runtime:ability_manager", + "ability_runtime:abilitykit_native", "ability_runtime:app_manager", "ability_runtime:base", "ability_runtime:want", diff --git a/test/resource/ansSTSlotGroupTest/BUILD.gn b/test/resource/ansSTSlotGroupTest/BUILD.gn index ecb1808f9..2090014d3 100644 --- a/test/resource/ansSTSlotGroupTest/BUILD.gn +++ b/test/resource/ansSTSlotGroupTest/BUILD.gn @@ -27,7 +27,6 @@ config("ansSTSlotGroupTestConfig") { include_dirs = [ "${SUBDEMOSYSTEM_DIR}/include", "//foundation/aafwk/standard/frameworks/kits/appkit/native/app", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", "//foundation/appexecfwk/standard/services/bundlemgr/include", "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", @@ -50,7 +49,6 @@ ohos_shared_library("libraryAnsSTSlotGroupTest") { "${core_path}:ans_core", "${frameworks_path}/ans/native:ans_innerkits", "${frameworks_path}/wantagent:wantagent_innerkits", - "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native", "//foundation/appexecfwk/standard/common:libappexecfwk_common", "//foundation/appexecfwk/standard/services/bundlemgr:libbms", @@ -58,6 +56,7 @@ ohos_shared_library("libraryAnsSTSlotGroupTest") { ] external_deps = [ + "ability_runtime:abilitykit_native", "ability_runtime:app_manager", "ability_runtime:want", "appexecfwk_standard:appexecfwk_base", diff --git a/test/systemtest/acts/ansDump/BUILD.gn b/test/systemtest/acts/ansDump/BUILD.gn index 67130ba96..1a039aab3 100644 --- a/test/systemtest/acts/ansDump/BUILD.gn +++ b/test/systemtest/acts/ansDump/BUILD.gn @@ -21,7 +21,6 @@ ohos_systemtest("AnsDumpTest") { sources = [ "ansDumpTest.cpp" ] include_dirs = [ - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content", "//third_party/json/single_include", "//utils/native/base/include", "//utils/system/safwk/native/include", diff --git a/tools/dump/BUILD.gn b/tools/dump/BUILD.gn index f10cb9a18..45d2a10bb 100644 --- a/tools/dump/BUILD.gn +++ b/tools/dump/BUILD.gn @@ -22,9 +22,9 @@ ohos_executable("anm") { include_dirs = [ "${tools_path}/dump/include" ] sources = [ - "${aafwk_path}/tools/aa/src/shell_command.cpp", "src/main.cpp", "src/notification_shell_command.cpp", + "src/shell_command.cpp", ] cflags = [] @@ -40,8 +40,6 @@ ohos_executable("anm") { configs = [ "${core_path}:public_ans_core_config", "${frameworks_path}/wantagent:wantagent_innerkits_public_config", - "${aafwk_path}/tools/aa:ability_command_config", - "${aafwk_path}/services/common:common_config", ] defines = [] @@ -49,7 +47,10 @@ ohos_executable("anm") { defines += [ "DISTRIBUTED_NOTIFICATION_SUPPORTED" ] } - external_deps = [] + external_deps = [ + "hiviewdfx_hilog_native:libhilog", + "multimedia_image_standard:image_native", + ] external_deps += ans_standard_external_deps install_enable = true diff --git a/tools/dump/include/notification_shell_command.h b/tools/dump/include/notification_shell_command.h index 4644b7926..bede4da7e 100644 --- a/tools/dump/include/notification_shell_command.h +++ b/tools/dump/include/notification_shell_command.h @@ -17,13 +17,11 @@ #define BASE_NOTIFICATION_ANS_STANDARD_TOOLS_DUMP_INCLUDE_NOTIFICATION_SHELL_COMMAND_H #include "shell_command.h" - -#include "ans_manager_interface.h" #include "ans_notification.h" namespace OHOS { namespace Notification { -class NotificationShellCommand : public OHOS::AAFwk::ShellCommand { +class NotificationShellCommand : public OHOS::Notification::ShellCommand { public: NotificationShellCommand(int argc, char *argv[]); ~NotificationShellCommand() override {}; diff --git a/tools/dump/include/shell_command.h b/tools/dump/include/shell_command.h new file mode 100644 index 000000000..00c14fdbe --- /dev/null +++ b/tools/dump/include/shell_command.h @@ -0,0 +1,59 @@ +/* + * Copyright (c) 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef BASE_NOTIFICATION_ANS_STANDARD_TOOLS_DUMP_INCLUDE_SHELL_COMMAND_H +#define BASE_NOTIFICATION_ANS_STANDARD_TOOLS_DUMP_INCLUDE_SHELL_COMMAND_H + +#include +#include +#include +#include + +#include "utils/native/base/include/errors.h" + +namespace OHOS { +namespace Notification { +class ShellCommand { +public: + ShellCommand(int argc, char *argv[], std::string name); + virtual ~ShellCommand(); + + ErrCode OnCommand(); + std::string ExecCommand(); + std::string GetCommandErrorMsg() const; + std::string GetUnknownOptionMsg(std::string &unknownOption) const; + std::string GetMessageFromCode(const int32_t code) const; + + virtual ErrCode CreateCommandMap() = 0; + virtual ErrCode CreateMessageMap() = 0; + virtual ErrCode init() = 0; + +protected: + static constexpr int MIN_ARGUMENT_NUMBER = 2; + + int argc_; + char **argv_; + + std::string cmd_; + std::vector argList_; + std::string name_; + std::map> commandMap_; + std::map messageMap_; + std::string resultReceiver_ = ""; +}; +} // namespace Notification +} // namespace OHOS + +#endif // BASE_NOTIFICATION_ANS_STANDARD_TOOLS_DUMP_INCLUDE_SHELL_COMMAND_H \ No newline at end of file diff --git a/tools/dump/src/notification_shell_command.cpp b/tools/dump/src/notification_shell_command.cpp index d796c3813..2d44785e7 100644 --- a/tools/dump/src/notification_shell_command.cpp +++ b/tools/dump/src/notification_shell_command.cpp @@ -19,9 +19,7 @@ #include #include "ans_inner_errors.h" -#include "iservice_registry.h" #include "singleton.h" -#include "system_ability_definition.h" namespace OHOS { namespace Notification { diff --git a/tools/dump/src/shell_command.cpp b/tools/dump/src/shell_command.cpp new file mode 100644 index 000000000..215018965 --- /dev/null +++ b/tools/dump/src/shell_command.cpp @@ -0,0 +1,109 @@ +/* + * Copyright (c) 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "shell_command.h" + +#include +#include "ans_log_wrapper.h" + +namespace OHOS { +namespace Notification { +ShellCommand::ShellCommand(int argc, char *argv[], std::string name) +{ + opterr = 0; + argc_ = argc; + argv_ = argv; + name_ = name; + if (argc < MIN_ARGUMENT_NUMBER) { + cmd_ = "help"; + return; + } + cmd_ = argv[1]; + for (int i = 2; i < argc; i++) { + argList_.push_back(argv[i]); + } +} + +ShellCommand::~ShellCommand() +{} + +ErrCode ShellCommand::OnCommand() +{ + int result = OHOS::ERR_OK; + auto respond = commandMap_[cmd_]; + if (respond == nullptr) { + resultReceiver_.append(GetCommandErrorMsg()); + respond = commandMap_["help"]; + } + if (init() == OHOS::ERR_OK) { + respond(); + } else { + result = OHOS::ERR_INVALID_VALUE; + } + return result; +} + +std::string ShellCommand::ExecCommand() +{ + int result = CreateCommandMap(); + if (result != OHOS::ERR_OK) { + ANS_LOGE("failed to create command map.\n"); + } + result = CreateMessageMap(); + if (result != OHOS::ERR_OK) { + ANS_LOGE("failed to create message map.\n"); + } + result = OnCommand(); + if (result != OHOS::ERR_OK) { + ANS_LOGE("failed to execute your command.\n"); + resultReceiver_ = "error: failed to execute your command.\n"; + } + return resultReceiver_; +} + +std::string ShellCommand::GetCommandErrorMsg() const +{ + std::string commandErrorMsg = + name_ + ": '" + cmd_ + "' is not a valid " + name_ + " command. See '" + name_ + " help'.\n"; + return commandErrorMsg; +} + +std::string ShellCommand::GetUnknownOptionMsg(std::string &unknownOption) const +{ + std::string result = ""; + if (optind < 0 || optind > argc_) { + return result; + } + result.append("error: unknown option"); + result.append(".\n"); + return result; +} + +std::string ShellCommand::GetMessageFromCode(const int32_t code) const +{ + ANS_LOGI("[%{public}s(%{public}s)] enter", __FILE__, __FUNCTION__); + ANS_LOGI("code = %{public}d", code); + std::string result = ""; + if (messageMap_.find(code) != messageMap_.end()) { + std::string message = messageMap_.at(code); + if (message.size() != 0) { + result.append(message + "\n"); + } + } + ANS_LOGI("result = %{public}s", result.c_str()); + return result; +} +} // namespace Notification +} // namespace OHOS \ No newline at end of file -- Gitee