部件规范整改

Signed-off-by: zhanghuiyu<zhanghuiyu9@huawei.com>
This commit is contained in:
“z30030935” 2023-04-28 15:33:58 +08:00
parent 310b959bae
commit ff09078658
30 changed files with 688 additions and 553 deletions

View File

@ -11,8 +11,11 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
ability_base_path = "//foundation/ability/ability_base" ability_base_path = "../../ability/ability_base"
ability_runtime_path = "//foundation/ability/ability_runtime" ability_out_base_path = "../../../base"
ability_json_path = "../../../third_party"
ability_foundation_path = "../../../foundation"
ability_runtime_path = "../../ability/ability_runtime"
ability_runtime_inner_api_path = "${ability_runtime_path}/interfaces/inner_api" ability_runtime_inner_api_path = "${ability_runtime_path}/interfaces/inner_api"
ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits" ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits"
ability_runtime_services_path = "${ability_runtime_path}/services" ability_runtime_services_path = "${ability_runtime_path}/services"

View File

@ -1,7 +1,7 @@
{ {
"name": "@openharmony/accessibility", "name": "@ohsh/accessibility",
"description": "The accessibility framework provides a standard mechanism for exchanging information between applications and assistive applications.", "description": "The accessibility framework provides a standard mechanism for exchanging information between applications and assistive applications.",
"version": "3.1.0", "version": "4.0",
"repository": "", "repository": "",
"license": "Apache License 2.0", "license": "Apache License 2.0",
"publishAs": "code-segment", "publishAs": "code-segment",
@ -66,7 +66,7 @@
"//foundation/barrierfree/accessibility/services/etc:ohos.para.dac" "//foundation/barrierfree/accessibility/services/etc:ohos.para.dac"
] ]
}, },
"inner_kits": [ "inner_api": [
{ {
"type": "so", "type": "so",
"name": "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability", "name": "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability",

View File

@ -18,7 +18,7 @@ config("accessibility_interface_private_config") {
include_dirs = [ include_dirs = [
"include/parcel", "include/parcel",
"//foundation/barrierfree/accessibility/common/log/include", "../log/include",
] ]
defines = [ defines = [
@ -34,7 +34,7 @@ config("accessibility_interface_private_config") {
config("accessibility_interface_public_config") { config("accessibility_interface_public_config") {
include_dirs = [ include_dirs = [
"include", "include",
"//foundation/multimodalinput/input/interfaces/native/innerkits/event/include", "../../../../multimodalinput/input/interfaces/native/innerkits/event/include",
] ]
} }
@ -73,12 +73,12 @@ ohos_shared_library("accessibility_interface") {
sources += accessibility_data_parcel_src sources += accessibility_data_parcel_src
configs = [ configs = [
":accessibility_interface_private_config", ":accessibility_interface_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../resources/config/build:coverage_flags",
] ]
public_configs = [ ":accessibility_interface_public_config" ] public_configs = [ ":accessibility_interface_public_config" ]
deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ] deps = [ "../../interfaces/innerkits/common:accessibility_common" ]
external_deps = [ external_deps = [
"access_token:libaccesstoken_sdk", "access_token:libaccesstoken_sdk",

View File

@ -12,14 +12,14 @@
# limitations under the License. # limitations under the License.
import("//build/test.gni") import("//build/test.gni")
import("//foundation/barrierfree/accessibility/services/test/aamstestmock.gni") import("../../../services/test/aamstestmock.gni")
module_output_path = "accessibility/framework_test" module_output_path = "accessibility/framework_test"
############################################################################### ###############################################################################
config("module_private_config") { config("module_private_config") {
visibility = [ ":*" ] visibility = [ ":*" ]
visibility += [ "//foundation/arkui/ace_engine/frameworks/core/components_ng/test/pattern/ability_component:ability_component_pattern_test_ng" ] visibility += [ "../../../../../arkui/ace_engine/frameworks/core/components_ng/test/pattern/ability_component:ability_component_pattern_test_ng" ]
cflags = [] cflags = []
if (target_cpu == "arm") { if (target_cpu == "arm") {
cflags += [ "-DBINDER_IPC_32BIT" ] cflags += [ "-DBINDER_IPC_32BIT" ]
@ -27,45 +27,23 @@ config("module_private_config") {
include_dirs = aams_mock_include_dirs include_dirs = aams_mock_include_dirs
include_dirs += [ include_dirs += [
"${ability_runtime_inner_api_path}/ability_manager/include", "${ability_runtime_inner_api_path}/ability_manager/include",
"//foundation/barrierfree/accessibility/common/log/include", "../../../common/log/include",
"//foundation/barrierfree/accessibility/frameworks/aafwk/include", "../include",
"//foundation/barrierfree/accessibility/frameworks/aafwk/test/mock/include", "./mock/include",
"//foundation/barrierfree/accessibility/frameworks/acfwk/include", "../../acfwk/include",
"//foundation/barrierfree/accessibility/frameworks/asacfwk/include", "../../asacfwk/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk/include", "../../../interfaces/innerkits/aafwk/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk/include", "../../../interfaces/innerkits/acfwk/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk/include", "../../../interfaces/innerkits/asacfwk/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common/include", "../../../interfaces/innerkits/common/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common/include", "../../../services/aams/include",
"//foundation/barrierfree/accessibility/services/aams/include", "../../../common/interface/include",
"//foundation/barrierfree/accessibility/common/interface/include", "../../../common/interface/include/parcel",
"//foundation/barrierfree/accessibility/common/interface/include", "../../../services/test/mock/common",
"//foundation/barrierfree/accessibility/common/interface/include/parcel", "../../../services/test/mock/include/extern",
"//foundation/barrierfree/accessibility/common/interface/include/parcel", "../../../services/aams/test/mock/include",
"//foundation/barrierfree/accessibility/services/test/mock/common",
"//foundation/barrierfree/accessibility/services/test/mock/include/extern",
"//foundation/barrierfree/accessibility/util/include",
"//base/account/os_account/frameworks/common/account_error/include",
"//base/account/os_account/frameworks/common/database/include",
"//base/account/os_account/interfaces/innerkits/domain_account/native/include",
"//base/account/os_account/interfaces/innerkits/osaccount/native/include",
"//base/hiviewdfx/hiview/adapter/utility/include/extra/singleton.h",
"//base/notification/common_event_service/interfaces/inner_api",
"//foundation/arkui/napi/native_engine",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include/bundlemgr",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//foundation/multimedia/image_framework/interfaces/kits/native/include",
"//foundation/multimodalinput/input/util/common/include",
"//foundation/window/window_manager/dm/include",
"//foundation/window/window_manager/interfaces/innerkits",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/utils/include",
"//foundation/barrierfree/accessibility/services/aams/test/mock/include",
"//third_party/json/include",
] ]
defines = [ defines = [
"AAMS_LOG_TAG = \"accessibility_test\"", "AAMS_LOG_TAG = \"accessibility_test\"",
"AAMS_LOG_DOMAIN = 0xD001D05", "AAMS_LOG_DOMAIN = 0xD001D05",
@ -76,26 +54,26 @@ config("module_private_config") {
ohos_unittest("accessibility_ui_test_ability_impl_test") { ohos_unittest("accessibility_ui_test_ability_impl_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"../../../services/test/mock/mock_accessible_ability_manager_service_stub.cpp",
"../../../services/test/mock/mock_bundle_manager.cpp",
"../../../services/test/mock/mock_service_registry.cpp",
"../src/accessibility_ui_test_ability_impl.cpp", "../src/accessibility_ui_test_ability_impl.cpp",
"./mock/src/mock_accessible_ability_client_impl.cpp", "./mock/src/mock_accessible_ability_client_impl.cpp",
"//foundation/barrierfree/accessibility/frameworks/aafwk/test/mock/src/mock_accessible_ability_listener.cpp", "./mock/src/mock_accessible_ability_listener.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_manager_service_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_bundle_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp",
"unittest/accessibility_ui_test_ability_impl_test.cpp", "unittest/accessibility_ui_test_ability_impl_test.cpp",
] ]
sources += aams_mock_multimodalinput_src sources += aams_mock_multimodalinput_src
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gmock_main", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gtest_main", "../../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [
@ -107,6 +85,7 @@ ohos_unittest("accessibility_ui_test_ability_impl_test") {
"init:libbeget_proxy", "init:libbeget_proxy",
"init:libbegetutil", "init:libbegetutil",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"samgr:samgr_proxy", "samgr:samgr_proxy",
] ]
} }
@ -115,43 +94,43 @@ ohos_unittest("accessibility_ui_test_ability_impl_test") {
ohos_unittest("accessible_ability_test") { ohos_unittest("accessible_ability_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"../../../common/interface/src/accessibility_element_operator_callback_stub.cpp",
"../../../common/interface/src/accessible_ability_client_stub.cpp",
"../../../common/interface/src/accessible_ability_manager_service_proxy.cpp",
"../../../common/interface/src/parcel/accessibility_ability_info_parcel.cpp",
"../../../common/interface/src/parcel/accessibility_caption_parcel.cpp",
"../../../common/interface/src/parcel/accessibility_element_info_parcel.cpp",
"../../../common/interface/src/parcel/accessibility_event_info_parcel.cpp",
"../../../services/aams/src/accessibility_display_manager.cpp",
"../../../services/aams/src/accessibility_dumper.cpp",
"../../../services/aams/src/accessibility_settings_config.cpp",
"../../../services/aams/src/accessible_ability_manager_service.cpp",
"../../../services/aams/src/accessible_ability_manager_service_event_handler.cpp",
"../../../services/aams/src/utils.cpp",
"../../../services/aams/test/mock/src/mock_accessibility_account_data.cpp",
"../../../services/aams/test/mock/src/mock_accessibility_common_event.cpp",
"../../../services/aams/test/mock/src/mock_accessibility_event_transmission.cpp",
"../../../services/aams/test/mock/src/mock_accessibility_input_interceptor.cpp",
"../../../services/aams/test/mock/src/mock_accessibility_window_connection.cpp",
"../../../services/aams/test/mock/src/mock_accessibility_window_manager.cpp",
"../../../services/aams/test/mock/src/mock_accessible_ability_connection.cpp",
"../../../services/aams/test/mock/src/mock_accessible_ability_manager_service_state_observer_proxy.cpp",
"../../../services/aams/test/mock/src/mock_accessible_ability_manager_service_state_observer_stub.cpp",
"../../../services/aams/test/mock/src/mock_os_account_manager.cpp",
"../../../services/test/mock/mock_parameter.c",
"../../common/src/accessibility_caption.cpp",
"../../common/src/accessibility_constants.cpp",
"../../common/src/accessibility_element_info.cpp",
"../../common/src/accessibility_event_info.cpp",
"../../common/src/accessibility_gesture_inject_path.cpp",
"../../common/src/accessibility_window_info.cpp",
"../src/accessibility_element_operator_callback_impl.cpp", "../src/accessibility_element_operator_callback_impl.cpp",
"../src/accessibility_ui_test_ability_impl.cpp", "../src/accessibility_ui_test_ability_impl.cpp",
"../src/accessible_ability_channel_client.cpp", "../src/accessible_ability_channel_client.cpp",
"../src/accessible_ability_client_impl.cpp", "../src/accessible_ability_client_impl.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessibility_element_operator_callback_stub.cpp", "./mock/src/mock_accessible_ability_channel_proxy.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_client_stub.cpp", "./mock/src/mock_accessible_ability_channel_stub.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_manager_service_proxy.cpp", "./mock/src/mock_accessible_ability_listener.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/parcel/accessibility_ability_info_parcel.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/parcel/accessibility_caption_parcel.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/parcel/accessibility_element_info_parcel.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/parcel/accessibility_event_info_parcel.cpp",
"//foundation/barrierfree/accessibility/frameworks/aafwk/test/mock/src/mock_accessible_ability_channel_proxy.cpp",
"//foundation/barrierfree/accessibility/frameworks/aafwk/test/mock/src/mock_accessible_ability_channel_stub.cpp",
"//foundation/barrierfree/accessibility/frameworks/aafwk/test/mock/src/mock_accessible_ability_listener.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_caption.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_constants.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_element_info.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_event_info.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_gesture_inject_path.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_window_info.cpp",
"//foundation/barrierfree/accessibility/services/aams/src/accessibility_display_manager.cpp",
"//foundation/barrierfree/accessibility/services/aams/src/accessibility_dumper.cpp",
"//foundation/barrierfree/accessibility/services/aams/src/accessibility_settings_config.cpp",
"//foundation/barrierfree/accessibility/services/aams/src/accessible_ability_manager_service.cpp",
"//foundation/barrierfree/accessibility/services/aams/src/accessible_ability_manager_service_event_handler.cpp",
"//foundation/barrierfree/accessibility/services/aams/src/utils.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessibility_account_data.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessibility_common_event.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessibility_event_transmission.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessibility_input_interceptor.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessibility_window_connection.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessibility_window_manager.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessible_ability_connection.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessible_ability_manager_service_state_observer_proxy.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessible_ability_manager_service_state_observer_stub.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_os_account_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c",
"unittest/accessibility_element_operator_callback_impl_test.cpp", "unittest/accessibility_element_operator_callback_impl_test.cpp",
"unittest/accessible_ability_channel_client_test.cpp", "unittest/accessible_ability_channel_client_test.cpp",
"unittest/accessible_ability_client_impl_test.cpp", "unittest/accessible_ability_client_impl_test.cpp",
@ -160,14 +139,14 @@ ohos_unittest("accessible_ability_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gmock_main", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gtest_main", "../../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [
@ -180,9 +159,11 @@ ohos_unittest("accessible_ability_test") {
"hitrace_native:hitrace_meter", "hitrace_native:hitrace_meter",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"safwk:system_ability_fwk", "safwk:system_ability_fwk",
"samgr:samgr_proxy", "samgr:samgr_proxy",
"window_manager:libdm", "window_manager:libdm",
"window_manager:libwm",
] ]
} }

View File

@ -12,7 +12,7 @@
# limitations under the License. # limitations under the License.
import("//build/test.gni") import("//build/test.gni")
import("//foundation/barrierfree/accessibility/accessibility_aafwk.gni") import("../../../accessibility_aafwk.gni")
module_output_path = "accessibility/framework_test" module_output_path = "accessibility/framework_test"
@ -28,18 +28,16 @@ config("module_private_config") {
"${ability_base_path}/interfaces/inner_api/base/include", "${ability_base_path}/interfaces/inner_api/base/include",
"${ability_base_path}/interfaces/kits/native/uri/include", "${ability_base_path}/interfaces/kits/native/uri/include",
"${ability_base_path}/interfaces/kits/native/want/include", "${ability_base_path}/interfaces/kits/native/want/include",
"//base/notification/common_event_service/interfaces/inner_api", "${ability_out_base_path}/notification/common_event_service/interfaces/inner_api",
"//foundation/barrierfree/accessibility/services/interface/include", "${ability_json_path}/notification/common_event_service/interfaces/inner_api",
"//foundation/barrierfree/accessibility/frameworks/acfwk/include", "../../../services/interface/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk/include", "../include",
"//foundation/barrierfree/accessibility/services/aams/test/mock/include", "../../../interfaces/innerkits/acfwk/include",
"//foundation/barrierfree/accessibility/services/test/mock", "../../../services/aams/test/mock/include",
"//foundation/barrierfree/accessibility/common/log/include", "../../../services/test/mock",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include", "../../../common/log/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include/bundlemgr",
"//third_party/json/include",
] ]
defines = [ defines = [
"AAMS_LOG_TAG = \"accessibility_test\"", "AAMS_LOG_TAG = \"accessibility_test\"",
"AAMS_LOG_DOMAIN = 0xD001D05", "AAMS_LOG_DOMAIN = 0xD001D05",
@ -49,27 +47,29 @@ config("module_private_config") {
ohos_unittest("ac_unit_test") { ohos_unittest("ac_unit_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"../../../services/test/mock/mock_accessible_ability_manager_service_stub.cpp",
"../../../services/test/mock/mock_parameter.c",
"../src/accessibility_config.cpp", "../src/accessibility_config.cpp",
"../src/accessibility_config_impl.cpp", "../src/accessibility_config_impl.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_manager_service_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c",
"mock/src/mock_service_registry.cpp", "mock/src/mock_service_registry.cpp",
"unittest/accessibility_config_impl_test.cpp", "unittest/accessibility_config_impl_test.cpp",
] ]
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gmock_main", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gtest_main", "../../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"display_manager:displaymgr", "display_manager:displaymgr",
"eventhandler:libeventhandler", "eventhandler:libeventhandler",

View File

@ -12,7 +12,7 @@
# limitations under the License. # limitations under the License.
import("//build/test.gni") import("//build/test.gni")
import("//foundation/barrierfree/accessibility/accessibility_aafwk.gni") import("../../../accessibility_aafwk.gni")
module_output_path = "accessibility/framework_test" module_output_path = "accessibility/framework_test"
@ -24,14 +24,14 @@ config("module_private_config") {
cflags += [ "-DBINDER_IPC_32BIT" ] cflags += [ "-DBINDER_IPC_32BIT" ]
} }
include_dirs = [ include_dirs = [
"//foundation/barrierfree/accessibility/common/log/include", "../../../common/log/include",
"//foundation/barrierfree/accessibility/frameworks/aafwk/include", "../../aafwk/include",
"//foundation/barrierfree/accessibility/frameworks/acfwk/include", "../../acfwk/include",
"//foundation/barrierfree/accessibility/frameworks/asacfwk/include", "../../asacfwk/include",
"//foundation/barrierfree/accessibility/frameworks/asacfwk/test/mock/include", "../../asacfwk/test/mock/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk/include", "../../../interfaces/innerkits/acfwk/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk/include", "../../../interfaces/innerkits/asacfwk/include",
"//foundation/barrierfree/accessibility/services/test/mock/common", "../../../services/test/mock/common",
] ]
defines = [ defines = [
"AAMS_LOG_DOMAIN = 0xD001D05", "AAMS_LOG_DOMAIN = 0xD001D05",
@ -42,32 +42,33 @@ config("module_private_config") {
ohos_unittest("asac_unit_test") { ohos_unittest("asac_unit_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"../../../services/test/mock/mock_accessible_ability_manager_service_stub.cpp",
"../../../services/test/mock/mock_bundle_manager.cpp",
"../../../services/test/mock/mock_parameter.c", "../../../services/test/mock/mock_parameter.c",
"../../../services/test/mock/mock_service_registry.cpp",
"../../aafwk/src/accessibility_element_operator_callback_impl.cpp",
"../src/accessibility_element_operator_impl.cpp", "../src/accessibility_element_operator_impl.cpp",
"../src/accessibility_system_ability_client_impl.cpp", "../src/accessibility_system_ability_client_impl.cpp",
"//foundation/barrierfree/accessibility/frameworks/aafwk/src/accessibility_element_operator_callback_impl.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_manager_service_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_bundle_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp",
"unittest/accessibility_element_operator_impl_test.cpp", "unittest/accessibility_element_operator_impl_test.cpp",
"unittest/accessibility_system_ability_client_impl_test.cpp", "unittest/accessibility_system_ability_client_impl_test.cpp",
] ]
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gmock_main", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gtest_main", "../../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"ability_runtime:ability_manager", "ability_runtime:ability_manager",
"bundle_framework:appexecfwk_base",
"c_utils:utils", "c_utils:utils",
"eventhandler:libeventhandler", "eventhandler:libeventhandler",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",

View File

@ -23,8 +23,8 @@ config("module_private_config") {
cflags += [ "-DBINDER_IPC_32BIT" ] cflags += [ "-DBINDER_IPC_32BIT" ]
} }
include_dirs = [ include_dirs = [
"//foundation/barrierfree/accessibility/common/log/include", "../../../common/log/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common/include", "../../../interfaces/innerkits/common/include",
] ]
defines = [ defines = [
"AAMS_LOG_TAG = \"accessibility_test\"", "AAMS_LOG_TAG = \"accessibility_test\"",
@ -35,8 +35,8 @@ config("module_private_config") {
ohos_unittest("accessibility_common_test") { ohos_unittest("accessibility_common_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_element_info.cpp", "../src/accessibility_element_info.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_event_info.cpp", "../src/accessibility_event_info.cpp",
"unittest/accessibility_ability_info_test.cpp", "unittest/accessibility_ability_info_test.cpp",
"unittest/accessibility_element_info_test.cpp", "unittest/accessibility_element_info_test.cpp",
"unittest/accessibility_event_info_test.cpp", "unittest/accessibility_event_info_test.cpp",
@ -45,13 +45,13 @@ ohos_unittest("accessibility_common_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gmock_main",
"//third_party/googletest:gmock_main", "../../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gtest_main", "../../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ "hiviewdfx_hilog_native:libhilog" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ]

View File

@ -12,16 +12,16 @@
# limitations under the License. # limitations under the License.
import("//build/ohos.gni") import("//build/ohos.gni")
import("//foundation/barrierfree/accessibility/accessibility_aafwk.gni") import("../../../accessibility_aafwk.gni")
aafwk_path = "//foundation/barrierfree/accessibility/frameworks/aafwk" aafwk_path = "../../../frameworks/aafwk"
config("accessibleability_private_config") { config("accessibleability_private_config") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"${aafwk_path}/include", "${aafwk_path}/include",
"//foundation/barrierfree/accessibility/common/log/include", "../../../common/log/include",
] ]
defines = [ defines = [
@ -48,10 +48,10 @@ ohos_shared_library("accessibleability") {
public_configs = [ public_configs = [
":accessibleability_public_config", ":accessibleability_public_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ "//foundation/barrierfree/accessibility/common/interface:accessibility_interface" ] deps = [ "../../../common/interface:accessibility_interface" ]
external_deps = [ external_deps = [
"c_utils:utils", "c_utils:utils",
@ -64,7 +64,7 @@ ohos_shared_library("accessibleability") {
"samgr:samgr_proxy", "samgr:samgr_proxy",
] ]
public_deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ] public_deps = [ "../common:accessibility_common" ]
innerapi_tags = [ "platformsdk" ] innerapi_tags = [ "platformsdk" ]
install_enable = true install_enable = true

View File

@ -13,14 +13,14 @@
import("//build/ohos.gni") import("//build/ohos.gni")
acfwk_path = "//foundation/barrierfree/accessibility/frameworks/acfwk" acfwk_path = "../../../frameworks/acfwk"
config("accessibilityconfig_private_config") { config("accessibilityconfig_private_config") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"${acfwk_path}/include", "${acfwk_path}/include",
"//foundation/barrierfree/accessibility/common/log/include", "../../../common/log/include",
] ]
defines = [ defines = [
@ -44,14 +44,14 @@ ohos_shared_library("accessibilityconfig") {
version_script = "libaccessibility_acfwk.map" version_script = "libaccessibility_acfwk.map"
configs = [ configs = [
":accessibilityconfig_private_config", ":accessibilityconfig_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
public_configs = [ ":accessibilityconfig_public_config" ] public_configs = [ ":accessibilityconfig_public_config" ]
deps = [ "//foundation/barrierfree/accessibility/common/interface:accessibility_interface" ] deps = [ "../../../common/interface:accessibility_interface" ]
public_deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ] public_deps = [ "../common:accessibility_common" ]
external_deps = [ external_deps = [
"c_utils:utils", "c_utils:utils",
@ -59,6 +59,7 @@ ohos_shared_library("accessibilityconfig") {
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"init:libbeget_proxy", "init:libbeget_proxy",
"init:libbegetutil", "init:libbegetutil",
"input:libmmi-client",
"ipc:ipc_single", "ipc:ipc_single",
"napi:ace_napi", "napi:ace_napi",
"samgr:samgr_proxy", "samgr:samgr_proxy",

View File

@ -13,14 +13,14 @@
import("//build/ohos.gni") import("//build/ohos.gni")
asacfwk_path = "//foundation/barrierfree/accessibility/frameworks/asacfwk" asacfwk_path = "../../../frameworks/asacfwk"
config("accessibilityclient_private_config") { config("accessibilityclient_private_config") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"${asacfwk_path}/include", "${asacfwk_path}/include",
"//foundation/barrierfree/accessibility/common/log/include", "../../../common/log/include",
] ]
defines = [ defines = [
@ -43,14 +43,14 @@ ohos_shared_library("accessibilityclient") {
version_script = "libaccessibility_asacfwk.map" version_script = "libaccessibility_asacfwk.map"
configs = [ configs = [
":accessibilityclient_private_config", ":accessibilityclient_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
public_configs = [ ":accessibilityclient_public_config" ] public_configs = [ ":accessibilityclient_public_config" ]
deps = [ "//foundation/barrierfree/accessibility/common/interface:accessibility_interface" ] deps = [ "../../../common/interface:accessibility_interface" ]
public_deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ] public_deps = [ "../common:accessibility_common" ]
external_deps = [ external_deps = [
"c_utils:utils", "c_utils:utils",

View File

@ -13,13 +13,12 @@
import("//build/ohos.gni") import("//build/ohos.gni")
accessibility_common_path = accessibility_common_path = "../../../frameworks/common"
"//foundation/barrierfree/accessibility/frameworks/common"
config("accessibility_common_private_config") { config("accessibility_common_private_config") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ "//foundation/barrierfree/accessibility/common/log/include" ] include_dirs = [ "../../../common/log/include" ]
defines = [ defines = [
"AAMS_LOG_TAG = \"accessibility_common\"", "AAMS_LOG_TAG = \"accessibility_common\"",
@ -47,7 +46,7 @@ ohos_shared_library("accessibility_common") {
version_script = "libaccessibility_common.map" version_script = "libaccessibility_common.map"
configs = [ configs = [
":accessibility_common_private_config", ":accessibility_common_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
public_configs = [ ":accessibility_common_public_config" ] public_configs = [ ":accessibility_common_public_config" ]

View File

@ -22,13 +22,11 @@ ohos_benchmarktest("BenchmarkTestForAccessibilityConfig") {
cflags += [ "-DBINDER_IPC_32BIT" ] cflags += [ "-DBINDER_IPC_32BIT" ]
} }
deps = [ deps = [ "../../../acfwk:accessibilityconfig" ]
"//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken",
"//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc",
"//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk:accessibilityconfig",
]
external_deps = [ external_deps = [
"access_token:libaccesstoken_sdk", "access_token:libaccesstoken_sdk",
"access_token:libnativetoken",
"access_token:libtoken_setproc",
"c_utils:utils", "c_utils:utils",
] ]
} }

View File

@ -21,7 +21,7 @@ ohos_benchmarktest("BenchmarkTestForAccessibilitySystemAbilityClient") {
cflags += [ "-DBINDER_IPC_32BIT" ] cflags += [ "-DBINDER_IPC_32BIT" ]
} }
sources = [ "accessibility_system_ability_client_test.cpp" ] sources = [ "accessibility_system_ability_client_test.cpp" ]
deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk:accessibilityclient" ] deps = [ "../../../asacfwk:accessibilityclient" ]
} }
group("benchmarktest") { group("benchmarktest") {

View File

@ -22,7 +22,7 @@ ohos_benchmarktest("BenchmarkTestForAccessibleAbilityClient") {
cflags += [ "-DBINDER_IPC_32BIT" ] cflags += [ "-DBINDER_IPC_32BIT" ]
} }
deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability" ] deps = [ "../../../aafwk:accessibleability" ]
} }
group("benchmarktest") { group("benchmarktest") {

View File

@ -21,17 +21,15 @@ ohos_fuzztest("AccessibilityConfigFuzzTest") {
fuzz_config_file = "../../fuzztest/accessibilityconfig_fuzzer" fuzz_config_file = "../../fuzztest/accessibilityconfig_fuzzer"
configs = [ configs = [
"//foundation/barrierfree/accessibility/interfaces/innerkits/test/fuzztest:configs_cc_ld", "../../fuzztest:configs_cc_ld",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../../../resources/config/build:coverage_flags",
] ]
sources = [ "accessibilityconfig_fuzzer.cpp" ] sources = [ "accessibilityconfig_fuzzer.cpp" ]
deps = [ deps = [ "../../../acfwk:accessibilityconfig" ]
"//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken",
"//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc",
"//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk:accessibilityconfig",
]
external_deps = [ external_deps = [
"access_token:libaccesstoken_sdk", "access_token:libaccesstoken_sdk",
"access_token:libnativetoken",
"access_token:libtoken_setproc",
"c_utils:utils", "c_utils:utils",
] ]
} }

View File

@ -21,15 +21,15 @@ ohos_fuzztest("AccessibilitySystemAbilityClientFuzzTest") {
fuzz_config_file = "../../fuzztest/accessibilitysystemabilityclient_fuzzer" fuzz_config_file = "../../fuzztest/accessibilitysystemabilityclient_fuzzer"
include_dirs = [ include_dirs = [
"//foundation/barrierfree/accessibility/common/interface/include", "../../../../../common/interface/include",
"//foundation/barrierfree/accessibility/frameworks/asacfwk/include", "../../../../../frameworks/asacfwk/include",
] ]
configs = [ configs = [
"//foundation/barrierfree/accessibility/interfaces/innerkits/test/fuzztest:configs_cc_ld", "../../fuzztest:configs_cc_ld",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../../../resources/config/build:coverage_flags",
] ]
sources = [ "accessibilitysystemabilityclient_fuzzer.cpp" ] sources = [ "accessibilitysystemabilityclient_fuzzer.cpp" ]
deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk:accessibilityclient" ] deps = [ "../../../asacfwk:accessibilityclient" ]
external_deps = [ "c_utils:utils" ] external_deps = [ "c_utils:utils" ]
} }

View File

@ -22,11 +22,11 @@ ohos_fuzztest("AccessibleAbilityClientFuzzTest") {
include_dirs = [] include_dirs = []
configs = [ configs = [
"//foundation/barrierfree/accessibility/interfaces/innerkits/test/fuzztest:configs_cc_ld", "../../fuzztest:configs_cc_ld",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../../../resources/config/build:coverage_flags",
] ]
sources = [ "accessibleabilityclient_fuzzer.cpp" ] sources = [ "accessibleabilityclient_fuzzer.cpp" ]
deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability" ] deps = [ "../../../aafwk:accessibleability" ]
external_deps = [ "c_utils:utils" ] external_deps = [ "c_utils:utils" ]
} }

View File

@ -12,12 +12,12 @@
# limitations under the License. # limitations under the License.
import("//build/ohos.gni") import("//build/ohos.gni")
import("//foundation/barrierfree/accessibility/accessibility_aafwk.gni") import("../../../accessibility_aafwk.gni")
ohos_shared_library("accessibility") { ohos_shared_library("accessibility") {
include_dirs = [ include_dirs = [
"//foundation/barrierfree/accessibility/common/log/include", "../../../common/log/include",
"//foundation/multimodalinput/input/interfaces/native/innerkits/event/include", "../../../../../multimodalinput/input/interfaces/native/innerkits/event/include",
"./include", "./include",
] ]
@ -32,11 +32,11 @@ ohos_shared_library("accessibility") {
"./src/native_module.cpp", "./src/native_module.cpp",
] ]
configs = [ "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags" ] configs = [ "../../../resources/config/build:coverage_flags" ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk:accessibilityconfig", "../../innerkits/acfwk:accessibilityconfig",
"//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk:accessibilityclient", "../../innerkits/asacfwk:accessibilityclient",
] ]
external_deps = [ external_deps = [
@ -53,11 +53,11 @@ ohos_shared_library("accessibility") {
group("napi_packages") { group("napi_packages") {
deps = [ deps = [
":accessibility", ":accessibility",
"//foundation/barrierfree/accessibility/interfaces/kits/napi/accessibility_config:config_napi", "accessibility_config:config_napi",
"//foundation/barrierfree/accessibility/interfaces/kits/napi/accessibility_extension:accessibilityextensionability_napi", "accessibility_extension:accessibilityextensionability_napi",
"//foundation/barrierfree/accessibility/interfaces/kits/napi/accessibility_extension_context:accessibilityextensioncontext_napi", "accessibility_extension_context:accessibilityextensioncontext_napi",
"//foundation/barrierfree/accessibility/interfaces/kits/napi/accessibility_extension_module_loader:accessibility_extension_module", "accessibility_extension_module_loader:accessibility_extension_module",
"//foundation/barrierfree/accessibility/interfaces/kits/napi/accessibility_gesture_path:gesturepath_napi", "accessibility_gesture_path:gesturepath_napi",
"//foundation/barrierfree/accessibility/interfaces/kits/napi/accessibility_gesture_point:gesturepoint_napi", "accessibility_gesture_point:gesturepoint_napi",
] ]
} }

View File

@ -15,9 +15,8 @@ import("//build/ohos.gni")
ohos_shared_library("config_napi") { ohos_shared_library("config_napi") {
include_dirs = [ include_dirs = [
"//foundation/barrierfree/accessibility/common/log/include", "../../../../common/log/include",
"//foundation/barrierfree/accessibility/interfaces/kits/napi/include", "../include",
"//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
"./include", "./include",
] ]
@ -31,16 +30,17 @@ ohos_shared_library("config_napi") {
"./src/native_module.cpp", "./src/native_module.cpp",
] ]
configs = [ "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags" ] configs = [ "../../../../resources/config/build:coverage_flags" ]
deps = [ deps = [
"../../../innerkits/acfwk:accessibilityconfig",
"./../../../innerkits/common:accessibility_common", "./../../../innerkits/common:accessibility_common",
"//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk:accessibilityconfig",
] ]
external_deps = [ external_deps = [
"access_token:libtokenid_sdk", "access_token:libtokenid_sdk",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"input:libmmi-client",
"ipc:ipc_core", "ipc:ipc_core",
"napi:ace_napi", "napi:ace_napi",
] ]

View File

@ -11,8 +11,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
import("//build/ohos.gni") import("//build/ohos.gni")
import(
"../../../../../../../arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
es2abc_gen_abc("gen_accessibility_extension_abc") { es2abc_gen_abc("gen_accessibility_extension_abc") {
src_js = rebase_path("accessibility_extension.js") src_js = rebase_path("accessibility_extension.js")

View File

@ -11,8 +11,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
import("//build/ohos.gni") import("//build/ohos.gni")
import(
"../../../../../../../arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
es2abc_gen_abc("gen_accessibility_extension_context_abc") { es2abc_gen_abc("gen_accessibility_extension_context_abc") {
src_js = rebase_path("accessibility_extension_context.js") src_js = rebase_path("accessibility_extension_context.js")

View File

@ -17,10 +17,10 @@ config("accessibility_extension_module_config") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ include_dirs = [
"//foundation/barrierfree/accessibility/common/log/include", "../../../../common/log/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk/include", "../../../innerkits/acfwk/include",
"//foundation/barrierfree/accessibility/interfaces/kits/napi/accessibility_extension_module_loader/include", "include",
"//foundation/barrierfree/accessibility/interfaces/kits/napi/include", "../include",
] ]
defines = [ defines = [
@ -42,8 +42,8 @@ ohos_shared_library("accessibility_extension_module") {
configs = [ ":accessibility_extension_module_config" ] configs = [ ":accessibility_extension_module_config" ]
deps = [ deps = [
"../../../innerkits/aafwk:accessibleability",
"./../../../innerkits/common:accessibility_common", "./../../../innerkits/common:accessibility_common",
"//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability",
] ]
external_deps = [ external_deps = [

View File

@ -50,10 +50,7 @@ NAccessibilityExtension::NAccessibilityExtension(AbilityRuntime::JsRuntime& jsRu
engine_ = &jsRuntime_.GetNativeEngine(); engine_ = &jsRuntime_.GetNativeEngine();
} }
NAccessibilityExtension::~NAccessibilityExtension() NAccessibilityExtension::~NAccessibilityExtension() = default;
{
jsRuntime_.FreeNativeReference(std::move(jsObj_));
}
void NAccessibilityExtension::Init(const std::shared_ptr<AppExecFwk::AbilityLocalRecord> &record, void NAccessibilityExtension::Init(const std::shared_ptr<AppExecFwk::AbilityLocalRecord> &record,
const std::shared_ptr<AppExecFwk::OHOSApplication> &application, const std::shared_ptr<AppExecFwk::OHOSApplication> &application,

View File

@ -15,9 +15,9 @@ import("//build/ohos.gni")
ohos_shared_library("gesturepath_napi") { ohos_shared_library("gesturepath_napi") {
include_dirs = [ include_dirs = [
"//foundation/barrierfree/accessibility/common/log/include", "../../../../common/log/include",
"//foundation/barrierfree/accessibility/interfaces/kits/napi/include", "../include",
"./include", "include",
] ]
defines = [ defines = [
@ -32,7 +32,7 @@ ohos_shared_library("gesturepath_napi") {
configs = [] configs = []
deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ] deps = [ "../../../innerkits/common:accessibility_common" ]
external_deps = [ external_deps = [
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",

View File

@ -15,9 +15,9 @@ import("//build/ohos.gni")
ohos_shared_library("gesturepoint_napi") { ohos_shared_library("gesturepoint_napi") {
include_dirs = [ include_dirs = [
"//foundation/barrierfree/accessibility/common/log/include", "../../../../common/log/include",
"//foundation/barrierfree/accessibility/interfaces/kits/napi/include", "../include",
"./include", "include",
] ]
defines = [ defines = [
@ -32,7 +32,7 @@ ohos_shared_library("gesturepoint_napi") {
configs = [] configs = []
deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ] deps = [ "../../../innerkits/common:accessibility_common" ]
external_deps = [ external_deps = [
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",

View File

@ -13,7 +13,7 @@
import("//build/ohos.gni") import("//build/ohos.gni")
services_path = "//foundation/barrierfree/accessibility/services/aams" services_path = "./"
ohos_prebuilt_etc("accessibility_service.rc") { ohos_prebuilt_etc("accessibility_service.rc") {
source = "etc/accessibility_service.rc" source = "etc/accessibility_service.rc"
@ -27,7 +27,7 @@ config("aams_service_config") {
include_dirs = [ include_dirs = [
"include", "include",
"//foundation/barrierfree/accessibility/common/log/include", "../../common/log/include",
] ]
defines = [ defines = [
@ -65,12 +65,12 @@ ohos_shared_library("accessibleabilityms") {
sources = accessibleabilityms_files sources = accessibleabilityms_files
configs = [ configs = [
":aams_service_config", ":aams_service_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../common/interface:accessibility_interface",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [

View File

@ -12,7 +12,7 @@
# limitations under the License. # limitations under the License.
import("//build/test.gni") import("//build/test.gni")
import("//foundation/barrierfree/accessibility/services/test/aamstestmock.gni") import("../../test/aamstestmock.gni")
module_output_path = "accessibility/framework_test" module_output_path = "accessibility/framework_test"
@ -27,26 +27,15 @@ config("module_private_config") {
include_dirs = aams_mock_include_dirs include_dirs = aams_mock_include_dirs
include_dirs += [ include_dirs += [
"//foundation/barrierfree/accessibility/common/log/include", "../../../common/log/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk/include", "../../../interfaces/innerkits/acfwk/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk/include", "../../../interfaces/innerkits/asacfwk/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common/include", "../../../interfaces/innerkits/common/include",
"//foundation/barrierfree/accessibility/services/aams/include", "../include",
"//foundation/barrierfree/accessibility/services/aams/test/mock/include", "./mock/include",
"//foundation/barrierfree/accessibility/services/test/mock/common", "../../test/mock/common",
"//foundation/barrierfree/accessibility/common/interface/include", "../../../common/interface/include",
"//foundation/barrierfree/accessibility/common/interface/include/parcel", "../../../common/interface/include/parcel",
"//foundation/barrierfree/accessibility/util/include",
"//base/account/os_account/frameworks/common/account_error/include",
"//base/account/os_account/frameworks/common/database/include",
"//base/account/os_account/interfaces/innerkits/domain_account/native/include",
"//base/account/os_account/interfaces/innerkits/osaccount/native/include",
"//base/global/resource_management/interfaces/inner_api/include",
"//base/hiviewdfx/hisysevent/interfaces/native/innerkits/hisysevent/include",
"//base/notification/common_event_service/interfaces/inner_api",
"//base/notification/eventhandler/interfaces/inner_api",
"//base/powermgr/display_manager/utils/native/include",
"//foundation",
"${ability_base_path}/interfaces/inner_api/base/include", "${ability_base_path}/interfaces/inner_api/base/include",
"${ability_base_path}/interfaces/kits/native/uri/include", "${ability_base_path}/interfaces/kits/native/uri/include",
"${ability_base_path}/interfaces/kits/native/want/include", "${ability_base_path}/interfaces/kits/native/want/include",
@ -55,29 +44,15 @@ config("module_private_config") {
"${ability_runtime_inner_api_path}/ability_manager/include", "${ability_runtime_inner_api_path}/ability_manager/include",
"${ability_runtime_inner_api_path}/app_manager/include/appmgr/", "${ability_runtime_inner_api_path}/app_manager/include/appmgr/",
"${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/abilitymgr/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include/bundlemgr",
"//foundation/distributeddatamgr/preferences/interfaces/inner_api/include",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/common/include",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/systemabilitymgr/samgr/services/samgr/native/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//foundation/multimedia/image_framework/interfaces/kits/native/include",
"//foundation/multimodalinput/input/util/common/include",
"//foundation/window/window_manager/dm/include",
"//foundation/window/window_manager/interfaces/innerkits",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/utils/include",
"//third_party/json/include",
"//commonlibrary/c_utils/base/include",
"//utils/system/safwk/native/include",
"mock", "mock",
"../../../../graphic/graphic_2d/rosen/modules/render_service_base/include",
"../../../../multimedia/image_framework/interfaces/innerkits/include",
"../../../../multimedia/image_framework/interfaces/kits/native/include",
"../../../../window/window_manager/previewer/mock",
"../../../../multimodalinput/input/util/common/include",
"../../../../window/window_manager/utils/include",
] ]
defines = [ defines = [
"AAMS_LOG_TAG = \"accessibility_test\"", "AAMS_LOG_TAG = \"accessibility_test\"",
"AAMS_LOG_DOMAIN = 0xD001D05", "AAMS_LOG_DOMAIN = 0xD001D05",
@ -102,26 +77,36 @@ ohos_unittest("accessibility_account_data_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gmock_main", "../../../interfaces/innerkits/common:accessibility_common",
"//third_party/googletest:gtest_main", "../../../services/aams:accessibleabilityms",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"ability_runtime:ability_manager", "ability_runtime:ability_manager",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"hitrace_native:hitrace_meter", "hitrace_native:hitrace_meter",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"init:libbegetutil", "init:libbegetutil",
"input:libmmi-client", "input:libmmi-client",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -129,7 +114,7 @@ ohos_unittest("accessibility_account_data_test") {
ohos_unittest("accessible_ability_manager_service_test") { ohos_unittest("accessible_ability_manager_service_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "../../test/mock/mock_parameter.c",
"mock/src/aafwk/mock_bundle_manager.cpp", "mock/src/aafwk/mock_bundle_manager.cpp",
"mock/src/mock_accessibility_element_operator_callback_stub.cpp", "mock/src/mock_accessibility_element_operator_callback_stub.cpp",
"mock/src/mock_accessibility_window_manager.cpp", "mock/src/mock_accessibility_window_manager.cpp",
@ -151,26 +136,36 @@ ohos_unittest("accessible_ability_manager_service_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gmock_main", "../../../interfaces/innerkits/common:accessibility_common",
"//third_party/googletest:gtest_main", "../../aams:accessibleabilityms",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"display_manager:displaymgr", "display_manager:displaymgr",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"init:libbegetutil", "init:libbegetutil",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"power_manager:powermgr_client", "power_manager:powermgr_client",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -178,6 +173,10 @@ ohos_unittest("accessible_ability_manager_service_test") {
ohos_unittest("accessibility_touch_guider_test") { ohos_unittest("accessibility_touch_guider_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"../../../common/interface/src/accessibility_element_operator_callback_stub.cpp",
"../../../common/interface/src/accessible_ability_channel_stub.cpp",
"../../../common/interface/src/parcel/accessibility_element_info_parcel.cpp",
"../../test/mock/mock_display_manager.cpp",
"../src/accessibility_display_manager.cpp", "../src/accessibility_display_manager.cpp",
"../src/accessibility_gesture_recognizer.cpp", "../src/accessibility_gesture_recognizer.cpp",
"../src/accessibility_settings_config.cpp", "../src/accessibility_settings_config.cpp",
@ -185,10 +184,6 @@ ohos_unittest("accessibility_touch_guider_test") {
"../src/accessibility_window_connection.cpp", "../src/accessibility_window_connection.cpp",
"../src/accessible_ability_manager_service_event_handler.cpp", "../src/accessible_ability_manager_service_event_handler.cpp",
"../src/utils.cpp", "../src/utils.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessibility_element_operator_callback_stub.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_channel_stub.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/parcel/accessibility_element_info_parcel.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp",
"mock/src/mock_accessibility_account_data.cpp", "mock/src/mock_accessibility_account_data.cpp",
"mock/src/mock_accessibility_common_event.cpp", "mock/src/mock_accessibility_common_event.cpp",
"mock/src/mock_accessibility_element_operator_proxy.cpp", "mock/src/mock_accessibility_element_operator_proxy.cpp",
@ -214,25 +209,35 @@ ohos_unittest("accessibility_touch_guider_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gmock_main",
"//third_party/googletest:gmock_main", "../../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gtest_main", "../../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"ability_runtime:ability_manager", "ability_runtime:ability_manager",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler", "eventhandler:libeventhandler",
"hisysevent_native:libhisysevent", "hisysevent_native:libhisysevent",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"init:libbegetutil", "init:libbegetutil",
"input:libmmi-client", "input:libmmi-client",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -240,9 +245,9 @@ ohos_unittest("accessibility_touch_guider_test") {
ohos_unittest("accessibility_common_event_registry_test") { ohos_unittest("accessibility_common_event_registry_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"../../test/mock/mock_parameter.c",
"../src/accessibility_common_event.cpp", "../src/accessibility_common_event.cpp",
"../src/utils.cpp", "../src/utils.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c",
"mock/src/mock_accessibility_account_data.cpp", "mock/src/mock_accessibility_account_data.cpp",
"mock/src/mock_accessible_ability_manager_service.cpp", "mock/src/mock_accessible_ability_manager_service.cpp",
"mock/src/mock_common_event_data.cpp", "mock/src/mock_common_event_data.cpp",
@ -259,21 +264,24 @@ ohos_unittest("accessibility_common_event_registry_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gmock_main", "../../../interfaces/innerkits/common:accessibility_common",
"//third_party/googletest:gtest_main", "../../aams:accessibleabilityms",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler", "eventhandler:libeventhandler",
"hisysevent_native:libhisysevent", "hisysevent_native:libhisysevent",
"hitrace_native:hitrace_meter", "hitrace_native:hitrace_meter",
@ -281,8 +289,15 @@ ohos_unittest("accessibility_common_event_registry_test") {
"init:libbegetutil", "init:libbegetutil",
"input:libmmi-client", "input:libmmi-client",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"safwk:system_ability_fwk", "safwk:system_ability_fwk",
"samgr:samgr_proxy", "samgr:samgr_proxy",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -291,6 +306,13 @@ ohos_unittest("accessibility_input_interceptor_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"../../../common/interface/src/accessible_ability_channel_proxy.cpp",
"../../../common/interface/src/accessible_ability_client_proxy.cpp",
"../../../frameworks/common/src/accessibility_ability_info.cpp",
"../../../frameworks/common/src/accessibility_caption.cpp",
"../../../frameworks/common/src/accessibility_event_info.cpp",
"../../../frameworks/common/src/accessibility_window_info.cpp",
"../../test/mock/mock_parameter.c",
"../src/accessibility_common_event.cpp", "../src/accessibility_common_event.cpp",
"../src/accessibility_display_manager.cpp", "../src/accessibility_display_manager.cpp",
"../src/accessibility_dumper.cpp", "../src/accessibility_dumper.cpp",
@ -301,13 +323,6 @@ ohos_unittest("accessibility_input_interceptor_test") {
"../src/accessibility_short_key.cpp", "../src/accessibility_short_key.cpp",
"../src/accessible_ability_manager_service_event_handler.cpp", "../src/accessible_ability_manager_service_event_handler.cpp",
"../src/utils.cpp", "../src/utils.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_channel_proxy.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_client_proxy.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_ability_info.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_caption.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_event_info.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_window_info.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c",
"mock/src/aafwk/mock_bundle_manager.cpp", "mock/src/aafwk/mock_bundle_manager.cpp",
"mock/src/mock_accessibility_account_data.cpp", "mock/src/mock_accessibility_account_data.cpp",
"mock/src/mock_accessibility_gesture_recognizer.cpp", "mock/src/mock_accessibility_gesture_recognizer.cpp",
@ -326,30 +341,39 @@ ohos_unittest("accessibility_input_interceptor_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gmock_main", "../../../interfaces/innerkits/common:accessibility_common",
"//third_party/googletest:gtest_main", "../../aams:accessibleabilityms",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits", "common_event_service:cesfwk_innerkits",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler", "eventhandler:libeventhandler",
"hisysevent_native:libhisysevent", "hisysevent_native:libhisysevent",
"hitrace_native:hitrace_meter", "hitrace_native:hitrace_meter",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"init:libbegetutil", "init:libbegetutil",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"samgr:samgr_proxy", "samgr:samgr_proxy",
"window_manager:libdm", "window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -358,14 +382,14 @@ ohos_unittest("accessibility_window_manager_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"../../../common/interface/src/accessibility_element_operator_callback_proxy.cpp",
"../../../common/interface/src/accessibility_element_operator_proxy.cpp",
"../../../common/interface/src/accessible_ability_channel_proxy.cpp",
"../../../common/interface/src/accessible_ability_client_proxy.cpp",
"../src/accessibility_window_connection.cpp", "../src/accessibility_window_connection.cpp",
"../src/accessibility_window_manager.cpp", "../src/accessibility_window_manager.cpp",
"../src/accessible_ability_manager_service_event_handler.cpp", "../src/accessible_ability_manager_service_event_handler.cpp",
"../src/utils.cpp", "../src/utils.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessibility_element_operator_callback_proxy.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessibility_element_operator_proxy.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_channel_proxy.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_client_proxy.cpp",
"mock/src/aafwk/mock_bundle_manager.cpp", "mock/src/aafwk/mock_bundle_manager.cpp",
"mock/src/mock_accessibility_account_data.cpp", "mock/src/mock_accessibility_account_data.cpp",
"mock/src/mock_accessibility_common_event.cpp", "mock/src/mock_accessibility_common_event.cpp",
@ -379,21 +403,24 @@ ohos_unittest("accessibility_window_manager_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gmock_main", "../../../interfaces/innerkits/common:accessibility_common",
"//third_party/googletest:gtest_main", "../../aams:accessibleabilityms",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler", "eventhandler:libeventhandler",
"hisysevent_native:libhisysevent", "hisysevent_native:libhisysevent",
"hitrace_native:hitrace_meter", "hitrace_native:hitrace_meter",
@ -401,6 +428,13 @@ ohos_unittest("accessibility_window_manager_test") {
"init:libbegetutil", "init:libbegetutil",
"input:libmmi-client", "input:libmmi-client",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -409,10 +443,10 @@ ohos_unittest("accessibility_keyevent_filter_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"../src/accessibility_keyevent_filter.cpp", "../src/accessibility_keyevent_filter.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessibility_account_data.cpp", "./mock/src/mock_accessibility_account_data.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessibility_event_transmission.cpp", "./mock/src/mock_accessibility_event_transmission.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessible_ability_connection.cpp", "./mock/src/mock_accessible_ability_connection.cpp",
"//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessible_ability_manager_service.cpp", "./mock/src/mock_accessible_ability_manager_service.cpp",
"mock/src/mock_system_ability.cpp", "mock/src/mock_system_ability.cpp",
"unittest/accessibility_keyevent_filter_test.cpp", "unittest/accessibility_keyevent_filter_test.cpp",
] ]
@ -420,22 +454,25 @@ ohos_unittest("accessibility_keyevent_filter_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gmock_main", "../../../interfaces/innerkits/common:accessibility_common",
"//third_party/googletest:gtest_main", "../../aams:accessibleabilityms",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"ability_runtime:ability_manager", "ability_runtime:ability_manager",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler", "eventhandler:libeventhandler",
"hisysevent_native:libhisysevent", "hisysevent_native:libhisysevent",
"hitrace_native:hitrace_meter", "hitrace_native:hitrace_meter",
@ -443,6 +480,13 @@ ohos_unittest("accessibility_keyevent_filter_test") {
"init:libbegetutil", "init:libbegetutil",
"input:libmmi-client", "input:libmmi-client",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -450,6 +494,7 @@ ohos_unittest("accessibility_keyevent_filter_test") {
ohos_unittest("accessible_ability_connection_test") { ohos_unittest("accessible_ability_connection_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"../../test/mock/mock_parameter.c",
"../src/accessibility_account_data.cpp", "../src/accessibility_account_data.cpp",
"../src/accessibility_common_event.cpp", "../src/accessibility_common_event.cpp",
"../src/accessibility_display_manager.cpp", "../src/accessibility_display_manager.cpp",
@ -471,7 +516,6 @@ ohos_unittest("accessible_ability_connection_test") {
"../src/accessible_ability_manager_service.cpp", "../src/accessible_ability_manager_service.cpp",
"../src/accessible_ability_manager_service_event_handler.cpp", "../src/accessible_ability_manager_service_event_handler.cpp",
"../src/utils.cpp", "../src/utils.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c",
"mock/src/aafwk/mock_ability_manager_client.cpp", "mock/src/aafwk/mock_ability_manager_client.cpp",
"mock/src/aafwk/mock_bundle_manager.cpp", "mock/src/aafwk/mock_bundle_manager.cpp",
"mock/src/mock_accessibility_element_operator_callback_stub.cpp", "mock/src/mock_accessibility_element_operator_callback_stub.cpp",
@ -495,22 +539,24 @@ ohos_unittest("accessible_ability_connection_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gmock_main", "../../../interfaces/innerkits/common:accessibility_common",
"//third_party/googletest:gtest_main",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"ability_runtime:ability_manager", "ability_runtime:ability_manager",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"display_manager:displaymgr", "display_manager:displaymgr",
"eventhandler:libeventhandler", "eventhandler:libeventhandler",
"hisysevent_native:libhisysevent", "hisysevent_native:libhisysevent",
@ -519,6 +565,12 @@ ohos_unittest("accessible_ability_connection_test") {
"init:libbegetutil", "init:libbegetutil",
"input:libmmi-client", "input:libmmi-client",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"samgr:samgr_proxy",
"samgr:samgr_proxy", "samgr:samgr_proxy",
"window_manager:libdm", "window_manager:libdm",
"window_manager:libwm", "window_manager:libwm",
@ -537,21 +589,30 @@ ohos_unittest("accessibility_display_manager_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//third_party/googletest:gmock_main", "../../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gtest_main", "../../../common/interface:accessibility_interface",
] ]
external_deps = [ external_deps = [
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"init:libbegetutil", "init:libbegetutil",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm", "window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -559,10 +620,10 @@ ohos_unittest("accessibility_display_manager_test") {
ohos_unittest("accessibility_dumper_test") { ohos_unittest("accessibility_dumper_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"../../../common/interface/src/accessible_ability_channel_stub.cpp",
"../src/accessibility_dumper.cpp", "../src/accessibility_dumper.cpp",
"../src/accessible_ability_manager_service_event_handler.cpp", "../src/accessible_ability_manager_service_event_handler.cpp",
"../src/utils.cpp", "../src/utils.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_channel_stub.cpp",
"mock/src/mock_accessibility_account_data.cpp", "mock/src/mock_accessibility_account_data.cpp",
"mock/src/mock_accessibility_common_event.cpp", "mock/src/mock_accessibility_common_event.cpp",
"mock/src/mock_accessibility_event_transmission.cpp", "mock/src/mock_accessibility_event_transmission.cpp",
@ -589,24 +650,34 @@ ohos_unittest("accessibility_dumper_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gmock_main",
"//third_party/googletest:gmock_main", "../../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gtest_main", "../../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"ability_runtime:ability_manager", "ability_runtime:ability_manager",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler", "eventhandler:libeventhandler",
"hisysevent_native:libhisysevent", "hisysevent_native:libhisysevent",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"init:libbegetutil", "init:libbegetutil",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -631,25 +702,35 @@ ohos_unittest("accessibility_touchevent_injector_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gmock_main", "../../../interfaces/innerkits/common:accessibility_common",
"//third_party/googletest:gtest_main", "../../aams:accessibleabilityms",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler", "eventhandler:libeventhandler",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"init:libbegetutil", "init:libbegetutil",
"input:libmmi-client", "input:libmmi-client",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -657,6 +738,12 @@ ohos_unittest("accessibility_touchevent_injector_test") {
ohos_unittest("accessible_ability_channel_test") { ohos_unittest("accessible_ability_channel_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"../../../common/interface/src/accessibility_element_operator_callback_proxy.cpp",
"../../../common/interface/src/accessible_ability_channel_stub.cpp",
"../../../common/interface/src/parcel/accessibility_element_info_parcel.cpp",
"../../../common/interface/src/parcel/accessibility_gesture_inject_path_parcel.cpp",
"../../../common/interface/src/parcel/accessibility_window_info_parcel.cpp",
"../../test/mock/mock_display_manager.cpp",
"../src/accessibility_account_data.cpp", "../src/accessibility_account_data.cpp",
"../src/accessibility_common_event.cpp", "../src/accessibility_common_event.cpp",
"../src/accessibility_display_manager.cpp", "../src/accessibility_display_manager.cpp",
@ -665,12 +752,6 @@ ohos_unittest("accessible_ability_channel_test") {
"../src/accessible_ability_connection.cpp", "../src/accessible_ability_connection.cpp",
"../src/accessible_ability_manager_service_event_handler.cpp", "../src/accessible_ability_manager_service_event_handler.cpp",
"../src/utils.cpp", "../src/utils.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessibility_element_operator_callback_proxy.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_channel_stub.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/parcel/accessibility_element_info_parcel.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/parcel/accessibility_gesture_inject_path_parcel.cpp",
"//foundation/barrierfree/accessibility/common/interface/src/parcel/accessibility_window_info_parcel.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp",
"mock/src/mock_accessibility_element_operator_proxy.cpp", "mock/src/mock_accessibility_element_operator_proxy.cpp",
"mock/src/mock_accessibility_element_operator_stub.cpp", "mock/src/mock_accessibility_element_operator_stub.cpp",
"mock/src/mock_accessibility_event_transmission.cpp", "mock/src/mock_accessibility_event_transmission.cpp",
@ -694,19 +775,22 @@ ohos_unittest("accessible_ability_channel_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gmock_main",
"//third_party/googletest:gmock_main", "../../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gtest_main", "../../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"ability_runtime:ability_manager", "ability_runtime:ability_manager",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler", "eventhandler:libeventhandler",
"hisysevent_native:libhisysevent", "hisysevent_native:libhisysevent",
"hitrace_native:hitrace_meter", "hitrace_native:hitrace_meter",
@ -714,6 +798,13 @@ ohos_unittest("accessible_ability_channel_test") {
"init:libbegetutil", "init:libbegetutil",
"input:libmmi-client", "input:libmmi-client",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -738,24 +829,34 @@ ohos_unittest("accessibility_mouse_autoclick_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gmock_main", "../../../interfaces/innerkits/common:accessibility_common",
"//third_party/googletest:gtest_main", "../../aams:accessibleabilityms",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"init:libbegetutil", "init:libbegetutil",
"input:libmmi-client", "input:libmmi-client",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -771,20 +872,30 @@ ohos_unittest("accessibility_mouse_key_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gmock_main",
"//third_party/googletest:gmock_main", "../../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gtest_main", "../../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"init:libbegetutil", "init:libbegetutil",
"input:libmmi-client", "input:libmmi-client",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -809,25 +920,35 @@ ohos_unittest("accessibility_short_key_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gmock_main", "../../../interfaces/innerkits/common:accessibility_common",
"//third_party/googletest:gtest_main", "../../aams:accessibleabilityms",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler", "eventhandler:libeventhandler",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"init:libbegetutil", "init:libbegetutil",
"input:libmmi-client", "input:libmmi-client",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -844,19 +965,29 @@ ohos_unittest("accessibility_settings_config_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", "../../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gmock_main", "../../../interfaces/innerkits/common:accessibility_common",
"//third_party/googletest:gtest_main", "../../aams:accessibleabilityms",
] ]
external_deps = [ external_deps = [
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"common_event_service:cesfwk_innerkits",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"init:libbegetutil", "init:libbegetutil",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
] ]
} }
@ -882,25 +1013,35 @@ ohos_unittest("accessibility_zoom_gesture_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../../third_party/googletest:gtest_main",
"//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", "../../../common/interface:accessibility_interface",
"//third_party/googletest:gmock_main", "../../../interfaces/innerkits/common:accessibility_common",
"//third_party/googletest:gtest_main", "../../aams:accessibleabilityms",
] ]
external_deps = [ external_deps = [
"ability_base:want", "ability_base:want",
"bundle_framework:appexecfwk_base",
"bundle_framework:appexecfwk_core",
"c_utils:utils", "c_utils:utils",
"common_event_service:cesfwk_innerkits",
"eventhandler:libeventhandler", "eventhandler:libeventhandler",
"hiviewdfx_hilog_native:libhilog", "hiviewdfx_hilog_native:libhilog",
"init:libbegetutil", "init:libbegetutil",
"input:libmmi-client", "input:libmmi-client",
"ipc:ipc_core", "ipc:ipc_core",
"os_account:domain_account_innerkits",
"os_account:os_account_innerkits",
"resource_management:global_resmgr",
"safwk:system_ability_fwk",
"samgr:samgr_proxy",
"window_manager:libdm",
"window_manager:libwm",
] ]
} }

View File

@ -14,7 +14,8 @@
import("//build/ohos.gni") import("//build/ohos.gni")
ohos_prebuilt_etc("ohos.para.dac") { ohos_prebuilt_etc("ohos.para.dac") {
source = "//foundation/barrierfree/accessibility/services/etc/accessibility.para.dac" source = "./accessibility.para.dac"
part_name = "accessibility" part_name = "accessibility"
subsystem_name = "barrierfree"
module_install_dir = "etc/param" module_install_dir = "etc/param"
} }

View File

@ -12,7 +12,7 @@
# limitations under the License. # limitations under the License.
import("//build/test.gni") import("//build/test.gni")
import("//foundation/barrierfree/accessibility/services/test/aamstestmock.gni") import("./aamstestmock.gni")
module_output_path = "accessibility/framework_test" module_output_path = "accessibility/framework_test"
@ -28,26 +28,18 @@ config("module_private_config") {
include_dirs = aams_mock_include_dirs include_dirs = aams_mock_include_dirs
include_dirs += [ include_dirs += [
"//foundation/barrierfree/accessibility/common/log/include", "${AAMS_COMMON_PATH}/log/include",
"//foundation/barrierfree/accessibility/common/interface/include/parcel", "${AAMS_COMMON_PATH}/interface/include/parcel",
"//foundation/barrierfree/accessibility/frameworks/aafwk/include", "${AAMS_FRAMEWORKS_PATH}/aafwk/include",
"//foundation/barrierfree/accessibility/frameworks/acfwk/include", "${AAMS_FRAMEWORKS_PATH}/acfwk/include",
"//foundation/barrierfree/accessibility/frameworks/asacfwk/include", "${AAMS_FRAMEWORKS_PATH}/asacfwk/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk/include", "${AAMS_INTERFACES_PATH}/innerkits/aafwk/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk/include", "${AAMS_INTERFACES_PATH}/innerkits/acfwk/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk/include", "${AAMS_INTERFACES_PATH}/innerkits/asacfwk/include",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common/include", "${AAMS_INTERFACES_PATH}/innerkits/common/include",
"//foundation/barrierfree/accessibility/services/aams/include", "../aams/include",
"//foundation/barrierfree/accessibility/services/test/mock", "mock",
"//foundation/barrierfree/accessibility/services/test/mock/common", "./mock/common",
"//foundation/barrierfree/accessibility/util/include",
"//base/account/os_account/frameworks/common/account_error/include",
"//base/account/os_account/frameworks/common/database/include",
"//base/account/os_account/interfaces/innerkits/domain_account/native/include",
"//base/account/os_account/interfaces/innerkits/osaccount/native/include",
"//base/global/resource_management/interfaces/inner_api/include",
"//base/notification/common_event_service/interfaces/inner_api",
"//foundation",
"${ability_runtime_path}/interfaces/kits/native/ability/native/", "${ability_runtime_path}/interfaces/kits/native/ability/native/",
"${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime",
"${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
@ -55,25 +47,10 @@ config("module_private_config") {
"${ability_runtime_inner_api_path}/ability_manager/include", "${ability_runtime_inner_api_path}/ability_manager/include",
"${ability_runtime_inner_api_path}/app_manager/include/appmgr", "${ability_runtime_inner_api_path}/app_manager/include/appmgr",
"${ability_runtime_services_path}/abilitymgr/include", "${ability_runtime_services_path}/abilitymgr/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include/bundlemgr",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
"//foundation/multimedia/image_framework/interfaces/kits/native/include",
"//foundation/multimodalinput/input/util/common/include",
"//foundation/window/window_manager/dm/include",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/utils/include",
"//third_party/json/include",
"//third_party/jsoncpp/include",
"//third_party/jsoncpp/include/json",
"//commonlibrary/c_utils/base/include",
"//utils/system/safwk/native/include",
"mock/aafwk/include", "mock/aafwk/include",
"${AAMS_FOUNDATION_PATH}/window/window_manager/utils/include",
] ]
defines = [ defines = [
"AAMS_LOG_TAG = \"accessibility_test\"", "AAMS_LOG_TAG = \"accessibility_test\"",
"AAMS_LOG_DOMAIN = 0xD001D05", "AAMS_LOG_DOMAIN = 0xD001D05",
@ -87,6 +64,7 @@ ohos_moduletest("aams_accessibility_touch_guider_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"../../frameworks/common/src/accessibility_window_info.cpp",
"../aams/src/accessibility_account_data.cpp", "../aams/src/accessibility_account_data.cpp",
"../aams/src/accessibility_common_event.cpp", "../aams/src/accessibility_common_event.cpp",
"../aams/src/accessibility_display_manager.cpp", "../aams/src/accessibility_display_manager.cpp",
@ -109,21 +87,20 @@ ohos_moduletest("aams_accessibility_touch_guider_test") {
"../aams/src/accessible_ability_manager_service.cpp", "../aams/src/accessible_ability_manager_service.cpp",
"../aams/src/accessible_ability_manager_service_event_handler.cpp", "../aams/src/accessible_ability_manager_service_event_handler.cpp",
"../aams/src/utils.cpp", "../aams/src/utils.cpp",
"//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_window_info.cpp", "./mock/mock_ability_connect_callback_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_ability_connect_callback_stub.cpp", "./mock/mock_ability_manager_client.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_ability_manager_client.cpp", "./mock/mock_accessibility_element_operator_impl.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessibility_element_operator_impl.cpp", "./mock/mock_accessibility_element_operator_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessibility_element_operator_proxy.cpp", "./mock/mock_accessible_ability_client_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_client_proxy.cpp", "./mock/mock_accessible_ability_manager_service_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_manager_service_stub.cpp", "./mock/mock_bundle_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_bundle_manager.cpp", "./mock/mock_bundle_mgr_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_bundle_mgr_proxy.cpp", "./mock/mock_display.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", "./mock/mock_display_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", "./mock/mock_os_account_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", "./mock/mock_parameter.c",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "./mock/mock_service_registry.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", "./mock/mock_system_ability.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp",
"moduletest/aamstest/aams_accessibility_touch_guider_test/aams_accessibility_touch_guider_test.cpp", "moduletest/aamstest/aams_accessibility_touch_guider_test/aams_accessibility_touch_guider_test.cpp",
] ]
sources += aams_mock_distributeddatamgr_src sources += aams_mock_distributeddatamgr_src
@ -133,14 +110,14 @@ ohos_moduletest("aams_accessibility_touch_guider_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gmock_main", "../../common/interface:accessibility_interface",
"//third_party/googletest:gtest_main", "../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [
@ -188,20 +165,20 @@ ohos_moduletest("aams_accessibility_touchEvent_injector_test") {
"../aams/src/accessible_ability_manager_service.cpp", "../aams/src/accessible_ability_manager_service.cpp",
"../aams/src/accessible_ability_manager_service_event_handler.cpp", "../aams/src/accessible_ability_manager_service_event_handler.cpp",
"../aams/src/utils.cpp", "../aams/src/utils.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_ability_connect_callback_stub.cpp", "./mock/mock_ability_connect_callback_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_ability_manager_client.cpp", "./mock/mock_ability_manager_client.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessibility_element_operator_impl.cpp", "./mock/mock_accessibility_element_operator_impl.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessibility_element_operator_proxy.cpp", "./mock/mock_accessibility_element_operator_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_client_proxy.cpp", "./mock/mock_accessible_ability_client_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_manager_service_stub.cpp", "./mock/mock_accessible_ability_manager_service_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_bundle_manager.cpp", "./mock/mock_bundle_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_bundle_mgr_proxy.cpp", "./mock/mock_bundle_mgr_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", "./mock/mock_display.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", "./mock/mock_display_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", "./mock/mock_os_account_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "./mock/mock_parameter.c",
"//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", "./mock/mock_service_registry.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", "./mock/mock_system_ability.cpp",
"moduletest/aamstest/aams_accessibility_touchEvent_injector_test/aams_accessibility_touchEvent_injector_test.cpp", "moduletest/aamstest/aams_accessibility_touchEvent_injector_test/aams_accessibility_touchEvent_injector_test.cpp",
] ]
@ -212,14 +189,14 @@ ohos_moduletest("aams_accessibility_touchEvent_injector_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gmock_main", "../../common/interface:accessibility_interface",
"//third_party/googletest:gtest_main", "../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [
@ -267,26 +244,26 @@ ohos_moduletest("aams_accessible_ability_channel_test") {
"../aams/src/accessible_ability_manager_service.cpp", "../aams/src/accessible_ability_manager_service.cpp",
"../aams/src/accessible_ability_manager_service_event_handler.cpp", "../aams/src/accessible_ability_manager_service_event_handler.cpp",
"../aams/src/utils.cpp", "../aams/src/utils.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_ability_connect_callback_stub.cpp", "./mock/mock_ability_connect_callback_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_ability_manager_client.cpp", "./mock/mock_ability_manager_client.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessibility_element_operator_impl.cpp", "./mock/mock_accessibility_element_operator_impl.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessibility_element_operator_proxy.cpp", "./mock/mock_accessibility_element_operator_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_client_proxy.cpp", "./mock/mock_accessible_ability_client_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_manager_service_stub.cpp", "./mock/mock_accessible_ability_manager_service_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_bundle_manager.cpp", "./mock/mock_bundle_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_bundle_mgr_proxy.cpp", "./mock/mock_bundle_mgr_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_data.cpp", "./mock/mock_common_event_data.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_manager.cpp", "./mock/mock_common_event_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_subscribe_info.cpp", "./mock/mock_common_event_subscribe_info.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_subscriber.cpp", "./mock/mock_common_event_subscriber.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_support.cpp", "./mock/mock_common_event_support.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", "./mock/mock_display.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", "./mock/mock_display_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_matching_skill.cpp", "./mock/mock_matching_skill.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", "./mock/mock_os_account_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "./mock/mock_parameter.c",
"//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", "./mock/mock_service_registry.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", "./mock/mock_system_ability.cpp",
"moduletest/aamstest/aams_accessible_ability_channel_test/aams_accessible_ability_channel_test.cpp", "moduletest/aamstest/aams_accessible_ability_channel_test/aams_accessible_ability_channel_test.cpp",
] ]
@ -297,14 +274,14 @@ ohos_moduletest("aams_accessible_ability_channel_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gmock_main", "../../common/interface:accessibility_interface",
"//third_party/googletest:gtest_main", "../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [
@ -351,24 +328,24 @@ ohos_moduletest("aams_server_test") {
"../aams/src/accessible_ability_manager_service.cpp", "../aams/src/accessible_ability_manager_service.cpp",
"../aams/src/accessible_ability_manager_service_event_handler.cpp", "../aams/src/accessible_ability_manager_service_event_handler.cpp",
"../aams/src/utils.cpp", "../aams/src/utils.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_ability_connect_callback_stub.cpp", "./mock/mock_ability_connect_callback_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_ability_manager_client.cpp", "./mock/mock_ability_manager_client.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_client_proxy.cpp", "./mock/mock_accessible_ability_client_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_manager_service_stub.cpp", "./mock/mock_accessible_ability_manager_service_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_bundle_manager.cpp", "./mock/mock_bundle_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_bundle_mgr_proxy.cpp", "./mock/mock_bundle_mgr_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_data.cpp", "./mock/mock_common_event_data.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_manager.cpp", "./mock/mock_common_event_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_subscribe_info.cpp", "./mock/mock_common_event_subscribe_info.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_subscriber.cpp", "./mock/mock_common_event_subscriber.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_support.cpp", "./mock/mock_common_event_support.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", "./mock/mock_display.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", "./mock/mock_display_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_matching_skill.cpp", "./mock/mock_matching_skill.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", "./mock/mock_os_account_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "./mock/mock_parameter.c",
"//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", "./mock/mock_service_registry.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", "./mock/mock_system_ability.cpp",
"moduletest/aamstest/aams_server_test/aams_server_test.cpp", "moduletest/aamstest/aams_server_test/aams_server_test.cpp",
] ]
@ -379,14 +356,14 @@ ohos_moduletest("aams_server_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gmock_main", "../../common/interface:accessibility_interface",
"//third_party/googletest:gtest_main", "../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [
@ -433,18 +410,18 @@ ohos_moduletest("aams_accessibility_keyevent_filter_test") {
"../aams/src/accessible_ability_manager_service.cpp", "../aams/src/accessible_ability_manager_service.cpp",
"../aams/src/accessible_ability_manager_service_event_handler.cpp", "../aams/src/accessible_ability_manager_service_event_handler.cpp",
"../aams/src/utils.cpp", "../aams/src/utils.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_ability_connect_callback_stub.cpp", "./mock/mock_ability_connect_callback_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_ability_manager_client.cpp", "./mock/mock_ability_manager_client.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_client_proxy.cpp", "./mock/mock_accessible_ability_client_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_manager_service_stub.cpp", "./mock/mock_accessible_ability_manager_service_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_bundle_manager.cpp", "./mock/mock_bundle_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_bundle_mgr_proxy.cpp", "./mock/mock_bundle_mgr_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", "./mock/mock_display.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", "./mock/mock_display_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", "./mock/mock_os_account_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "./mock/mock_parameter.c",
"//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", "./mock/mock_service_registry.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", "./mock/mock_system_ability.cpp",
"moduletest/aamstest/aams_accessibility_keyevent_filter_test/aams_accessibility_keyevent_filter_test.cpp", "moduletest/aamstest/aams_accessibility_keyevent_filter_test/aams_accessibility_keyevent_filter_test.cpp",
] ]
@ -455,14 +432,14 @@ ohos_moduletest("aams_accessibility_keyevent_filter_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gmock_main", "../../common/interface:accessibility_interface",
"//third_party/googletest:gtest_main", "../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [
@ -488,11 +465,11 @@ ohos_moduletest("aams_common_event_registry_test") {
module_out_path = module_output_path module_out_path = module_output_path
sources = [ sources = [
"../aams/src//accessibility_event_transmission.cpp",
"../aams/src/accessibility_account_data.cpp", "../aams/src/accessibility_account_data.cpp",
"../aams/src/accessibility_common_event.cpp", "../aams/src/accessibility_common_event.cpp",
"../aams/src/accessibility_display_manager.cpp", "../aams/src/accessibility_display_manager.cpp",
"../aams/src/accessibility_dumper.cpp", "../aams/src/accessibility_dumper.cpp",
"../aams/src/accessibility_event_transmission.cpp",
"../aams/src/accessibility_gesture_recognizer.cpp", "../aams/src/accessibility_gesture_recognizer.cpp",
"../aams/src/accessibility_input_interceptor.cpp", "../aams/src/accessibility_input_interceptor.cpp",
"../aams/src/accessibility_keyevent_filter.cpp", "../aams/src/accessibility_keyevent_filter.cpp",
@ -510,24 +487,24 @@ ohos_moduletest("aams_common_event_registry_test") {
"../aams/src/accessible_ability_manager_service.cpp", "../aams/src/accessible_ability_manager_service.cpp",
"../aams/src/accessible_ability_manager_service_event_handler.cpp", "../aams/src/accessible_ability_manager_service_event_handler.cpp",
"../aams/src/utils.cpp", "../aams/src/utils.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_ability_connect_callback_stub.cpp", "./mock/mock_ability_connect_callback_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_ability_manager_client.cpp", "./mock/mock_ability_manager_client.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_client_proxy.cpp", "./mock/mock_accessible_ability_client_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_manager_service_stub.cpp", "./mock/mock_accessible_ability_manager_service_stub.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_bundle_manager.cpp", "./mock/mock_bundle_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_bundle_mgr_proxy.cpp", "./mock/mock_bundle_mgr_proxy.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_data.cpp", "./mock/mock_common_event_data.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_manager.cpp", "./mock/mock_common_event_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_subscribe_info.cpp", "./mock/mock_common_event_subscribe_info.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_subscriber.cpp", "./mock/mock_common_event_subscriber.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_support.cpp", "./mock/mock_common_event_support.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", "./mock/mock_display.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", "./mock/mock_display_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_matching_skill.cpp", "./mock/mock_matching_skill.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", "./mock/mock_os_account_manager.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "./mock/mock_parameter.c",
"//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", "./mock/mock_service_registry.cpp",
"//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", "./mock/mock_system_ability.cpp",
"moduletest/aamstest/aams_common_event_registry_test/aams_common_event_registry_test.cpp", "moduletest/aamstest/aams_common_event_registry_test/aams_common_event_registry_test.cpp",
] ]
@ -538,14 +515,14 @@ ohos_moduletest("aams_common_event_registry_test") {
configs = [ configs = [
":module_private_config", ":module_private_config",
"//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", "../../resources/config/build:coverage_flags",
] ]
deps = [ deps = [
"//foundation/barrierfree/accessibility/common/interface:accessibility_interface", "../../../../../third_party/googletest:gmock_main",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", "../../../../../third_party/googletest:gtest_main",
"//third_party/googletest:gmock_main", "../../common/interface:accessibility_interface",
"//third_party/googletest:gtest_main", "../../interfaces/innerkits/common:accessibility_common",
] ]
external_deps = [ external_deps = [

View File

@ -17,15 +17,51 @@ ability_runtime_inner_api_path = "${ability_runtime_path}/interfaces/inner_api"
ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits" ability_runtime_kits_path = "${ability_runtime_path}/frameworks/kits"
ability_runtime_services_path = "${ability_runtime_path}/services" ability_runtime_services_path = "${ability_runtime_path}/services"
AAMS_MOCK_PATH = "//foundation/barrierfree/accessibility/services/test/mock" AAMS_MOCK_PATH = "//foundation/barrierfree/accessibility/services/test/mock"
AAMS_FRAMEWORKS_PATH = "//foundation/barrierfree/accessibility/frameworks"
AAMS_INTERFACES_PATH = "//foundation/barrierfree/accessibility/interfaces"
AAMS_SERVICES_PATH = "//foundation/barrierfree/accessibility/services"
AAMS_COMMON_PATH = "//foundation/barrierfree/accessibility/common"
AAMS_FOUNDATION_PATH = "//foundation"
aams_mock_include_dirs = [ aams_mock_include_dirs = [
"$AAMS_MOCK_PATH/distributeddatamgr/include", "$AAMS_MOCK_PATH/distributeddatamgr/include",
"$AAMS_MOCK_PATH/multimodalinput/include", "$AAMS_MOCK_PATH/multimodalinput/include",
"$AAMS_MOCK_PATH/powermanager/include", "$AAMS_MOCK_PATH/powermanager/include",
"//base/account/os_account/frameworks/common/account_error/include",
"//base/account/os_account/frameworks/common/database/include",
"//base/account/os_account/interfaces/innerkits/domain_account/native/include",
"//base/account/os_account/interfaces/innerkits/osaccount/native/include",
"//base/global/resource_management/interfaces/inner_api/include",
"//base/hiviewdfx/hiview/adapter/utility/include/extra/singleton.h",
"//base/notification/common_event_service/interfaces/inner_api",
"//base/notification/eventhandler/interfaces/inner_api",
"//base/powermgr/display_manager/utils/native/include",
"//foundation",
"//foundation/arkui/napi/native_engine",
"//foundation/distributeddatamgr/preferences/interfaces/inner_api/include", "//foundation/distributeddatamgr/preferences/interfaces/inner_api/include",
"//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include", "//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include",
"//foundation/multimodalinput/input/interfaces/native/innerkits/event/include", "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
"//base/powermgr/power_manager/interfaces/inner_api/native/include", "//base/powermgr/power_manager/interfaces/inner_api/native/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include",
"//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_core/include/bundlemgr",
"//foundation/systemabilitymgr/safwk/interfaces/innerkits/safwk",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_base/include",
"//foundation/multimedia/image_framework/interfaces/kits/native/include",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//foundation/multimodalinput/input/util/common/include",
"//foundation/window/window_manager/dm/include",
"//foundation/window/window_manager/interfaces/innerkits",
"//foundation/window/window_manager/interfaces/innerkits/dm",
"//foundation/window/window_manager/interfaces/innerkits/wm",
"//foundation/window/window_manager/utils/include",
"//third_party/json/include",
"//third_party/jsoncpp/include",
"//third_party/jsoncpp/include/json",
"//commonlibrary/c_utils/base/include",
"//utils/system/safwk/native/include",
] ]
aams_mock_distributeddatamgr_src = aams_mock_distributeddatamgr_src =