From 5d8b810a0ebf706d72b1831f9c7bf2afb2ac7ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=8F=91=E5=8F=91?= Date: Tue, 19 Nov 2024 20:06:18 +0800 Subject: [PATCH] description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 小发发 --- common/interface/test/unittest/BUILD.gn | 4 +- frameworks/aafwk/test/BUILD.gn | 8 +-- frameworks/acfwk/test/BUILD.gn | 4 +- frameworks/asacfwk/test/BUILD.gn | 4 +- frameworks/common/test/BUILD.gn | 4 +- services/aams/BUILD.gn | 4 +- services/aams/test/BUILD.gn | 80 ++++++++++++------------- services/test/BUILD.gn | 24 ++++---- 8 files changed, 66 insertions(+), 66 deletions(-) diff --git a/common/interface/test/unittest/BUILD.gn b/common/interface/test/unittest/BUILD.gn index 2db7f922..fcf5e4bf 100644 --- a/common/interface/test/unittest/BUILD.gn +++ b/common/interface/test/unittest/BUILD.gn @@ -68,11 +68,11 @@ ohos_unittest("accessibility_parcel_test") { "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "c_utils:utils", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "input:libmmi-client", "ipc:ipc_single", - "googletest:gmock_main", - "googletest:gtest_main" ] } diff --git a/frameworks/aafwk/test/BUILD.gn b/frameworks/aafwk/test/BUILD.gn index c04bc15c..32b34703 100755 --- a/frameworks/aafwk/test/BUILD.gn +++ b/frameworks/aafwk/test/BUILD.gn @@ -89,14 +89,14 @@ ohos_unittest("accessibility_ui_test_ability_impl_test") { "data_share:datashare_consumer", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "init:libbeget_proxy", "init:libbegetutil", "ipc:ipc_core", "os_account:os_account_innerkits", "samgr:samgr_proxy", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -177,6 +177,8 @@ ohos_unittest("accessible_ability_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:librender_service_client", "hicollie:libhicollie", "hilog:libhilog", @@ -189,8 +191,6 @@ ohos_unittest("accessible_ability_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } diff --git a/frameworks/acfwk/test/BUILD.gn b/frameworks/acfwk/test/BUILD.gn index 212e424f..e5be19fc 100644 --- a/frameworks/acfwk/test/BUILD.gn +++ b/frameworks/acfwk/test/BUILD.gn @@ -72,13 +72,13 @@ ohos_unittest("ac_unit_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", "power_manager:powermgr_client", "samgr:samgr_proxy", - "googletest:gmock_main", - "googletest:gtest_main" ] } diff --git a/frameworks/asacfwk/test/BUILD.gn b/frameworks/asacfwk/test/BUILD.gn index 2814e340..0139c41f 100644 --- a/frameworks/asacfwk/test/BUILD.gn +++ b/frameworks/asacfwk/test/BUILD.gn @@ -77,12 +77,12 @@ ohos_unittest("asac_unit_test") { "data_share:datashare_consumer", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "init:libbegetutil", "ipc:ipc_core", "samgr:samgr_proxy", - "googletest:gmock_main", - "googletest:gtest_main" ] } diff --git a/frameworks/common/test/BUILD.gn b/frameworks/common/test/BUILD.gn index b4e5ffb1..25f23850 100644 --- a/frameworks/common/test/BUILD.gn +++ b/frameworks/common/test/BUILD.gn @@ -53,9 +53,9 @@ ohos_unittest("accessibility_common_test") { ] external_deps = [ - "hilog:libhilog", "googletest:gmock_main", - "googletest:gtest_main" + "googletest:gtest_main", + "hilog:libhilog", ] } diff --git a/services/aams/BUILD.gn b/services/aams/BUILD.gn index 33468b39..9f338254 100644 --- a/services/aams/BUILD.gn +++ b/services/aams/BUILD.gn @@ -55,15 +55,15 @@ accessibleabilityms_files = [ "${services_path}/src/accessibility_window_connection.cpp", "${services_path}/src/accessibility_zoom_gesture.cpp", "${services_path}/src/accessibility_common_event.cpp", - "${services_path}/src/accessibility_touch_exploration.cpp", "${services_path}/src/accessibility_event_transmission.cpp", "${services_path}/src/accessibility_input_interceptor.cpp", - "${services_path}/src/accessibility_touchEvent_injector.cpp", "${services_path}/src/accessibility_keyevent_filter.cpp", "${services_path}/src/accessibility_mouse_autoclick.cpp", "${services_path}/src/accessibility_mouse_key.cpp", "${services_path}/src/accessibility_screen_touch.cpp", "${services_path}/src/accessibility_short_key.cpp", + "${services_path}/src/accessibility_touchEvent_injector.cpp", + "${services_path}/src/accessibility_touch_exploration.cpp", "${services_path}/src/accessibility_window_manager.cpp", "${services_path}/src/utils.cpp", "${services_path}/src/accessibility_dumper.cpp", diff --git a/services/aams/test/BUILD.gn b/services/aams/test/BUILD.gn index bbdefc76..099157ce 100644 --- a/services/aams/test/BUILD.gn +++ b/services/aams/test/BUILD.gn @@ -115,6 +115,8 @@ ohos_unittest("accessibility_account_data_test") { "ffrt:libffrt", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", + "googletest:gmock_main", + "googletest:gtest_main", "hicollie:libhicollie", "hilog:libhilog", "hisysevent:libhisysevent", @@ -129,8 +131,6 @@ ohos_unittest("accessibility_account_data_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -208,6 +208,8 @@ ohos_unittest("accessible_ability_manager_service_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -224,8 +226,6 @@ ohos_unittest("accessible_ability_manager_service_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -293,6 +293,8 @@ ohos_unittest("accessibility_touch_exploration_test") { "data_share:datashare_consumer", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "hicollie:libhicollie", "hilog:libhilog", "hisysevent:libhisysevent", @@ -300,14 +302,12 @@ ohos_unittest("accessibility_touch_exploration_test") { "input:libmmi-client", "ipc:ipc_core", "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", - "googletest:gmock_main", - "googletest:gtest_main", - "power_manager:powermgr_client" ] } @@ -380,6 +380,8 @@ ohos_unittest("accessibility_common_event_registry_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -396,8 +398,6 @@ ohos_unittest("accessibility_common_event_registry_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -475,6 +475,8 @@ ohos_unittest("accessibility_input_interceptor_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -491,8 +493,6 @@ ohos_unittest("accessibility_input_interceptor_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -566,6 +566,8 @@ ohos_unittest("accessibility_window_manager_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -582,8 +584,6 @@ ohos_unittest("accessibility_window_manager_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -648,6 +648,8 @@ ohos_unittest("accessibility_keyevent_filter_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -664,8 +666,6 @@ ohos_unittest("accessibility_keyevent_filter_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -749,6 +749,8 @@ ohos_unittest("accessible_ability_connection_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -767,8 +769,6 @@ ohos_unittest("accessible_ability_connection_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -803,6 +803,8 @@ ohos_unittest("accessibility_display_manager_test") { "data_share:datashare_common", "data_share:datashare_consumer", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hisysevent:libhisysevent", "init:libbegetutil", @@ -813,8 +815,6 @@ ohos_unittest("accessibility_display_manager_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -876,20 +876,20 @@ ohos_unittest("accessibility_dumper_test") { "data_share:datashare_consumer", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "hicollie:libhicollie", "hilog:libhilog", "hisysevent:libhisysevent", "init:libbegetutil", "ipc:ipc_core", "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", - "googletest:gmock_main", - "googletest:gtest_main", - "power_manager:powermgr_client" ] } @@ -961,6 +961,8 @@ ohos_unittest("accessibility_touchevent_injector_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -977,8 +979,6 @@ ohos_unittest("accessibility_touchevent_injector_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -1046,6 +1046,8 @@ ohos_unittest("accessible_ability_channel_test") { "data_share:datashare_consumer", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:librender_service_client", "hicollie:libhicollie", "hilog:libhilog", @@ -1060,8 +1062,6 @@ ohos_unittest("accessible_ability_channel_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -1133,6 +1133,8 @@ ohos_unittest("accessibility_mouse_autoclick_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -1149,8 +1151,6 @@ ohos_unittest("accessibility_mouse_autoclick_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -1222,6 +1222,8 @@ ohos_unittest("accessibility_screen_touch_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -1238,8 +1240,6 @@ ohos_unittest("accessibility_screen_touch_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -1274,6 +1274,8 @@ ohos_unittest("accessibility_mouse_key_test") { "data_share:datashare_common", "data_share:datashare_consumer", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "hilog:libhilog", "hisysevent:libhisysevent", "init:libbegetutil", @@ -1284,8 +1286,6 @@ ohos_unittest("accessibility_mouse_key_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -1357,6 +1357,8 @@ ohos_unittest("accessibility_short_key_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -1373,8 +1375,6 @@ ohos_unittest("accessibility_short_key_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -1439,6 +1439,8 @@ ohos_unittest("accessibility_short_key_dialog_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -1455,8 +1457,6 @@ ohos_unittest("accessibility_short_key_dialog_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -1520,6 +1520,8 @@ ohos_unittest("accessibility_settings_config_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -1536,8 +1538,6 @@ ohos_unittest("accessibility_settings_config_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -1609,6 +1609,8 @@ ohos_unittest("accessibility_zoom_gesture_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -1625,8 +1627,6 @@ ohos_unittest("accessibility_zoom_gesture_test") { "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn index f4851a09..13b715f6 100644 --- a/services/test/BUILD.gn +++ b/services/test/BUILD.gn @@ -134,6 +134,8 @@ ohos_moduletest("aams_accessibility_touch_exploration_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -148,8 +150,6 @@ ohos_moduletest("aams_accessibility_touch_exploration_test") { "power_manager:powermgr_client", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -233,6 +233,8 @@ ohos_moduletest("aams_accessibility_touchEvent_injector_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -247,8 +249,6 @@ ohos_moduletest("aams_accessibility_touchEvent_injector_test") { "power_manager:powermgr_client", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -337,6 +337,8 @@ ohos_moduletest("aams_accessible_ability_channel_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -351,8 +353,6 @@ ohos_moduletest("aams_accessible_ability_channel_test") { "power_manager:powermgr_client", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -439,6 +439,8 @@ ohos_moduletest("aams_server_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -453,8 +455,6 @@ ohos_moduletest("aams_server_test") { "power_manager:powermgr_client", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -536,6 +536,8 @@ ohos_moduletest("aams_accessibility_keyevent_filter_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -550,8 +552,6 @@ ohos_moduletest("aams_accessibility_keyevent_filter_test") { "power_manager:powermgr_client", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] } @@ -638,6 +638,8 @@ ohos_moduletest("aams_common_event_registry_test") { "display_manager:displaymgr", "eventhandler:libeventhandler", "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", "graphic_2d:2d_graphics", "graphic_2d:librender_service_client", "hicollie:libhicollie", @@ -652,8 +654,6 @@ ohos_moduletest("aams_common_event_registry_test") { "power_manager:powermgr_client", "window_manager:libdm", "window_manager:libwm", - "googletest:gmock_main", - "googletest:gtest_main" ] }