From 43c8f24d06e807420ec4ecf78ddb8afa12050de4 Mon Sep 17 00:00:00 2001 From: Dragon51 Date: Thu, 5 Jun 2025 16:22:57 +0800 Subject: [PATCH] repair test coverage Signed-off-by: Dragon51 --- common/anco/comm/BUILD.gn | 32 ---- service/BUILD.gn | 192 +------------------- service/touch_event_normalize/test/BUILD.gn | 16 +- 3 files changed, 18 insertions(+), 222 deletions(-) diff --git a/common/anco/comm/BUILD.gn b/common/anco/comm/BUILD.gn index d67eed2473..01440e1ab1 100644 --- a/common/anco/comm/BUILD.gn +++ b/common/anco/comm/BUILD.gn @@ -16,8 +16,6 @@ import("//build/ohos.gni") import("//build/test.gni") import("../../../multimodalinput_mini.gni") -module_output_path = "input/input" - idl_gen_interface("anco_channel_interface") { src_idl = rebase_path("IAncoChannel.idl") } @@ -110,33 +108,3 @@ ohos_source_set("mmi_anco_channel_stub") { part_name = "${mmi_part_name}" subsystem_name = "${mmi_subsystem_name}" } - -ohos_unittest("AncoChannelStubTest") { - module_out_path = module_output_path - - include_dirs = [ - "${mmi_path}/common/anco/comm/include", - "${mmi_path}/interfaces/native/innerkits/proxy/include", - ] - - cflags = [ - "-Dprivate=public", - "-Dprotected=public", - ] - - deps = [ "${mmi_path}/util:libmmi-util" ] - - sources = [ - "${mmi_path}/frameworks/proxy/events/src/i_anco_consumer.cpp", - "src/anco_channel_stub.cpp", - "test/anco_channel_stub_ex_test.cpp", - "test/mock.cpp", - ] - - external_deps = [ - "c_utils:utils", - "googletest:gmock_main", - "hilog:libhilog", - "ipc:ipc_single", - ] -} diff --git a/service/BUILD.gn b/service/BUILD.gn index 31a322f625..eb36eb17cc 100644 --- a/service/BUILD.gn +++ b/service/BUILD.gn @@ -2427,6 +2427,9 @@ ohos_unittest("EventHandlerEXTest") { configs = [ "${mmi_path}:coverage_flags", ":libmmi_server_config", + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", ] cflags = [ @@ -2769,136 +2772,6 @@ ohos_unittest("DelegateTaskTest") { ] } -ohos_unittest("ConnectManagerTest") { - module_out_path = module_output_path - - configs = [ - "${mmi_path}:coverage_flags", - ":libmmi_server_config", - ] - - cflags = [ - "-Dprivate=public", - "-Dprotected=public", - ] - - sources = [ "connect_manager/test/multimodal_input_connect_stub_test.cpp" ] - - deps = [ "${mmi_path}/service:libmmi-server" ] - - external_deps = [ - "ability_runtime:app_manager", - "access_token:libaccesstoken_sdk", - "access_token:libnativetoken_shared", - "access_token:libtokensetproc_shared", - "config_policy:configpolicy_util", - "cJSON:cjson", - "c_utils:utilsbase", - "data_share:datashare_consumer", - "graphic_2d:2d_graphics", - "graphic_2d:librender_service_client", - "hilog:libhilog", - "hilog:libhilog_base", - "image_framework:image_native", - "init:libbegetutil", - "ipc:ipc_single", - "libinput:libinput-third-mmi", - "preferences:native_preferences", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - "window_manager:libwm", - ] - - if (security_component_enable) { - external_deps += [ "security_component_manager:libsecurity_component_sdk" ] - } -} - -ohos_unittest("ConnectManagerOneTest") { - module_out_path = module_output_path - - configs = [ "${mmi_path}:coverage_flags" ] - - cflags = [ - "-Dprivate=public", - "-Dprotected=public", - ] - - include_dirs = [ - "${mmi_path}/common/anco/comm/include", - "${mmi_path}/interfaces/native/innerkits/proxy/include", - "${mmi_path}/service/connect_manager/include", - "${mmi_path}/service/delegate_task/include", - "${mmi_path}/service/device_config/include", - "${mmi_path}/service/device_manager/include", - "${mmi_path}/service/event_dispatch/include", - "${mmi_path}/service/event_handler/include", - "${mmi_path}/service/event_handler/include", - "${mmi_path}/service/filter/include", - "${mmi_path}/service/fingersense_wrapper/include", - "${mmi_path}/service/hardware_cursor_pointer_manager/include", - "${mmi_path}/service/interceptor/include", - "${mmi_path}/interfaces/native/innerkits/event/include", - "${mmi_path}/service/key_command/include", - "${mmi_path}/service/key_event_normalize/include", - "${mmi_path}/service/libinput_adapter/include", - "${mmi_path}/service/message_handle/include", - "${mmi_path}/service/module_loader/include", - "${mmi_path}/service/monitor/include", - "${mmi_path}/service/mouse_event_normalize/include", - "${mmi_path}/service/nap_process/include", - "${mmi_path}/service/permission_helper/include", - "${mmi_path}/service/subscriber/include", - "${mmi_path}/service/timer_manager/include", - "${mmi_path}/service/touch_event_normalize/include", - "${mmi_path}/service/window_manager/include", - "${mmi_path}/test/facility/libinput_interface/include", - "${mmi_path}/util/common/include", - "${mmi_path}/util/network/include", - "${mmi_path}/util/socket/include", - "connect_manager/test", - ] - - if (input_feature_joystick) { - include_dirs += [ "${mmi_path}/service/joystick/include" ] - } - - sources = - [ "connect_manager/test/multimodal_input_connect_stub_one_test.cpp" ] - - deps = [ - "${mmi_path}/frameworks/proxy:libmmi-client", - "${mmi_path}/service:libmmi-server", - ] - - external_deps = [ - "ability_runtime:app_manager", - "access_token:libaccesstoken_sdk", - "access_token:libnativetoken_shared", - "access_token:libtokensetproc_shared", - "cJSON:cjson", - "c_utils:utilsbase", - "data_share:datashare_consumer", - "googletest:gmock_main", - "graphic_2d:2d_graphics", - "graphic_2d:librender_service_client", - "hilog:libhilog", - "hilog:libhilog_base", - "image_framework:image_native", - "init:libbegetutil", - "ipc:ipc_single", - "libinput:libinput-third-mmi", - "preferences:native_preferences", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - "window_manager:libwm", - ] - - if (security_component_enable) { - external_deps += [ "security_component_manager:libsecurity_component_sdk" ] - } -} - ohos_unittest("ConnectManagerProxyEXTest") { module_out_path = module_output_path @@ -2963,65 +2836,6 @@ ohos_unittest("ConnectManagerProxyEXTest") { } } -ohos_unittest("ConnectManagerEXTest") { - module_out_path = module_output_path - - include_dirs = [ "connect_manager/test" ] - - configs = [ - "${mmi_path}:coverage_flags", - ":libmmi_server_config", - "${mmi_path}/service/filter:mmi_event_filter_config", - "${mmi_path}/service/connect_manager:mmi_connect_manager_config", - "${mmi_path}/common/anco/comm:mmi_anco_channel_config", - ] - - cflags = [ - "-Dprivate=public", - "-Dprotected=public", - ] - - cflags_cc = [ "-Wno-inconsistent-missing-override" ] - - sources = [ - "connect_manager/test/message_parcel_mock.cpp", - "connect_manager/test/multimodal_input_connect_stub_ex_test.cpp", - "module_loader/src/input_screen_capture_agent.cpp", - ] - - deps = [ - "${mmi_path}/service:libmmi-server", - "${mmi_path}/service/connect_manager:mmi_connect_manager_service", - "${mmi_path}/util:libmmi-util", - ] - - external_deps = [ - "ability_runtime:app_manager", - "access_token:libaccesstoken_sdk", - "config_policy:configpolicy_util", - "cJSON:cjson", - "c_utils:utils", - "data_share:datashare_consumer", - "googletest:gmock_main", - "graphic_2d:2d_graphics", - "graphic_2d:librender_service_client", - "hilog:libhilog", - "hilog:libhilog_base", - "image_framework:image_native", - "init:libbegetutil", - "ipc:ipc_single", - "libinput:libinput-third-mmi", - "preferences:native_preferences", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - "window_manager:libwm", - ] - - if (security_component_enable) { - external_deps += [ "security_component_manager:libsecurity_component_sdk" ] - } -} - ohos_unittest("EventDumpTest") { module_out_path = module_output_path diff --git a/service/touch_event_normalize/test/BUILD.gn b/service/touch_event_normalize/test/BUILD.gn index 322bac3b72..dac07a9bb3 100644 --- a/service/touch_event_normalize/test/BUILD.gn +++ b/service/touch_event_normalize/test/BUILD.gn @@ -64,6 +64,9 @@ ohos_unittest("GestureTransformTest") { configs = [ "${mmi_path}:coverage_flags", "${mmi_path}/service:libmmi_server_config", + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", ] cflags = [ @@ -223,6 +226,9 @@ ohos_unittest("TabletToolTranformTest") { configs = [ "${mmi_path}:coverage_flags", "${mmi_path}/service:libmmi_server_config", + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", ] cflags = [ @@ -580,7 +586,12 @@ ohos_unittest("TouchTransformProcessorTestWithMock") { ohos_unittest("TouchpadGestureTest") { module_out_path = module_output_path - configs = [ "${mmi_path}:coverage_flags" ] + configs = [ + "${mmi_path}:coverage_flags", + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] cflags = [ "-Dprivate=public", @@ -931,6 +942,9 @@ ohos_unittest("TouchGestureManagerTest") { configs = [ "${mmi_path}:coverage_flags", "${mmi_path}/service:libmmi_server_config", + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", ] cflags = [ -- Gitee