From ff0907865860c35c3d30e661400f1635effbb71f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cz30030935=E2=80=9D?= <“zhanghuiyu9@huawei.com”> Date: Fri, 28 Apr 2023 15:33:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E8=A7=84=E8=8C=83=E6=95=B4?= =?UTF-8?q?=E6=94=B9=20Signed-off-by:=20zhanghuiyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- accessibility_aafwk.gni | 7 +- bundle.json | 6 +- common/interface/BUILD.gn | 8 +- frameworks/aafwk/test/BUILD.gn | 155 +++--- frameworks/acfwk/test/BUILD.gn | 38 +- frameworks/asacfwk/test/BUILD.gn | 37 +- frameworks/common/test/BUILD.gn | 16 +- interfaces/innerkits/aafwk/BUILD.gn | 12 +- interfaces/innerkits/acfwk/BUILD.gn | 11 +- interfaces/innerkits/asacfwk/BUILD.gn | 10 +- interfaces/innerkits/common/BUILD.gn | 7 +- .../accessibility_config_test/BUILD.gn | 8 +- .../BUILD.gn | 2 +- .../accessible_ability_client_test/BUILD.gn | 2 +- .../accessibilityconfig_fuzzer/BUILD.gn | 12 +- .../BUILD.gn | 10 +- .../accessibleabilityclient_fuzzer/BUILD.gn | 6 +- interfaces/kits/napi/BUILD.gn | 24 +- .../kits/napi/accessibility_config/BUILD.gn | 10 +- .../napi/accessibility_extension/BUILD.gn | 3 +- .../accessibility_extension_context/BUILD.gn | 3 +- .../BUILD.gn | 10 +- .../src/napi_accessibility_extension.cpp | 5 +- .../napi/accessibility_gesture_path/BUILD.gn | 8 +- .../napi/accessibility_gesture_point/BUILD.gn | 8 +- services/aams/BUILD.gn | 10 +- services/aams/test/BUILD.gn | 465 ++++++++++++------ services/etc/BUILD.gn | 3 +- services/test/BUILD.gn | 309 ++++++------ services/test/aamstestmock.gni | 36 ++ 30 files changed, 688 insertions(+), 553 deletions(-) diff --git a/accessibility_aafwk.gni b/accessibility_aafwk.gni index 820bd44a..53172603 100644 --- a/accessibility_aafwk.gni +++ b/accessibility_aafwk.gni @@ -11,8 +11,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -ability_base_path = "//foundation/ability/ability_base" -ability_runtime_path = "//foundation/ability/ability_runtime" +ability_base_path = "../../ability/ability_base" +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_kits_path = "${ability_runtime_path}/frameworks/kits" ability_runtime_services_path = "${ability_runtime_path}/services" diff --git a/bundle.json b/bundle.json index 95c84156..01038497 100644 --- a/bundle.json +++ b/bundle.json @@ -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.", - "version": "3.1.0", + "version": "4.0", "repository": "", "license": "Apache License 2.0", "publishAs": "code-segment", @@ -66,7 +66,7 @@ "//foundation/barrierfree/accessibility/services/etc:ohos.para.dac" ] }, - "inner_kits": [ + "inner_api": [ { "type": "so", "name": "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability", diff --git a/common/interface/BUILD.gn b/common/interface/BUILD.gn index 543dbb81..f7ffd252 100644 --- a/common/interface/BUILD.gn +++ b/common/interface/BUILD.gn @@ -18,7 +18,7 @@ config("accessibility_interface_private_config") { include_dirs = [ "include/parcel", - "//foundation/barrierfree/accessibility/common/log/include", + "../log/include", ] defines = [ @@ -34,7 +34,7 @@ config("accessibility_interface_private_config") { config("accessibility_interface_public_config") { include_dirs = [ "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 configs = [ ":accessibility_interface_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../resources/config/build:coverage_flags", ] public_configs = [ ":accessibility_interface_public_config" ] - deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ] + deps = [ "../../interfaces/innerkits/common:accessibility_common" ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/frameworks/aafwk/test/BUILD.gn b/frameworks/aafwk/test/BUILD.gn index b89b5d4f..f0a13d54 100755 --- a/frameworks/aafwk/test/BUILD.gn +++ b/frameworks/aafwk/test/BUILD.gn @@ -12,14 +12,14 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/barrierfree/accessibility/services/test/aamstestmock.gni") +import("../../../services/test/aamstestmock.gni") module_output_path = "accessibility/framework_test" ############################################################################### config("module_private_config") { 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 = [] if (target_cpu == "arm") { cflags += [ "-DBINDER_IPC_32BIT" ] @@ -27,45 +27,23 @@ config("module_private_config") { include_dirs = aams_mock_include_dirs include_dirs += [ "${ability_runtime_inner_api_path}/ability_manager/include", - "//foundation/barrierfree/accessibility/common/log/include", - "//foundation/barrierfree/accessibility/frameworks/aafwk/include", - "//foundation/barrierfree/accessibility/frameworks/aafwk/test/mock/include", - "//foundation/barrierfree/accessibility/frameworks/acfwk/include", - "//foundation/barrierfree/accessibility/frameworks/asacfwk/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common/include", - "//foundation/barrierfree/accessibility/services/aams/include", - "//foundation/barrierfree/accessibility/common/interface/include", - "//foundation/barrierfree/accessibility/common/interface/include", - "//foundation/barrierfree/accessibility/common/interface/include/parcel", - "//foundation/barrierfree/accessibility/common/interface/include/parcel", - "//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", + "../../../common/log/include", + "../include", + "./mock/include", + "../../acfwk/include", + "../../asacfwk/include", + "../../../interfaces/innerkits/aafwk/include", + "../../../interfaces/innerkits/acfwk/include", + "../../../interfaces/innerkits/asacfwk/include", + "../../../interfaces/innerkits/common/include", + "../../../services/aams/include", + "../../../common/interface/include", + "../../../common/interface/include/parcel", + "../../../services/test/mock/common", + "../../../services/test/mock/include/extern", + "../../../services/aams/test/mock/include", ] + defines = [ "AAMS_LOG_TAG = \"accessibility_test\"", "AAMS_LOG_DOMAIN = 0xD001D05", @@ -76,26 +54,26 @@ config("module_private_config") { ohos_unittest("accessibility_ui_test_ability_impl_test") { module_out_path = module_output_path 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", "./mock/src/mock_accessible_ability_client_impl.cpp", - "//foundation/barrierfree/accessibility/frameworks/aafwk/test/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", + "./mock/src/mock_accessible_ability_listener.cpp", "unittest/accessibility_ui_test_ability_impl_test.cpp", ] sources += aams_mock_multimodalinput_src configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", ] external_deps = [ @@ -107,6 +85,7 @@ ohos_unittest("accessibility_ui_test_ability_impl_test") { "init:libbeget_proxy", "init:libbegetutil", "ipc:ipc_core", + "os_account:domain_account_innerkits", "samgr:samgr_proxy", ] } @@ -115,43 +94,43 @@ ohos_unittest("accessibility_ui_test_ability_impl_test") { ohos_unittest("accessible_ability_test") { module_out_path = module_output_path 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_ui_test_ability_impl.cpp", "../src/accessible_ability_channel_client.cpp", "../src/accessible_ability_client_impl.cpp", - "//foundation/barrierfree/accessibility/common/interface/src/accessibility_element_operator_callback_stub.cpp", - "//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_client_stub.cpp", - "//foundation/barrierfree/accessibility/common/interface/src/accessible_ability_manager_service_proxy.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", + "./mock/src/mock_accessible_ability_channel_proxy.cpp", + "./mock/src/mock_accessible_ability_channel_stub.cpp", + "./mock/src/mock_accessible_ability_listener.cpp", "unittest/accessibility_element_operator_callback_impl_test.cpp", "unittest/accessible_ability_channel_client_test.cpp", "unittest/accessible_ability_client_impl_test.cpp", @@ -160,14 +139,14 @@ ohos_unittest("accessible_ability_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", ] external_deps = [ @@ -180,9 +159,11 @@ ohos_unittest("accessible_ability_test") { "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "os_account:domain_account_innerkits", "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm", + "window_manager:libwm", ] } diff --git a/frameworks/acfwk/test/BUILD.gn b/frameworks/acfwk/test/BUILD.gn index 9bb1ed99..17e4c349 100644 --- a/frameworks/acfwk/test/BUILD.gn +++ b/frameworks/acfwk/test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/barrierfree/accessibility/accessibility_aafwk.gni") +import("../../../accessibility_aafwk.gni") 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/kits/native/uri/include", "${ability_base_path}/interfaces/kits/native/want/include", - "//base/notification/common_event_service/interfaces/inner_api", - "//foundation/barrierfree/accessibility/services/interface/include", - "//foundation/barrierfree/accessibility/frameworks/acfwk/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk/include", - "//foundation/barrierfree/accessibility/services/aams/test/mock/include", - "//foundation/barrierfree/accessibility/services/test/mock", - "//foundation/barrierfree/accessibility/common/log/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", - "//third_party/json/include", + "${ability_out_base_path}/notification/common_event_service/interfaces/inner_api", + "${ability_json_path}/notification/common_event_service/interfaces/inner_api", + "../../../services/interface/include", + "../include", + "../../../interfaces/innerkits/acfwk/include", + "../../../services/aams/test/mock/include", + "../../../services/test/mock", + "../../../common/log/include", ] + defines = [ "AAMS_LOG_TAG = \"accessibility_test\"", "AAMS_LOG_DOMAIN = 0xD001D05", @@ -49,27 +47,29 @@ config("module_private_config") { ohos_unittest("ac_unit_test") { module_out_path = module_output_path sources = [ + "../../../services/test/mock/mock_accessible_ability_manager_service_stub.cpp", + "../../../services/test/mock/mock_parameter.c", "../src/accessibility_config.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", "unittest/accessibility_config_impl_test.cpp", ] configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", ] external_deps = [ + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "c_utils:utils", "display_manager:displaymgr", "eventhandler:libeventhandler", diff --git a/frameworks/asacfwk/test/BUILD.gn b/frameworks/asacfwk/test/BUILD.gn index b709f57f..92a7c72c 100644 --- a/frameworks/asacfwk/test/BUILD.gn +++ b/frameworks/asacfwk/test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/barrierfree/accessibility/accessibility_aafwk.gni") +import("../../../accessibility_aafwk.gni") module_output_path = "accessibility/framework_test" @@ -24,14 +24,14 @@ config("module_private_config") { cflags += [ "-DBINDER_IPC_32BIT" ] } include_dirs = [ - "//foundation/barrierfree/accessibility/common/log/include", - "//foundation/barrierfree/accessibility/frameworks/aafwk/include", - "//foundation/barrierfree/accessibility/frameworks/acfwk/include", - "//foundation/barrierfree/accessibility/frameworks/asacfwk/include", - "//foundation/barrierfree/accessibility/frameworks/asacfwk/test/mock/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk/include", - "//foundation/barrierfree/accessibility/services/test/mock/common", + "../../../common/log/include", + "../../aafwk/include", + "../../acfwk/include", + "../../asacfwk/include", + "../../asacfwk/test/mock/include", + "../../../interfaces/innerkits/acfwk/include", + "../../../interfaces/innerkits/asacfwk/include", + "../../../services/test/mock/common", ] defines = [ "AAMS_LOG_DOMAIN = 0xD001D05", @@ -42,32 +42,33 @@ config("module_private_config") { ohos_unittest("asac_unit_test") { module_out_path = module_output_path 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_service_registry.cpp", + "../../aafwk/src/accessibility_element_operator_callback_impl.cpp", "../src/accessibility_element_operator_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_system_ability_client_impl_test.cpp", ] configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", ] external_deps = [ "ability_base:want", "ability_runtime:ability_manager", + "bundle_framework:appexecfwk_base", "c_utils:utils", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", diff --git a/frameworks/common/test/BUILD.gn b/frameworks/common/test/BUILD.gn index bdd111f7..efae492c 100644 --- a/frameworks/common/test/BUILD.gn +++ b/frameworks/common/test/BUILD.gn @@ -23,8 +23,8 @@ config("module_private_config") { cflags += [ "-DBINDER_IPC_32BIT" ] } include_dirs = [ - "//foundation/barrierfree/accessibility/common/log/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common/include", + "../../../common/log/include", + "../../../interfaces/innerkits/common/include", ] defines = [ "AAMS_LOG_TAG = \"accessibility_test\"", @@ -35,8 +35,8 @@ config("module_private_config") { ohos_unittest("accessibility_common_test") { module_out_path = module_output_path sources = [ - "//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_element_info.cpp", - "//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_event_info.cpp", + "../src/accessibility_element_info.cpp", + "../src/accessibility_event_info.cpp", "unittest/accessibility_ability_info_test.cpp", "unittest/accessibility_element_info_test.cpp", "unittest/accessibility_event_info_test.cpp", @@ -45,13 +45,13 @@ ohos_unittest("accessibility_common_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../interfaces/innerkits/common:accessibility_common", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] diff --git a/interfaces/innerkits/aafwk/BUILD.gn b/interfaces/innerkits/aafwk/BUILD.gn index efa91bd6..6b111cf0 100644 --- a/interfaces/innerkits/aafwk/BUILD.gn +++ b/interfaces/innerkits/aafwk/BUILD.gn @@ -12,16 +12,16 @@ # limitations under the License. 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") { visibility = [ ":*" ] include_dirs = [ "${aafwk_path}/include", - "//foundation/barrierfree/accessibility/common/log/include", + "../../../common/log/include", ] defines = [ @@ -48,10 +48,10 @@ ohos_shared_library("accessibleability") { public_configs = [ ":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 = [ "c_utils:utils", @@ -64,7 +64,7 @@ ohos_shared_library("accessibleability") { "samgr:samgr_proxy", ] - public_deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ] + public_deps = [ "../common:accessibility_common" ] innerapi_tags = [ "platformsdk" ] install_enable = true diff --git a/interfaces/innerkits/acfwk/BUILD.gn b/interfaces/innerkits/acfwk/BUILD.gn index 65171f8c..7b0c7b9c 100755 --- a/interfaces/innerkits/acfwk/BUILD.gn +++ b/interfaces/innerkits/acfwk/BUILD.gn @@ -13,14 +13,14 @@ import("//build/ohos.gni") -acfwk_path = "//foundation/barrierfree/accessibility/frameworks/acfwk" +acfwk_path = "../../../frameworks/acfwk" config("accessibilityconfig_private_config") { visibility = [ ":*" ] include_dirs = [ "${acfwk_path}/include", - "//foundation/barrierfree/accessibility/common/log/include", + "../../../common/log/include", ] defines = [ @@ -44,14 +44,14 @@ ohos_shared_library("accessibilityconfig") { version_script = "libaccessibility_acfwk.map" configs = [ ":accessibilityconfig_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] 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 = [ "c_utils:utils", @@ -59,6 +59,7 @@ ohos_shared_library("accessibilityconfig") { "hiviewdfx_hilog_native:libhilog", "init:libbeget_proxy", "init:libbegetutil", + "input:libmmi-client", "ipc:ipc_single", "napi:ace_napi", "samgr:samgr_proxy", diff --git a/interfaces/innerkits/asacfwk/BUILD.gn b/interfaces/innerkits/asacfwk/BUILD.gn index 834c677b..6d07c218 100644 --- a/interfaces/innerkits/asacfwk/BUILD.gn +++ b/interfaces/innerkits/asacfwk/BUILD.gn @@ -13,14 +13,14 @@ import("//build/ohos.gni") -asacfwk_path = "//foundation/barrierfree/accessibility/frameworks/asacfwk" +asacfwk_path = "../../../frameworks/asacfwk" config("accessibilityclient_private_config") { visibility = [ ":*" ] include_dirs = [ "${asacfwk_path}/include", - "//foundation/barrierfree/accessibility/common/log/include", + "../../../common/log/include", ] defines = [ @@ -43,14 +43,14 @@ ohos_shared_library("accessibilityclient") { version_script = "libaccessibility_asacfwk.map" configs = [ ":accessibilityclient_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] 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 = [ "c_utils:utils", diff --git a/interfaces/innerkits/common/BUILD.gn b/interfaces/innerkits/common/BUILD.gn index a601382a..ead1124a 100644 --- a/interfaces/innerkits/common/BUILD.gn +++ b/interfaces/innerkits/common/BUILD.gn @@ -13,13 +13,12 @@ import("//build/ohos.gni") -accessibility_common_path = - "//foundation/barrierfree/accessibility/frameworks/common" +accessibility_common_path = "../../../frameworks/common" config("accessibility_common_private_config") { visibility = [ ":*" ] - include_dirs = [ "//foundation/barrierfree/accessibility/common/log/include" ] + include_dirs = [ "../../../common/log/include" ] defines = [ "AAMS_LOG_TAG = \"accessibility_common\"", @@ -47,7 +46,7 @@ ohos_shared_library("accessibility_common") { version_script = "libaccessibility_common.map" configs = [ ":accessibility_common_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] public_configs = [ ":accessibility_common_public_config" ] diff --git a/interfaces/innerkits/test/benchmarktest/accessibility_config_test/BUILD.gn b/interfaces/innerkits/test/benchmarktest/accessibility_config_test/BUILD.gn index 4bd780f0..2f5fb2f1 100644 --- a/interfaces/innerkits/test/benchmarktest/accessibility_config_test/BUILD.gn +++ b/interfaces/innerkits/test/benchmarktest/accessibility_config_test/BUILD.gn @@ -22,13 +22,11 @@ ohos_benchmarktest("BenchmarkTestForAccessibilityConfig") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ - "//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", - ] + deps = [ "../../../acfwk:accessibilityconfig" ] external_deps = [ "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "c_utils:utils", ] } diff --git a/interfaces/innerkits/test/benchmarktest/accessibility_system_ability_client_test/BUILD.gn b/interfaces/innerkits/test/benchmarktest/accessibility_system_ability_client_test/BUILD.gn index 3ce2d739..d5c98e71 100644 --- a/interfaces/innerkits/test/benchmarktest/accessibility_system_ability_client_test/BUILD.gn +++ b/interfaces/innerkits/test/benchmarktest/accessibility_system_ability_client_test/BUILD.gn @@ -21,7 +21,7 @@ ohos_benchmarktest("BenchmarkTestForAccessibilitySystemAbilityClient") { cflags += [ "-DBINDER_IPC_32BIT" ] } sources = [ "accessibility_system_ability_client_test.cpp" ] - deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk:accessibilityclient" ] + deps = [ "../../../asacfwk:accessibilityclient" ] } group("benchmarktest") { diff --git a/interfaces/innerkits/test/benchmarktest/accessible_ability_client_test/BUILD.gn b/interfaces/innerkits/test/benchmarktest/accessible_ability_client_test/BUILD.gn index b687223b..11659c23 100644 --- a/interfaces/innerkits/test/benchmarktest/accessible_ability_client_test/BUILD.gn +++ b/interfaces/innerkits/test/benchmarktest/accessible_ability_client_test/BUILD.gn @@ -22,7 +22,7 @@ ohos_benchmarktest("BenchmarkTestForAccessibleAbilityClient") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability" ] + deps = [ "../../../aafwk:accessibleability" ] } group("benchmarktest") { diff --git a/interfaces/innerkits/test/fuzztest/accessibilityconfig_fuzzer/BUILD.gn b/interfaces/innerkits/test/fuzztest/accessibilityconfig_fuzzer/BUILD.gn index 59a9c57a..00a220d6 100644 --- a/interfaces/innerkits/test/fuzztest/accessibilityconfig_fuzzer/BUILD.gn +++ b/interfaces/innerkits/test/fuzztest/accessibilityconfig_fuzzer/BUILD.gn @@ -21,17 +21,15 @@ ohos_fuzztest("AccessibilityConfigFuzzTest") { fuzz_config_file = "../../fuzztest/accessibilityconfig_fuzzer" configs = [ - "//foundation/barrierfree/accessibility/interfaces/innerkits/test/fuzztest:configs_cc_ld", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../fuzztest:configs_cc_ld", + "../../../../../resources/config/build:coverage_flags", ] sources = [ "accessibilityconfig_fuzzer.cpp" ] - deps = [ - "//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", - ] + deps = [ "../../../acfwk:accessibilityconfig" ] external_deps = [ "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "c_utils:utils", ] } diff --git a/interfaces/innerkits/test/fuzztest/accessibilitysystemabilityclient_fuzzer/BUILD.gn b/interfaces/innerkits/test/fuzztest/accessibilitysystemabilityclient_fuzzer/BUILD.gn index 32946299..352d4e08 100644 --- a/interfaces/innerkits/test/fuzztest/accessibilitysystemabilityclient_fuzzer/BUILD.gn +++ b/interfaces/innerkits/test/fuzztest/accessibilitysystemabilityclient_fuzzer/BUILD.gn @@ -21,15 +21,15 @@ ohos_fuzztest("AccessibilitySystemAbilityClientFuzzTest") { fuzz_config_file = "../../fuzztest/accessibilitysystemabilityclient_fuzzer" include_dirs = [ - "//foundation/barrierfree/accessibility/common/interface/include", - "//foundation/barrierfree/accessibility/frameworks/asacfwk/include", + "../../../../../common/interface/include", + "../../../../../frameworks/asacfwk/include", ] configs = [ - "//foundation/barrierfree/accessibility/interfaces/innerkits/test/fuzztest:configs_cc_ld", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../fuzztest:configs_cc_ld", + "../../../../../resources/config/build:coverage_flags", ] sources = [ "accessibilitysystemabilityclient_fuzzer.cpp" ] - deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk:accessibilityclient" ] + deps = [ "../../../asacfwk:accessibilityclient" ] external_deps = [ "c_utils:utils" ] } diff --git a/interfaces/innerkits/test/fuzztest/accessibleabilityclient_fuzzer/BUILD.gn b/interfaces/innerkits/test/fuzztest/accessibleabilityclient_fuzzer/BUILD.gn index db10b25c..9e54af90 100644 --- a/interfaces/innerkits/test/fuzztest/accessibleabilityclient_fuzzer/BUILD.gn +++ b/interfaces/innerkits/test/fuzztest/accessibleabilityclient_fuzzer/BUILD.gn @@ -22,11 +22,11 @@ ohos_fuzztest("AccessibleAbilityClientFuzzTest") { include_dirs = [] configs = [ - "//foundation/barrierfree/accessibility/interfaces/innerkits/test/fuzztest:configs_cc_ld", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../fuzztest:configs_cc_ld", + "../../../../../resources/config/build:coverage_flags", ] sources = [ "accessibleabilityclient_fuzzer.cpp" ] - deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability" ] + deps = [ "../../../aafwk:accessibleability" ] external_deps = [ "c_utils:utils" ] } diff --git a/interfaces/kits/napi/BUILD.gn b/interfaces/kits/napi/BUILD.gn index b87ea0a6..b00f53b8 100644 --- a/interfaces/kits/napi/BUILD.gn +++ b/interfaces/kits/napi/BUILD.gn @@ -12,12 +12,12 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/barrierfree/accessibility/accessibility_aafwk.gni") +import("../../../accessibility_aafwk.gni") ohos_shared_library("accessibility") { include_dirs = [ - "//foundation/barrierfree/accessibility/common/log/include", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include", + "../../../common/log/include", + "../../../../../multimodalinput/input/interfaces/native/innerkits/event/include", "./include", ] @@ -32,11 +32,11 @@ ohos_shared_library("accessibility") { "./src/native_module.cpp", ] - configs = [ "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags" ] + configs = [ "../../../resources/config/build:coverage_flags" ] deps = [ - "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk:accessibilityconfig", - "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk:accessibilityclient", + "../../innerkits/acfwk:accessibilityconfig", + "../../innerkits/asacfwk:accessibilityclient", ] external_deps = [ @@ -53,11 +53,11 @@ ohos_shared_library("accessibility") { group("napi_packages") { deps = [ ":accessibility", - "//foundation/barrierfree/accessibility/interfaces/kits/napi/accessibility_config:config_napi", - "//foundation/barrierfree/accessibility/interfaces/kits/napi/accessibility_extension:accessibilityextensionability_napi", - "//foundation/barrierfree/accessibility/interfaces/kits/napi/accessibility_extension_context:accessibilityextensioncontext_napi", - "//foundation/barrierfree/accessibility/interfaces/kits/napi/accessibility_extension_module_loader:accessibility_extension_module", - "//foundation/barrierfree/accessibility/interfaces/kits/napi/accessibility_gesture_path:gesturepath_napi", - "//foundation/barrierfree/accessibility/interfaces/kits/napi/accessibility_gesture_point:gesturepoint_napi", + "accessibility_config:config_napi", + "accessibility_extension:accessibilityextensionability_napi", + "accessibility_extension_context:accessibilityextensioncontext_napi", + "accessibility_extension_module_loader:accessibility_extension_module", + "accessibility_gesture_path:gesturepath_napi", + "accessibility_gesture_point:gesturepoint_napi", ] } diff --git a/interfaces/kits/napi/accessibility_config/BUILD.gn b/interfaces/kits/napi/accessibility_config/BUILD.gn index 8d283846..a4e5901b 100644 --- a/interfaces/kits/napi/accessibility_config/BUILD.gn +++ b/interfaces/kits/napi/accessibility_config/BUILD.gn @@ -15,9 +15,8 @@ import("//build/ohos.gni") ohos_shared_library("config_napi") { include_dirs = [ - "//foundation/barrierfree/accessibility/common/log/include", - "//foundation/barrierfree/accessibility/interfaces/kits/napi/include", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event/include", + "../../../../common/log/include", + "../include", "./include", ] @@ -31,16 +30,17 @@ ohos_shared_library("config_napi") { "./src/native_module.cpp", ] - configs = [ "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags" ] + configs = [ "../../../../resources/config/build:coverage_flags" ] deps = [ + "../../../innerkits/acfwk:accessibilityconfig", "./../../../innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk:accessibilityconfig", ] external_deps = [ "access_token:libtokenid_sdk", "hiviewdfx_hilog_native:libhilog", + "input:libmmi-client", "ipc:ipc_core", "napi:ace_napi", ] diff --git a/interfaces/kits/napi/accessibility_extension/BUILD.gn b/interfaces/kits/napi/accessibility_extension/BUILD.gn index b096ab70..c1b2f37e 100644 --- a/interfaces/kits/napi/accessibility_extension/BUILD.gn +++ b/interfaces/kits/napi/accessibility_extension/BUILD.gn @@ -11,8 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni") import("//build/ohos.gni") +import( + "../../../../../../../arkcompiler/ets_frontend/es2panda/es2abc_config.gni") es2abc_gen_abc("gen_accessibility_extension_abc") { src_js = rebase_path("accessibility_extension.js") diff --git a/interfaces/kits/napi/accessibility_extension_context/BUILD.gn b/interfaces/kits/napi/accessibility_extension_context/BUILD.gn index 0ea32c17..0f9338fb 100644 --- a/interfaces/kits/napi/accessibility_extension_context/BUILD.gn +++ b/interfaces/kits/napi/accessibility_extension_context/BUILD.gn @@ -11,8 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni") import("//build/ohos.gni") +import( + "../../../../../../../arkcompiler/ets_frontend/es2panda/es2abc_config.gni") es2abc_gen_abc("gen_accessibility_extension_context_abc") { src_js = rebase_path("accessibility_extension_context.js") diff --git a/interfaces/kits/napi/accessibility_extension_module_loader/BUILD.gn b/interfaces/kits/napi/accessibility_extension_module_loader/BUILD.gn index a9140a16..34b999f6 100644 --- a/interfaces/kits/napi/accessibility_extension_module_loader/BUILD.gn +++ b/interfaces/kits/napi/accessibility_extension_module_loader/BUILD.gn @@ -17,10 +17,10 @@ config("accessibility_extension_module_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/barrierfree/accessibility/common/log/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk/include", - "//foundation/barrierfree/accessibility/interfaces/kits/napi/accessibility_extension_module_loader/include", - "//foundation/barrierfree/accessibility/interfaces/kits/napi/include", + "../../../../common/log/include", + "../../../innerkits/acfwk/include", + "include", + "../include", ] defines = [ @@ -42,8 +42,8 @@ ohos_shared_library("accessibility_extension_module") { configs = [ ":accessibility_extension_module_config" ] deps = [ + "../../../innerkits/aafwk:accessibleability", "./../../../innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability", ] external_deps = [ diff --git a/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension.cpp b/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension.cpp index 2a436587..25f8597a 100644 --- a/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension.cpp +++ b/interfaces/kits/napi/accessibility_extension_module_loader/src/napi_accessibility_extension.cpp @@ -50,10 +50,7 @@ NAccessibilityExtension::NAccessibilityExtension(AbilityRuntime::JsRuntime& jsRu engine_ = &jsRuntime_.GetNativeEngine(); } -NAccessibilityExtension::~NAccessibilityExtension() -{ - jsRuntime_.FreeNativeReference(std::move(jsObj_)); -} +NAccessibilityExtension::~NAccessibilityExtension() = default; void NAccessibilityExtension::Init(const std::shared_ptr &record, const std::shared_ptr &application, diff --git a/interfaces/kits/napi/accessibility_gesture_path/BUILD.gn b/interfaces/kits/napi/accessibility_gesture_path/BUILD.gn index ffff516a..1fc0a163 100644 --- a/interfaces/kits/napi/accessibility_gesture_path/BUILD.gn +++ b/interfaces/kits/napi/accessibility_gesture_path/BUILD.gn @@ -15,9 +15,9 @@ import("//build/ohos.gni") ohos_shared_library("gesturepath_napi") { include_dirs = [ - "//foundation/barrierfree/accessibility/common/log/include", - "//foundation/barrierfree/accessibility/interfaces/kits/napi/include", - "./include", + "../../../../common/log/include", + "../include", + "include", ] defines = [ @@ -32,7 +32,7 @@ ohos_shared_library("gesturepath_napi") { configs = [] - deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ] + deps = [ "../../../innerkits/common:accessibility_common" ] external_deps = [ "hiviewdfx_hilog_native:libhilog", diff --git a/interfaces/kits/napi/accessibility_gesture_point/BUILD.gn b/interfaces/kits/napi/accessibility_gesture_point/BUILD.gn index b3a7ae66..88ea7ba7 100644 --- a/interfaces/kits/napi/accessibility_gesture_point/BUILD.gn +++ b/interfaces/kits/napi/accessibility_gesture_point/BUILD.gn @@ -15,9 +15,9 @@ import("//build/ohos.gni") ohos_shared_library("gesturepoint_napi") { include_dirs = [ - "//foundation/barrierfree/accessibility/common/log/include", - "//foundation/barrierfree/accessibility/interfaces/kits/napi/include", - "./include", + "../../../../common/log/include", + "../include", + "include", ] defines = [ @@ -32,7 +32,7 @@ ohos_shared_library("gesturepoint_napi") { configs = [] - deps = [ "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common" ] + deps = [ "../../../innerkits/common:accessibility_common" ] external_deps = [ "hiviewdfx_hilog_native:libhilog", diff --git a/services/aams/BUILD.gn b/services/aams/BUILD.gn index 34722b7d..33f53674 100755 --- a/services/aams/BUILD.gn +++ b/services/aams/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") -services_path = "//foundation/barrierfree/accessibility/services/aams" +services_path = "./" ohos_prebuilt_etc("accessibility_service.rc") { source = "etc/accessibility_service.rc" @@ -27,7 +27,7 @@ config("aams_service_config") { include_dirs = [ "include", - "//foundation/barrierfree/accessibility/common/log/include", + "../../common/log/include", ] defines = [ @@ -65,12 +65,12 @@ ohos_shared_library("accessibleabilityms") { sources = accessibleabilityms_files configs = [ ":aams_service_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", + "../../common/interface:accessibility_interface", + "../../interfaces/innerkits/common:accessibility_common", ] external_deps = [ diff --git a/services/aams/test/BUILD.gn b/services/aams/test/BUILD.gn index c4868b7a..e39ea164 100644 --- a/services/aams/test/BUILD.gn +++ b/services/aams/test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/barrierfree/accessibility/services/test/aamstestmock.gni") +import("../../test/aamstestmock.gni") module_output_path = "accessibility/framework_test" @@ -27,26 +27,15 @@ config("module_private_config") { include_dirs = aams_mock_include_dirs include_dirs += [ - "//foundation/barrierfree/accessibility/common/log/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common/include", - "//foundation/barrierfree/accessibility/services/aams/include", - "//foundation/barrierfree/accessibility/services/aams/test/mock/include", - "//foundation/barrierfree/accessibility/services/test/mock/common", - "//foundation/barrierfree/accessibility/common/interface/include", - "//foundation/barrierfree/accessibility/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", + "../../../common/log/include", + "../../../interfaces/innerkits/acfwk/include", + "../../../interfaces/innerkits/asacfwk/include", + "../../../interfaces/innerkits/common/include", + "../include", + "./mock/include", + "../../test/mock/common", + "../../../common/interface/include", + "../../../common/interface/include/parcel", "${ability_base_path}/interfaces/inner_api/base/include", "${ability_base_path}/interfaces/kits/native/uri/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}/app_manager/include/appmgr/", "${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", + "../../../../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 = [ "AAMS_LOG_TAG = \"accessibility_test\"", "AAMS_LOG_DOMAIN = 0xD001D05", @@ -102,26 +77,36 @@ ohos_unittest("accessibility_account_data_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", + "../../../services/aams:accessibleabilityms", ] external_deps = [ "ability_base:want", "ability_runtime:ability_manager", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "input:libmmi-client", "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") { module_out_path = module_output_path sources = [ - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", + "../../test/mock/mock_parameter.c", "mock/src/aafwk/mock_bundle_manager.cpp", "mock/src/mock_accessibility_element_operator_callback_stub.cpp", "mock/src/mock_accessibility_window_manager.cpp", @@ -151,26 +136,36 @@ ohos_unittest("accessible_ability_manager_service_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", + "../../aams:accessibleabilityms", ] external_deps = [ "ability_base:want", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "display_manager:displaymgr", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "ipc:ipc_core", + "os_account:domain_account_innerkits", + "os_account:os_account_innerkits", "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") { module_out_path = module_output_path 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_gesture_recognizer.cpp", "../src/accessibility_settings_config.cpp", @@ -185,10 +184,6 @@ ohos_unittest("accessibility_touch_guider_test") { "../src/accessibility_window_connection.cpp", "../src/accessible_ability_manager_service_event_handler.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_common_event.cpp", "mock/src/mock_accessibility_element_operator_proxy.cpp", @@ -214,25 +209,35 @@ ohos_unittest("accessibility_touch_guider_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../interfaces/innerkits/common:accessibility_common", ] external_deps = [ "ability_base:want", "ability_runtime:ability_manager", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "input:libmmi-client", "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") { module_out_path = module_output_path sources = [ + "../../test/mock/mock_parameter.c", "../src/accessibility_common_event.cpp", "../src/utils.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", "mock/src/mock_accessibility_account_data.cpp", "mock/src/mock_accessible_ability_manager_service.cpp", "mock/src/mock_common_event_data.cpp", @@ -259,21 +264,24 @@ ohos_unittest("accessibility_common_event_registry_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", + "../../aams:accessibleabilityms", ] external_deps = [ "ability_base:want", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", @@ -281,8 +289,15 @@ ohos_unittest("accessibility_common_event_registry_test") { "init:libbegetutil", "input:libmmi-client", "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", "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 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_display_manager.cpp", "../src/accessibility_dumper.cpp", @@ -301,13 +323,6 @@ ohos_unittest("accessibility_input_interceptor_test") { "../src/accessibility_short_key.cpp", "../src/accessible_ability_manager_service_event_handler.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/mock_accessibility_account_data.cpp", "mock/src/mock_accessibility_gesture_recognizer.cpp", @@ -326,30 +341,39 @@ ohos_unittest("accessibility_input_interceptor_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", + "../../aams:accessibleabilityms", ] external_deps = [ "ability_base:want", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core", "c_utils:utils", "common_event_service:cesfwk_innerkits", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "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", "window_manager:libdm", + "window_manager:libwm", ] } @@ -358,14 +382,14 @@ ohos_unittest("accessibility_window_manager_test") { module_out_path = module_output_path 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_manager.cpp", "../src/accessible_ability_manager_service_event_handler.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/mock_accessibility_account_data.cpp", "mock/src/mock_accessibility_common_event.cpp", @@ -379,21 +403,24 @@ ohos_unittest("accessibility_window_manager_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", + "../../aams:accessibleabilityms", ] external_deps = [ "ability_base:want", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", @@ -401,6 +428,13 @@ ohos_unittest("accessibility_window_manager_test") { "init:libbegetutil", "input:libmmi-client", "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 sources = [ "../src/accessibility_keyevent_filter.cpp", - "//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessibility_account_data.cpp", - "//foundation/barrierfree/accessibility/services/aams/test/mock/src/mock_accessibility_event_transmission.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.cpp", + "./mock/src/mock_accessibility_account_data.cpp", + "./mock/src/mock_accessibility_event_transmission.cpp", + "./mock/src/mock_accessible_ability_connection.cpp", + "./mock/src/mock_accessible_ability_manager_service.cpp", "mock/src/mock_system_ability.cpp", "unittest/accessibility_keyevent_filter_test.cpp", ] @@ -420,22 +454,25 @@ ohos_unittest("accessibility_keyevent_filter_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", + "../../aams:accessibleabilityms", ] external_deps = [ "ability_base:want", "ability_runtime:ability_manager", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", @@ -443,6 +480,13 @@ ohos_unittest("accessibility_keyevent_filter_test") { "init:libbegetutil", "input:libmmi-client", "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") { module_out_path = module_output_path sources = [ + "../../test/mock/mock_parameter.c", "../src/accessibility_account_data.cpp", "../src/accessibility_common_event.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_event_handler.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_bundle_manager.cpp", "mock/src/mock_accessibility_element_operator_callback_stub.cpp", @@ -495,22 +539,24 @@ ohos_unittest("accessible_ability_connection_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", ] external_deps = [ "ability_base:want", "ability_runtime:ability_manager", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "display_manager:displaymgr", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", @@ -519,6 +565,12 @@ ohos_unittest("accessible_ability_connection_test") { "init:libbegetutil", "input:libmmi-client", "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:libwm", @@ -537,21 +589,30 @@ ohos_unittest("accessibility_display_manager_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", ] external_deps = [ + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "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", ] } @@ -559,10 +620,10 @@ ohos_unittest("accessibility_display_manager_test") { ohos_unittest("accessibility_dumper_test") { module_out_path = module_output_path sources = [ + "../../../common/interface/src/accessible_ability_channel_stub.cpp", "../src/accessibility_dumper.cpp", "../src/accessible_ability_manager_service_event_handler.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_common_event.cpp", "mock/src/mock_accessibility_event_transmission.cpp", @@ -589,24 +650,34 @@ ohos_unittest("accessibility_dumper_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../interfaces/innerkits/common:accessibility_common", ] external_deps = [ "ability_base:want", "ability_runtime:ability_manager", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "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 = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", + "../../aams:accessibleabilityms", ] external_deps = [ "ability_base:want", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "input:libmmi-client", "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") { module_out_path = module_output_path 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_common_event.cpp", "../src/accessibility_display_manager.cpp", @@ -665,12 +752,6 @@ ohos_unittest("accessible_ability_channel_test") { "../src/accessible_ability_connection.cpp", "../src/accessible_ability_manager_service_event_handler.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_stub.cpp", "mock/src/mock_accessibility_event_transmission.cpp", @@ -694,19 +775,22 @@ ohos_unittest("accessible_ability_channel_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../interfaces/innerkits/common:accessibility_common", ] external_deps = [ "ability_base:want", "ability_runtime:ability_manager", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", @@ -714,6 +798,13 @@ ohos_unittest("accessible_ability_channel_test") { "init:libbegetutil", "input:libmmi-client", "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 = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", + "../../aams:accessibleabilityms", ] external_deps = [ "ability_base:want", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "input:libmmi-client", "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 = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../interfaces/innerkits/common:accessibility_common", ] external_deps = [ + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "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 = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", + "../../aams:accessibleabilityms", ] external_deps = [ "ability_base:want", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "input:libmmi-client", "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 = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../interfaces/innerkits/common:accessibility_common", + "../../aams:accessibleabilityms", ] external_deps = [ + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", + "common_event_service:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "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 = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//foundation/barrierfree/accessibility/services/aams:accessibleabilityms", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../../third_party/googletest:gmock_main", + "../../../../../../third_party/googletest:gtest_main", + "../../../common/interface:accessibility_interface", + "../../../interfaces/innerkits/common:accessibility_common", + "../../aams:accessibleabilityms", ] external_deps = [ "ability_base:want", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "c_utils:utils", + "common_event_service:cesfwk_innerkits", "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "init:libbegetutil", "input:libmmi-client", "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", ] } diff --git a/services/etc/BUILD.gn b/services/etc/BUILD.gn index 98cf0afd..46856076 100644 --- a/services/etc/BUILD.gn +++ b/services/etc/BUILD.gn @@ -14,7 +14,8 @@ import("//build/ohos.gni") ohos_prebuilt_etc("ohos.para.dac") { - source = "//foundation/barrierfree/accessibility/services/etc/accessibility.para.dac" + source = "./accessibility.para.dac" part_name = "accessibility" + subsystem_name = "barrierfree" module_install_dir = "etc/param" } diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn index 0472e093..39e84bf2 100644 --- a/services/test/BUILD.gn +++ b/services/test/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/barrierfree/accessibility/services/test/aamstestmock.gni") +import("./aamstestmock.gni") module_output_path = "accessibility/framework_test" @@ -28,26 +28,18 @@ config("module_private_config") { include_dirs = aams_mock_include_dirs include_dirs += [ - "//foundation/barrierfree/accessibility/common/log/include", - "//foundation/barrierfree/accessibility/common/interface/include/parcel", - "//foundation/barrierfree/accessibility/frameworks/aafwk/include", - "//foundation/barrierfree/accessibility/frameworks/acfwk/include", - "//foundation/barrierfree/accessibility/frameworks/asacfwk/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/acfwk/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/asacfwk/include", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common/include", - "//foundation/barrierfree/accessibility/services/aams/include", - "//foundation/barrierfree/accessibility/services/test/mock", - "//foundation/barrierfree/accessibility/services/test/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", + "${AAMS_COMMON_PATH}/log/include", + "${AAMS_COMMON_PATH}/interface/include/parcel", + "${AAMS_FRAMEWORKS_PATH}/aafwk/include", + "${AAMS_FRAMEWORKS_PATH}/acfwk/include", + "${AAMS_FRAMEWORKS_PATH}/asacfwk/include", + "${AAMS_INTERFACES_PATH}/innerkits/aafwk/include", + "${AAMS_INTERFACES_PATH}/innerkits/acfwk/include", + "${AAMS_INTERFACES_PATH}/innerkits/asacfwk/include", + "${AAMS_INTERFACES_PATH}/innerkits/common/include", + "../aams/include", + "mock", + "./mock/common", "${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/context", @@ -55,25 +47,10 @@ config("module_private_config") { "${ability_runtime_inner_api_path}/ability_manager/include", "${ability_runtime_inner_api_path}/app_manager/include/appmgr", "${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", + "${AAMS_FOUNDATION_PATH}/window/window_manager/utils/include", ] + defines = [ "AAMS_LOG_TAG = \"accessibility_test\"", "AAMS_LOG_DOMAIN = 0xD001D05", @@ -87,6 +64,7 @@ ohos_moduletest("aams_accessibility_touch_guider_test") { module_out_path = module_output_path sources = [ + "../../frameworks/common/src/accessibility_window_info.cpp", "../aams/src/accessibility_account_data.cpp", "../aams/src/accessibility_common_event.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_event_handler.cpp", "../aams/src/utils.cpp", - "//foundation/barrierfree/accessibility/frameworks/common/src/accessibility_window_info.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_ability_connect_callback_stub.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_ability_manager_client.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_accessibility_element_operator_impl.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_accessibility_element_operator_proxy.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_client_proxy.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_bundle_mgr_proxy.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", - "//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", + "./mock/mock_ability_connect_callback_stub.cpp", + "./mock/mock_ability_manager_client.cpp", + "./mock/mock_accessibility_element_operator_impl.cpp", + "./mock/mock_accessibility_element_operator_proxy.cpp", + "./mock/mock_accessible_ability_client_proxy.cpp", + "./mock/mock_accessible_ability_manager_service_stub.cpp", + "./mock/mock_bundle_manager.cpp", + "./mock/mock_bundle_mgr_proxy.cpp", + "./mock/mock_display.cpp", + "./mock/mock_display_manager.cpp", + "./mock/mock_os_account_manager.cpp", + "./mock/mock_parameter.c", + "./mock/mock_service_registry.cpp", + "./mock/mock_system_ability.cpp", "moduletest/aamstest/aams_accessibility_touch_guider_test/aams_accessibility_touch_guider_test.cpp", ] sources += aams_mock_distributeddatamgr_src @@ -133,14 +110,14 @@ ohos_moduletest("aams_accessibility_touch_guider_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../third_party/googletest:gmock_main", + "../../../../../third_party/googletest:gtest_main", + "../../common/interface:accessibility_interface", + "../../interfaces/innerkits/common:accessibility_common", ] 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_event_handler.cpp", "../aams/src/utils.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_ability_connect_callback_stub.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_ability_manager_client.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_accessibility_element_operator_impl.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_accessibility_element_operator_proxy.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_client_proxy.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_bundle_mgr_proxy.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", - "//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", + "./mock/mock_ability_connect_callback_stub.cpp", + "./mock/mock_ability_manager_client.cpp", + "./mock/mock_accessibility_element_operator_impl.cpp", + "./mock/mock_accessibility_element_operator_proxy.cpp", + "./mock/mock_accessible_ability_client_proxy.cpp", + "./mock/mock_accessible_ability_manager_service_stub.cpp", + "./mock/mock_bundle_manager.cpp", + "./mock/mock_bundle_mgr_proxy.cpp", + "./mock/mock_display.cpp", + "./mock/mock_display_manager.cpp", + "./mock/mock_os_account_manager.cpp", + "./mock/mock_parameter.c", + "./mock/mock_service_registry.cpp", + "./mock/mock_system_ability.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 = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../third_party/googletest:gmock_main", + "../../../../../third_party/googletest:gtest_main", + "../../common/interface:accessibility_interface", + "../../interfaces/innerkits/common:accessibility_common", ] 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_event_handler.cpp", "../aams/src/utils.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_ability_connect_callback_stub.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_ability_manager_client.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_accessibility_element_operator_impl.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_accessibility_element_operator_proxy.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_client_proxy.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_bundle_mgr_proxy.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_data.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_subscribe_info.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_subscriber.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_support.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_matching_skill.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", - "//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", + "./mock/mock_ability_connect_callback_stub.cpp", + "./mock/mock_ability_manager_client.cpp", + "./mock/mock_accessibility_element_operator_impl.cpp", + "./mock/mock_accessibility_element_operator_proxy.cpp", + "./mock/mock_accessible_ability_client_proxy.cpp", + "./mock/mock_accessible_ability_manager_service_stub.cpp", + "./mock/mock_bundle_manager.cpp", + "./mock/mock_bundle_mgr_proxy.cpp", + "./mock/mock_common_event_data.cpp", + "./mock/mock_common_event_manager.cpp", + "./mock/mock_common_event_subscribe_info.cpp", + "./mock/mock_common_event_subscriber.cpp", + "./mock/mock_common_event_support.cpp", + "./mock/mock_display.cpp", + "./mock/mock_display_manager.cpp", + "./mock/mock_matching_skill.cpp", + "./mock/mock_os_account_manager.cpp", + "./mock/mock_parameter.c", + "./mock/mock_service_registry.cpp", + "./mock/mock_system_ability.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 = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../third_party/googletest:gmock_main", + "../../../../../third_party/googletest:gtest_main", + "../../common/interface:accessibility_interface", + "../../interfaces/innerkits/common:accessibility_common", ] external_deps = [ @@ -351,24 +328,24 @@ ohos_moduletest("aams_server_test") { "../aams/src/accessible_ability_manager_service.cpp", "../aams/src/accessible_ability_manager_service_event_handler.cpp", "../aams/src/utils.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_ability_connect_callback_stub.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_ability_manager_client.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_client_proxy.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_bundle_mgr_proxy.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_data.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_subscribe_info.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_subscriber.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_support.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_matching_skill.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", - "//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", + "./mock/mock_ability_connect_callback_stub.cpp", + "./mock/mock_ability_manager_client.cpp", + "./mock/mock_accessible_ability_client_proxy.cpp", + "./mock/mock_accessible_ability_manager_service_stub.cpp", + "./mock/mock_bundle_manager.cpp", + "./mock/mock_bundle_mgr_proxy.cpp", + "./mock/mock_common_event_data.cpp", + "./mock/mock_common_event_manager.cpp", + "./mock/mock_common_event_subscribe_info.cpp", + "./mock/mock_common_event_subscriber.cpp", + "./mock/mock_common_event_support.cpp", + "./mock/mock_display.cpp", + "./mock/mock_display_manager.cpp", + "./mock/mock_matching_skill.cpp", + "./mock/mock_os_account_manager.cpp", + "./mock/mock_parameter.c", + "./mock/mock_service_registry.cpp", + "./mock/mock_system_ability.cpp", "moduletest/aamstest/aams_server_test/aams_server_test.cpp", ] @@ -379,14 +356,14 @@ ohos_moduletest("aams_server_test") { configs = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../third_party/googletest:gmock_main", + "../../../../../third_party/googletest:gtest_main", + "../../common/interface:accessibility_interface", + "../../interfaces/innerkits/common:accessibility_common", ] 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_event_handler.cpp", "../aams/src/utils.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_ability_connect_callback_stub.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_ability_manager_client.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_client_proxy.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_bundle_mgr_proxy.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", - "//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", + "./mock/mock_ability_connect_callback_stub.cpp", + "./mock/mock_ability_manager_client.cpp", + "./mock/mock_accessible_ability_client_proxy.cpp", + "./mock/mock_accessible_ability_manager_service_stub.cpp", + "./mock/mock_bundle_manager.cpp", + "./mock/mock_bundle_mgr_proxy.cpp", + "./mock/mock_display.cpp", + "./mock/mock_display_manager.cpp", + "./mock/mock_os_account_manager.cpp", + "./mock/mock_parameter.c", + "./mock/mock_service_registry.cpp", + "./mock/mock_system_ability.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 = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../third_party/googletest:gmock_main", + "../../../../../third_party/googletest:gtest_main", + "../../common/interface:accessibility_interface", + "../../interfaces/innerkits/common:accessibility_common", ] external_deps = [ @@ -488,11 +465,11 @@ ohos_moduletest("aams_common_event_registry_test") { module_out_path = module_output_path sources = [ - "../aams/src//accessibility_event_transmission.cpp", "../aams/src/accessibility_account_data.cpp", "../aams/src/accessibility_common_event.cpp", "../aams/src/accessibility_display_manager.cpp", "../aams/src/accessibility_dumper.cpp", + "../aams/src/accessibility_event_transmission.cpp", "../aams/src/accessibility_gesture_recognizer.cpp", "../aams/src/accessibility_input_interceptor.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_event_handler.cpp", "../aams/src/utils.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_ability_connect_callback_stub.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_ability_manager_client.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_accessible_ability_client_proxy.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_bundle_mgr_proxy.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_data.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_subscribe_info.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_subscriber.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_common_event_support.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_display.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_display_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_matching_skill.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_os_account_manager.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_parameter.c", - "//foundation/barrierfree/accessibility/services/test/mock/mock_service_registry.cpp", - "//foundation/barrierfree/accessibility/services/test/mock/mock_system_ability.cpp", + "./mock/mock_ability_connect_callback_stub.cpp", + "./mock/mock_ability_manager_client.cpp", + "./mock/mock_accessible_ability_client_proxy.cpp", + "./mock/mock_accessible_ability_manager_service_stub.cpp", + "./mock/mock_bundle_manager.cpp", + "./mock/mock_bundle_mgr_proxy.cpp", + "./mock/mock_common_event_data.cpp", + "./mock/mock_common_event_manager.cpp", + "./mock/mock_common_event_subscribe_info.cpp", + "./mock/mock_common_event_subscriber.cpp", + "./mock/mock_common_event_support.cpp", + "./mock/mock_display.cpp", + "./mock/mock_display_manager.cpp", + "./mock/mock_matching_skill.cpp", + "./mock/mock_os_account_manager.cpp", + "./mock/mock_parameter.c", + "./mock/mock_service_registry.cpp", + "./mock/mock_system_ability.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 = [ ":module_private_config", - "//foundation/barrierfree/accessibility/resources/config/build:coverage_flags", + "../../resources/config/build:coverage_flags", ] deps = [ - "//foundation/barrierfree/accessibility/common/interface:accessibility_interface", - "//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", + "../../../../../third_party/googletest:gmock_main", + "../../../../../third_party/googletest:gtest_main", + "../../common/interface:accessibility_interface", + "../../interfaces/innerkits/common:accessibility_common", ] external_deps = [ diff --git a/services/test/aamstestmock.gni b/services/test/aamstestmock.gni index e551701f..59db5ae0 100755 --- a/services/test/aamstestmock.gni +++ b/services/test/aamstestmock.gni @@ -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_services_path = "${ability_runtime_path}/services" 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_PATH/distributeddatamgr/include", "$AAMS_MOCK_PATH/multimodalinput/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/multimodalinput/input/interfaces/native/innerkits/proxy/include", "//foundation/multimodalinput/input/interfaces/native/innerkits/event/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 =