From 2c768f869db13eeff5e4e7335b60136261f1d287 Mon Sep 17 00:00:00 2001 From: zhangzezhong Date: Tue, 1 Jul 2025 11:25:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BB=A3=E7=A0=81=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E8=B7=AF=E5=BE=84=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzezhong --- test/fuzztest/abilityautostartupclientfirst_fuzzer/BUILD.gn | 1 + .../abilityautostartupclientfirst_fuzzer.cpp | 2 +- test/fuzztest/abilityautostartupclientsecond_fuzzer/BUILD.gn | 1 + .../abilityautostartupclientsecond_fuzzer.cpp | 2 +- test/fuzztest/abilityautostartupclientthird_fuzzer/BUILD.gn | 1 + .../abilityautostartupclientthird_fuzzer.cpp | 2 +- .../insightintentexecutemanagerfirst_fuzzer/BUILD.gn | 1 + .../insightintentexecutemanagerfirst_fuzzer.cpp | 2 +- test/fuzztest/insightintentexecuteparamthird_fuzzer/BUILD.gn | 5 ++++- .../insightintentexecuteparamthird_fuzzer.cpp | 2 +- test/fuzztest/insightintentutilsfirst_fuzzer/BUILD.gn | 5 ++++- .../insightintentutilsfirst_fuzzer.cpp | 2 +- test/fuzztest/insightintentutilsfourth_fuzzer/BUILD.gn | 5 ++++- .../insightintentutilsfourth_fuzzer.cpp | 2 +- test/fuzztest/insightintentutilssecond_fuzzer/BUILD.gn | 5 ++++- .../insightintentutilssecond_fuzzer.cpp | 2 +- test/fuzztest/insightintentutilsthird_fuzzer/BUILD.gn | 5 ++++- .../insightintentutilsthird_fuzzer.cpp | 2 +- test/fuzztest/keepaliveprocessmanagereighth_fuzzer/BUILD.gn | 1 + .../keepaliveprocessmanagereighth_fuzzer.cpp | 4 ++-- .../fuzztest/keepaliveprocessmanagereleventh_fuzzer/BUILD.gn | 1 + .../keepaliveprocessmanagereleventh_fuzzer.cpp | 4 ++-- .../keepaliveprocessmanagerfifteenth_fuzzer/BUILD.gn | 1 + .../keepaliveprocessmanagerfifteenth_fuzzer.cpp | 2 +- test/fuzztest/keepaliveprocessmanagerfirst_fuzzer/BUILD.gn | 1 + .../keepaliveprocessmanagerfirst_fuzzer.cpp | 4 ++-- .../keepaliveprocessmanagerfourteenth_fuzzer/BUILD.gn | 1 + .../keepaliveprocessmanagerfourteenth_fuzzer.cpp | 4 ++-- test/fuzztest/keepaliveprocessmanagersecond_fuzzer/BUILD.gn | 1 + .../keepaliveprocessmanagersecond_fuzzer.cpp | 2 +- test/fuzztest/keepaliveprocessmanagerseventh_fuzzer/BUILD.gn | 1 + .../keepaliveprocessmanagerseventh_fuzzer.cpp | 2 +- .../keepaliveprocessmanagersixteenth_fuzzer/BUILD.gn | 1 + .../keepaliveprocessmanagersixteenth_fuzzer.cpp | 2 +- test/fuzztest/keepaliveprocessmanagertenth_fuzzer/BUILD.gn | 1 + .../keepaliveprocessmanagertenth_fuzzer.cpp | 4 ++-- test/fuzztest/keepaliveprocessmanagerthird_fuzzer/BUILD.gn | 1 + .../keepaliveprocessmanagerthird_fuzzer.cpp | 4 ++-- .../keepaliveprocessmanagerthirteenth_fuzzer/BUILD.gn | 1 + .../keepaliveprocessmanagerthirteenth_fuzzer.cpp | 4 ++-- test/fuzztest/residentprocessmanagereleven_fuzzer/BUILD.gn | 1 + .../residentprocessmanagereleven_fuzzer.cpp | 2 +- test/fuzztest/residentprocessmanagerfirst_fuzzer/BUILD.gn | 1 + .../residentprocessmanagerfirst_fuzzer.cpp | 2 +- test/fuzztest/residentprocessmanagersecond_fuzzer/BUILD.gn | 1 + .../residentprocessmanagersecond_fuzzer.cpp | 2 +- test/fuzztest/residentprocessmanagerthird_fuzzer/BUILD.gn | 1 + .../residentprocessmanagerthird_fuzzer.cpp | 2 +- .../mock/src/mock_my_flag.cpp | 2 +- .../mock/src/mock_permission_verification.cpp | 4 ++-- 50 files changed, 73 insertions(+), 39 deletions(-) diff --git a/test/fuzztest/abilityautostartupclientfirst_fuzzer/BUILD.gn b/test/fuzztest/abilityautostartupclientfirst_fuzzer/BUILD.gn index 2dfc9e8f62..84af386185 100644 --- a/test/fuzztest/abilityautostartupclientfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityautostartupclientfirst_fuzzer/BUILD.gn @@ -28,6 +28,7 @@ ohos_fuzztest("AbilityAutoStartupClientFirstFuzzTest") { "${ability_runtime_innerkits_path}/ability_manager/include", "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/abilityautostartupclientfirst_fuzzer/abilityautostartupclientfirst_fuzzer.cpp b/test/fuzztest/abilityautostartupclientfirst_fuzzer/abilityautostartupclientfirst_fuzzer.cpp index 1bc85fc65a..f62f5ece05 100644 --- a/test/fuzztest/abilityautostartupclientfirst_fuzzer/abilityautostartupclientfirst_fuzzer.cpp +++ b/test/fuzztest/abilityautostartupclientfirst_fuzzer/abilityautostartupclientfirst_fuzzer.cpp @@ -23,8 +23,8 @@ #include "ability_auto_startup_client.h" #undef private +#include "ability_fuzz_util.h" #include "securec.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/abilityautostartupclientsecond_fuzzer/BUILD.gn b/test/fuzztest/abilityautostartupclientsecond_fuzzer/BUILD.gn index 49fb7f8e84..de63137361 100644 --- a/test/fuzztest/abilityautostartupclientsecond_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityautostartupclientsecond_fuzzer/BUILD.gn @@ -28,6 +28,7 @@ ohos_fuzztest("AbilityAutoStartupClientSecondFuzzTest") { "${ability_runtime_innerkits_path}/ability_manager/include", "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/abilityautostartupclientsecond_fuzzer/abilityautostartupclientsecond_fuzzer.cpp b/test/fuzztest/abilityautostartupclientsecond_fuzzer/abilityautostartupclientsecond_fuzzer.cpp index 125b3d9609..155c5fae65 100644 --- a/test/fuzztest/abilityautostartupclientsecond_fuzzer/abilityautostartupclientsecond_fuzzer.cpp +++ b/test/fuzztest/abilityautostartupclientsecond_fuzzer/abilityautostartupclientsecond_fuzzer.cpp @@ -23,8 +23,8 @@ #include "ability_auto_startup_client.h" #undef private +#include "ability_fuzz_util.h" #include "securec.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/abilityautostartupclientthird_fuzzer/BUILD.gn b/test/fuzztest/abilityautostartupclientthird_fuzzer/BUILD.gn index 5965f6ddf6..1e5c25562f 100644 --- a/test/fuzztest/abilityautostartupclientthird_fuzzer/BUILD.gn +++ b/test/fuzztest/abilityautostartupclientthird_fuzzer/BUILD.gn @@ -28,6 +28,7 @@ ohos_fuzztest("AbilityAutoStartupClientThirdFuzzTest") { "${ability_runtime_innerkits_path}/ability_manager/include", "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/abilityautostartupclientthird_fuzzer/abilityautostartupclientthird_fuzzer.cpp b/test/fuzztest/abilityautostartupclientthird_fuzzer/abilityautostartupclientthird_fuzzer.cpp index 2b42ca2c3a..16146884e9 100644 --- a/test/fuzztest/abilityautostartupclientthird_fuzzer/abilityautostartupclientthird_fuzzer.cpp +++ b/test/fuzztest/abilityautostartupclientthird_fuzzer/abilityautostartupclientthird_fuzzer.cpp @@ -23,8 +23,8 @@ #include "ability_auto_startup_client.h" #undef private +#include "ability_fuzz_util.h" #include "securec.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/insightintentexecutemanagerfirst_fuzzer/BUILD.gn b/test/fuzztest/insightintentexecutemanagerfirst_fuzzer/BUILD.gn index 0d2ce8108a..bebd99c48e 100644 --- a/test/fuzztest/insightintentexecutemanagerfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/insightintentexecutemanagerfirst_fuzzer/BUILD.gn @@ -30,6 +30,7 @@ ohos_fuzztest("InsightIntentExecuteManagerFirstFuzzTest") { "${ability_runtime_innerkits_path}/wantagent/include", "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/common/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ diff --git a/test/fuzztest/insightintentexecutemanagerfirst_fuzzer/insightintentexecutemanagerfirst_fuzzer.cpp b/test/fuzztest/insightintentexecutemanagerfirst_fuzzer/insightintentexecutemanagerfirst_fuzzer.cpp index 8017a5508a..dfb533c506 100644 --- a/test/fuzztest/insightintentexecutemanagerfirst_fuzzer/insightintentexecutemanagerfirst_fuzzer.cpp +++ b/test/fuzztest/insightintentexecutemanagerfirst_fuzzer/insightintentexecutemanagerfirst_fuzzer.cpp @@ -24,7 +24,7 @@ #include "insight_intent_execute_param.h" #undef private -#include "../ability_fuzz_util.h" +#include "ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/insightintentexecuteparamthird_fuzzer/BUILD.gn b/test/fuzztest/insightintentexecuteparamthird_fuzzer/BUILD.gn index 8be87bd4dd..f698dd4ef4 100644 --- a/test/fuzztest/insightintentexecuteparamthird_fuzzer/BUILD.gn +++ b/test/fuzztest/insightintentexecuteparamthird_fuzzer/BUILD.gn @@ -24,7 +24,10 @@ ohos_fuzztest("InsightIntentExecuteParamThirdFuzzTest") { fuzz_config_file = "${ability_runtime_test_path}/fuzztest/insightintentexecuteparamthird_fuzzer" - include_dirs = [ "${ability_runtime_innerkits_path}/wantagent/include" ] + include_dirs = [ + "${ability_runtime_innerkits_path}/wantagent/include", + "${ability_runtime_test_path}/fuzztest/", + ] cflags = [ "-g", diff --git a/test/fuzztest/insightintentexecuteparamthird_fuzzer/insightintentexecuteparamthird_fuzzer.cpp b/test/fuzztest/insightintentexecuteparamthird_fuzzer/insightintentexecuteparamthird_fuzzer.cpp index ff6bbc8835..ad85632b98 100644 --- a/test/fuzztest/insightintentexecuteparamthird_fuzzer/insightintentexecuteparamthird_fuzzer.cpp +++ b/test/fuzztest/insightintentexecuteparamthird_fuzzer/insightintentexecuteparamthird_fuzzer.cpp @@ -19,9 +19,9 @@ #include #include +#include "ability_fuzz_util.h" #include "insight_intent_execute_param.h" #include "insight_intent_utils.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/insightintentutilsfirst_fuzzer/BUILD.gn b/test/fuzztest/insightintentutilsfirst_fuzzer/BUILD.gn index c78aaa2603..8effa359df 100644 --- a/test/fuzztest/insightintentutilsfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/insightintentutilsfirst_fuzzer/BUILD.gn @@ -24,7 +24,10 @@ ohos_fuzztest("InsightIntentUtilsFirstFuzzTest") { fuzz_config_file = "${ability_runtime_test_path}/fuzztest/insightintentutilsfirst_fuzzer" - include_dirs = [ "${ability_runtime_innerkits_path}/wantagent/include" ] + include_dirs = [ + "${ability_runtime_innerkits_path}/wantagent/include", + "${ability_runtime_test_path}/fuzztest/", + ] cflags = [ "-g", diff --git a/test/fuzztest/insightintentutilsfirst_fuzzer/insightintentutilsfirst_fuzzer.cpp b/test/fuzztest/insightintentutilsfirst_fuzzer/insightintentutilsfirst_fuzzer.cpp index 018326d328..0ad642154a 100644 --- a/test/fuzztest/insightintentutilsfirst_fuzzer/insightintentutilsfirst_fuzzer.cpp +++ b/test/fuzztest/insightintentutilsfirst_fuzzer/insightintentutilsfirst_fuzzer.cpp @@ -19,8 +19,8 @@ #include #include +#include "ability_fuzz_util.h" #include "insight_intent_utils.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/insightintentutilsfourth_fuzzer/BUILD.gn b/test/fuzztest/insightintentutilsfourth_fuzzer/BUILD.gn index d73a4c146d..b99a4cac14 100644 --- a/test/fuzztest/insightintentutilsfourth_fuzzer/BUILD.gn +++ b/test/fuzztest/insightintentutilsfourth_fuzzer/BUILD.gn @@ -24,7 +24,10 @@ ohos_fuzztest("InsightIntentUtilsFourthFuzzTest") { fuzz_config_file = "${ability_runtime_test_path}/fuzztest/insightintentutilsfourth_fuzzer" - include_dirs = [ "${ability_runtime_innerkits_path}/wantagent/include" ] + include_dirs = [ + "${ability_runtime_innerkits_path}/wantagent/include", + "${ability_runtime_test_path}/fuzztest/", + ] cflags = [ "-g", diff --git a/test/fuzztest/insightintentutilsfourth_fuzzer/insightintentutilsfourth_fuzzer.cpp b/test/fuzztest/insightintentutilsfourth_fuzzer/insightintentutilsfourth_fuzzer.cpp index bee80a332b..118e1ceab9 100644 --- a/test/fuzztest/insightintentutilsfourth_fuzzer/insightintentutilsfourth_fuzzer.cpp +++ b/test/fuzztest/insightintentutilsfourth_fuzzer/insightintentutilsfourth_fuzzer.cpp @@ -19,8 +19,8 @@ #include #include +#include "ability_fuzz_util.h" #include "insight_intent_utils.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/insightintentutilssecond_fuzzer/BUILD.gn b/test/fuzztest/insightintentutilssecond_fuzzer/BUILD.gn index 94550782fe..1eaa796634 100644 --- a/test/fuzztest/insightintentutilssecond_fuzzer/BUILD.gn +++ b/test/fuzztest/insightintentutilssecond_fuzzer/BUILD.gn @@ -24,7 +24,10 @@ ohos_fuzztest("InsightIntentUtilsSecondFuzzTest") { fuzz_config_file = "${ability_runtime_test_path}/fuzztest/insightintentutilssecond_fuzzer" - include_dirs = [ "${ability_runtime_innerkits_path}/wantagent/include" ] + include_dirs = [ + "${ability_runtime_innerkits_path}/wantagent/include", + "${ability_runtime_test_path}/fuzztest/", + ] cflags = [ "-g", diff --git a/test/fuzztest/insightintentutilssecond_fuzzer/insightintentutilssecond_fuzzer.cpp b/test/fuzztest/insightintentutilssecond_fuzzer/insightintentutilssecond_fuzzer.cpp index 9da68ace9c..c30b73c5b4 100644 --- a/test/fuzztest/insightintentutilssecond_fuzzer/insightintentutilssecond_fuzzer.cpp +++ b/test/fuzztest/insightintentutilssecond_fuzzer/insightintentutilssecond_fuzzer.cpp @@ -19,8 +19,8 @@ #include #include +#include "ability_fuzz_util.h" #include "insight_intent_utils.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/insightintentutilsthird_fuzzer/BUILD.gn b/test/fuzztest/insightintentutilsthird_fuzzer/BUILD.gn index daa49b7eef..e72a3f4c03 100644 --- a/test/fuzztest/insightintentutilsthird_fuzzer/BUILD.gn +++ b/test/fuzztest/insightintentutilsthird_fuzzer/BUILD.gn @@ -24,7 +24,10 @@ ohos_fuzztest("InsightIntentUtilsThirdFuzzTest") { fuzz_config_file = "${ability_runtime_test_path}/fuzztest/insightintentutilsthird_fuzzer" - include_dirs = [ "${ability_runtime_innerkits_path}/wantagent/include" ] + include_dirs = [ + "${ability_runtime_innerkits_path}/wantagent/include", + "${ability_runtime_test_path}/fuzztest/", + ] cflags = [ "-g", diff --git a/test/fuzztest/insightintentutilsthird_fuzzer/insightintentutilsthird_fuzzer.cpp b/test/fuzztest/insightintentutilsthird_fuzzer/insightintentutilsthird_fuzzer.cpp index 2f8200053e..09a6aa6fab 100644 --- a/test/fuzztest/insightintentutilsthird_fuzzer/insightintentutilsthird_fuzzer.cpp +++ b/test/fuzztest/insightintentutilsthird_fuzzer/insightintentutilsthird_fuzzer.cpp @@ -19,8 +19,8 @@ #include #include +#include "ability_fuzz_util.h" #include "insight_intent_utils.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/keepaliveprocessmanagereighth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagereighth_fuzzer/BUILD.gn index 5d1a09dc82..8fd7f55c36 100644 --- a/test/fuzztest/keepaliveprocessmanagereighth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagereighth_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("KeepAliveProcessManagerEighthFuzzTest") { "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include/keep_alive", "${ability_runtime_services_path}/common/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/keepaliveprocessmanagereighth_fuzzer/keepaliveprocessmanagereighth_fuzzer.cpp b/test/fuzztest/keepaliveprocessmanagereighth_fuzzer/keepaliveprocessmanagereighth_fuzzer.cpp index 2834b8b669..f863bf97bd 100644 --- a/test/fuzztest/keepaliveprocessmanagereighth_fuzzer/keepaliveprocessmanagereighth_fuzzer.cpp +++ b/test/fuzztest/keepaliveprocessmanagereighth_fuzzer/keepaliveprocessmanagereighth_fuzzer.cpp @@ -19,13 +19,13 @@ #include #include -#include "keep_alive_process_manager.h" +#include "ability_fuzz_util.h" #include "ability_keep_alive_service.h" #include "ability_util.h" #include "app_mgr_client.h" +#include "keep_alive_process_manager.h" #include "parameters.h" #include "permission_verification.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/keepaliveprocessmanagereleventh_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagereleventh_fuzzer/BUILD.gn index c58d69ab19..62dd0582a1 100644 --- a/test/fuzztest/keepaliveprocessmanagereleventh_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagereleventh_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("KeepAliveProcessManagerEleventhFuzzTest") { "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include/keep_alive", "${ability_runtime_services_path}/common/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/keepaliveprocessmanagereleventh_fuzzer/keepaliveprocessmanagereleventh_fuzzer.cpp b/test/fuzztest/keepaliveprocessmanagereleventh_fuzzer/keepaliveprocessmanagereleventh_fuzzer.cpp index 223127ad78..7c36396aed 100644 --- a/test/fuzztest/keepaliveprocessmanagereleventh_fuzzer/keepaliveprocessmanagereleventh_fuzzer.cpp +++ b/test/fuzztest/keepaliveprocessmanagereleventh_fuzzer/keepaliveprocessmanagereleventh_fuzzer.cpp @@ -19,13 +19,13 @@ #include #include -#include "keep_alive_process_manager.h" +#include "ability_fuzz_util.h" #include "ability_keep_alive_service.h" #include "ability_util.h" #include "app_mgr_client.h" +#include "keep_alive_process_manager.h" #include "parameters.h" #include "permission_verification.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/keepaliveprocessmanagerfifteenth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerfifteenth_fuzzer/BUILD.gn index 984a385092..8fdc95b454 100644 --- a/test/fuzztest/keepaliveprocessmanagerfifteenth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerfifteenth_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("KeepAliveProcessManagerFifteenthFuzzTest") { "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include/keep_alive", "${ability_runtime_services_path}/common/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/keepaliveprocessmanagerfifteenth_fuzzer/keepaliveprocessmanagerfifteenth_fuzzer.cpp b/test/fuzztest/keepaliveprocessmanagerfifteenth_fuzzer/keepaliveprocessmanagerfifteenth_fuzzer.cpp index dcc36286ea..9ea36be554 100644 --- a/test/fuzztest/keepaliveprocessmanagerfifteenth_fuzzer/keepaliveprocessmanagerfifteenth_fuzzer.cpp +++ b/test/fuzztest/keepaliveprocessmanagerfifteenth_fuzzer/keepaliveprocessmanagerfifteenth_fuzzer.cpp @@ -23,12 +23,12 @@ #include "keep_alive_process_manager.h" #undef private +#include "ability_fuzz_util.h" #include "ability_keep_alive_service.h" #include "ability_util.h" #include "app_mgr_client.h" #include "parameters.h" #include "permission_verification.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/keepaliveprocessmanagerfirst_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerfirst_fuzzer/BUILD.gn index 23965c898f..36ba010cdd 100644 --- a/test/fuzztest/keepaliveprocessmanagerfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerfirst_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("KeepAliveProcessManagerFirstFuzzTest") { "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include/keep_alive", "${ability_runtime_services_path}/common/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/keepaliveprocessmanagerfirst_fuzzer/keepaliveprocessmanagerfirst_fuzzer.cpp b/test/fuzztest/keepaliveprocessmanagerfirst_fuzzer/keepaliveprocessmanagerfirst_fuzzer.cpp index 7bbca4592b..9ec9639b4e 100644 --- a/test/fuzztest/keepaliveprocessmanagerfirst_fuzzer/keepaliveprocessmanagerfirst_fuzzer.cpp +++ b/test/fuzztest/keepaliveprocessmanagerfirst_fuzzer/keepaliveprocessmanagerfirst_fuzzer.cpp @@ -19,13 +19,13 @@ #include #include -#include "keep_alive_process_manager.h" +#include "ability_fuzz_util.h" #include "ability_keep_alive_service.h" #include "ability_util.h" #include "app_mgr_client.h" +#include "keep_alive_process_manager.h" #include "parameters.h" #include "permission_verification.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/keepaliveprocessmanagerfourteenth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerfourteenth_fuzzer/BUILD.gn index 0c134510ac..d6ad349aaf 100644 --- a/test/fuzztest/keepaliveprocessmanagerfourteenth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerfourteenth_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("KeepAliveProcessManagerFourteenthFuzzTest") { "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include/keep_alive", "${ability_runtime_services_path}/common/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/keepaliveprocessmanagerfourteenth_fuzzer/keepaliveprocessmanagerfourteenth_fuzzer.cpp b/test/fuzztest/keepaliveprocessmanagerfourteenth_fuzzer/keepaliveprocessmanagerfourteenth_fuzzer.cpp index 134bde1170..5a8b323c64 100644 --- a/test/fuzztest/keepaliveprocessmanagerfourteenth_fuzzer/keepaliveprocessmanagerfourteenth_fuzzer.cpp +++ b/test/fuzztest/keepaliveprocessmanagerfourteenth_fuzzer/keepaliveprocessmanagerfourteenth_fuzzer.cpp @@ -19,13 +19,13 @@ #include #include -#include "keep_alive_process_manager.h" +#include "ability_fuzz_util.h" #include "ability_keep_alive_service.h" #include "ability_util.h" #include "app_mgr_client.h" +#include "keep_alive_process_manager.h" #include "parameters.h" #include "permission_verification.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/keepaliveprocessmanagersecond_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagersecond_fuzzer/BUILD.gn index 84cbcd3134..639e3f4048 100644 --- a/test/fuzztest/keepaliveprocessmanagersecond_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagersecond_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("KeepAliveProcessManagerSecondFuzzTest") { "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include/keep_alive", "${ability_runtime_services_path}/common/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/keepaliveprocessmanagersecond_fuzzer/keepaliveprocessmanagersecond_fuzzer.cpp b/test/fuzztest/keepaliveprocessmanagersecond_fuzzer/keepaliveprocessmanagersecond_fuzzer.cpp index 2fab818d09..3e61bff45a 100644 --- a/test/fuzztest/keepaliveprocessmanagersecond_fuzzer/keepaliveprocessmanagersecond_fuzzer.cpp +++ b/test/fuzztest/keepaliveprocessmanagersecond_fuzzer/keepaliveprocessmanagersecond_fuzzer.cpp @@ -23,12 +23,12 @@ #include "keep_alive_process_manager.h" #undef private +#include "ability_fuzz_util.h" #include "ability_keep_alive_service.h" #include "ability_util.h" #include "app_mgr_client.h" #include "parameters.h" #include "permission_verification.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/keepaliveprocessmanagerseventh_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerseventh_fuzzer/BUILD.gn index bc7eebc84c..771d9fac93 100644 --- a/test/fuzztest/keepaliveprocessmanagerseventh_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerseventh_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("KeepAliveProcessManagerSeventhFuzzTest") { "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include/keep_alive", "${ability_runtime_services_path}/common/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/keepaliveprocessmanagerseventh_fuzzer/keepaliveprocessmanagerseventh_fuzzer.cpp b/test/fuzztest/keepaliveprocessmanagerseventh_fuzzer/keepaliveprocessmanagerseventh_fuzzer.cpp index 88a0ea9115..cc4b296582 100644 --- a/test/fuzztest/keepaliveprocessmanagerseventh_fuzzer/keepaliveprocessmanagerseventh_fuzzer.cpp +++ b/test/fuzztest/keepaliveprocessmanagerseventh_fuzzer/keepaliveprocessmanagerseventh_fuzzer.cpp @@ -23,12 +23,12 @@ #include "keep_alive_process_manager.h" #undef private +#include "ability_fuzz_util.h" #include "ability_keep_alive_service.h" #include "ability_util.h" #include "app_mgr_client.h" #include "parameters.h" #include "permission_verification.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/keepaliveprocessmanagersixteenth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagersixteenth_fuzzer/BUILD.gn index 83f64479fc..68da8b883d 100644 --- a/test/fuzztest/keepaliveprocessmanagersixteenth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagersixteenth_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("KeepAliveProcessManagerSixteenthFuzzTest") { "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include/keep_alive", "${ability_runtime_services_path}/common/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/keepaliveprocessmanagersixteenth_fuzzer/keepaliveprocessmanagersixteenth_fuzzer.cpp b/test/fuzztest/keepaliveprocessmanagersixteenth_fuzzer/keepaliveprocessmanagersixteenth_fuzzer.cpp index 6f00212698..43aaee5ad2 100644 --- a/test/fuzztest/keepaliveprocessmanagersixteenth_fuzzer/keepaliveprocessmanagersixteenth_fuzzer.cpp +++ b/test/fuzztest/keepaliveprocessmanagersixteenth_fuzzer/keepaliveprocessmanagersixteenth_fuzzer.cpp @@ -23,12 +23,12 @@ #include "keep_alive_process_manager.h" #undef private +#include "ability_fuzz_util.h" #include "ability_keep_alive_service.h" #include "ability_util.h" #include "app_mgr_client.h" #include "parameters.h" #include "permission_verification.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/keepaliveprocessmanagertenth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagertenth_fuzzer/BUILD.gn index c1ba864d46..957d640d05 100644 --- a/test/fuzztest/keepaliveprocessmanagertenth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagertenth_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("KeepAliveProcessManagerTenthFuzzTest") { "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include/keep_alive", "${ability_runtime_services_path}/common/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/keepaliveprocessmanagertenth_fuzzer/keepaliveprocessmanagertenth_fuzzer.cpp b/test/fuzztest/keepaliveprocessmanagertenth_fuzzer/keepaliveprocessmanagertenth_fuzzer.cpp index 71aef70b29..155d34e5e2 100644 --- a/test/fuzztest/keepaliveprocessmanagertenth_fuzzer/keepaliveprocessmanagertenth_fuzzer.cpp +++ b/test/fuzztest/keepaliveprocessmanagertenth_fuzzer/keepaliveprocessmanagertenth_fuzzer.cpp @@ -19,13 +19,13 @@ #include #include -#include "keep_alive_process_manager.h" +#include "ability_fuzz_util.h" #include "ability_keep_alive_service.h" #include "ability_util.h" #include "app_mgr_client.h" +#include "keep_alive_process_manager.h" #include "parameters.h" #include "permission_verification.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/keepaliveprocessmanagerthird_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerthird_fuzzer/BUILD.gn index 8d8e1adb0e..f2ebfdc1ad 100644 --- a/test/fuzztest/keepaliveprocessmanagerthird_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerthird_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("KeepAliveProcessManagerThirdFuzzTest") { "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include/keep_alive", "${ability_runtime_services_path}/common/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/keepaliveprocessmanagerthird_fuzzer/keepaliveprocessmanagerthird_fuzzer.cpp b/test/fuzztest/keepaliveprocessmanagerthird_fuzzer/keepaliveprocessmanagerthird_fuzzer.cpp index 001178e172..d2a59205fd 100644 --- a/test/fuzztest/keepaliveprocessmanagerthird_fuzzer/keepaliveprocessmanagerthird_fuzzer.cpp +++ b/test/fuzztest/keepaliveprocessmanagerthird_fuzzer/keepaliveprocessmanagerthird_fuzzer.cpp @@ -19,13 +19,13 @@ #include #include -#include "keep_alive_process_manager.h" +#include "ability_fuzz_util.h" #include "ability_keep_alive_service.h" #include "ability_util.h" #include "app_mgr_client.h" +#include "keep_alive_process_manager.h" #include "parameters.h" #include "permission_verification.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/keepaliveprocessmanagerthirteenth_fuzzer/BUILD.gn b/test/fuzztest/keepaliveprocessmanagerthirteenth_fuzzer/BUILD.gn index a6e5074e26..595028108c 100644 --- a/test/fuzztest/keepaliveprocessmanagerthirteenth_fuzzer/BUILD.gn +++ b/test/fuzztest/keepaliveprocessmanagerthirteenth_fuzzer/BUILD.gn @@ -31,6 +31,7 @@ ohos_fuzztest("KeepAliveProcessManagerThirteenthFuzzTest") { "${ability_runtime_services_path}/abilitymgr/include/utils", "${ability_runtime_services_path}/abilitymgr/include/keep_alive", "${ability_runtime_services_path}/common/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/keepaliveprocessmanagerthirteenth_fuzzer/keepaliveprocessmanagerthirteenth_fuzzer.cpp b/test/fuzztest/keepaliveprocessmanagerthirteenth_fuzzer/keepaliveprocessmanagerthirteenth_fuzzer.cpp index 179fc52964..650748ce9e 100644 --- a/test/fuzztest/keepaliveprocessmanagerthirteenth_fuzzer/keepaliveprocessmanagerthirteenth_fuzzer.cpp +++ b/test/fuzztest/keepaliveprocessmanagerthirteenth_fuzzer/keepaliveprocessmanagerthirteenth_fuzzer.cpp @@ -19,13 +19,13 @@ #include #include -#include "keep_alive_process_manager.h" +#include "ability_fuzz_util.h" #include "ability_keep_alive_service.h" #include "ability_util.h" #include "app_mgr_client.h" +#include "keep_alive_process_manager.h" #include "parameters.h" #include "permission_verification.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/residentprocessmanagereleven_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagereleven_fuzzer/BUILD.gn index ece347eebb..9cb23e4b49 100644 --- a/test/fuzztest/residentprocessmanagereleven_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagereleven_fuzzer/BUILD.gn @@ -27,6 +27,7 @@ ohos_fuzztest("ResidentProcessManagerElevenFuzzTest") { include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", "${ability_runtime_innerkits_path}/dataobs_manager/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/residentprocessmanagereleven_fuzzer/residentprocessmanagereleven_fuzzer.cpp b/test/fuzztest/residentprocessmanagereleven_fuzzer/residentprocessmanagereleven_fuzzer.cpp index f1f8713b3f..3b9d7597cf 100644 --- a/test/fuzztest/residentprocessmanagereleven_fuzzer/residentprocessmanagereleven_fuzzer.cpp +++ b/test/fuzztest/residentprocessmanagereleven_fuzzer/residentprocessmanagereleven_fuzzer.cpp @@ -23,8 +23,8 @@ #include "resident_process_manager.h" #undef private +#include "ability_fuzz_util.h" #include "ability_record.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/residentprocessmanagerfirst_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagerfirst_fuzzer/BUILD.gn index 90462297a6..e557ae6599 100644 --- a/test/fuzztest/residentprocessmanagerfirst_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagerfirst_fuzzer/BUILD.gn @@ -27,6 +27,7 @@ ohos_fuzztest("ResidentProcessManagerFirstFuzzTest") { include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", "${ability_runtime_innerkits_path}/dataobs_manager/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/residentprocessmanagerfirst_fuzzer/residentprocessmanagerfirst_fuzzer.cpp b/test/fuzztest/residentprocessmanagerfirst_fuzzer/residentprocessmanagerfirst_fuzzer.cpp index 33f974819e..0730243401 100644 --- a/test/fuzztest/residentprocessmanagerfirst_fuzzer/residentprocessmanagerfirst_fuzzer.cpp +++ b/test/fuzztest/residentprocessmanagerfirst_fuzzer/residentprocessmanagerfirst_fuzzer.cpp @@ -23,8 +23,8 @@ #include "resident_process_manager.h" #undef private +#include "ability_fuzz_util.h" #include "ability_record.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/residentprocessmanagersecond_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagersecond_fuzzer/BUILD.gn index a8c00d5fd5..83cd3f9a14 100644 --- a/test/fuzztest/residentprocessmanagersecond_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagersecond_fuzzer/BUILD.gn @@ -27,6 +27,7 @@ ohos_fuzztest("ResidentProcessManagerSecondFuzzTest") { include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", "${ability_runtime_innerkits_path}/dataobs_manager/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/residentprocessmanagersecond_fuzzer/residentprocessmanagersecond_fuzzer.cpp b/test/fuzztest/residentprocessmanagersecond_fuzzer/residentprocessmanagersecond_fuzzer.cpp index 0088ee13bd..5b8bbc039a 100644 --- a/test/fuzztest/residentprocessmanagersecond_fuzzer/residentprocessmanagersecond_fuzzer.cpp +++ b/test/fuzztest/residentprocessmanagersecond_fuzzer/residentprocessmanagersecond_fuzzer.cpp @@ -23,8 +23,8 @@ #include "resident_process_manager.h" #undef private +#include "ability_fuzz_util.h" #include "ability_record.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/fuzztest/residentprocessmanagerthird_fuzzer/BUILD.gn b/test/fuzztest/residentprocessmanagerthird_fuzzer/BUILD.gn index 38c8f577bc..474d34566c 100644 --- a/test/fuzztest/residentprocessmanagerthird_fuzzer/BUILD.gn +++ b/test/fuzztest/residentprocessmanagerthird_fuzzer/BUILD.gn @@ -27,6 +27,7 @@ ohos_fuzztest("ResidentProcessManagerThirdFuzzTest") { include_dirs = [ "${ability_runtime_innerkits_path}/ability_manager/include", "${ability_runtime_innerkits_path}/dataobs_manager/include", + "${ability_runtime_test_path}/fuzztest/", ] cflags = [ "-g", diff --git a/test/fuzztest/residentprocessmanagerthird_fuzzer/residentprocessmanagerthird_fuzzer.cpp b/test/fuzztest/residentprocessmanagerthird_fuzzer/residentprocessmanagerthird_fuzzer.cpp index b0ec7cc8d8..51ff6e3932 100644 --- a/test/fuzztest/residentprocessmanagerthird_fuzzer/residentprocessmanagerthird_fuzzer.cpp +++ b/test/fuzztest/residentprocessmanagerthird_fuzzer/residentprocessmanagerthird_fuzzer.cpp @@ -23,8 +23,8 @@ #include "resident_process_manager.h" #undef private +#include "ability_fuzz_util.h" #include "ability_record.h" -#include "../ability_fuzz_util.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; diff --git a/test/unittest/quick_fix/quick_fix_manager_service_second_test/mock/src/mock_my_flag.cpp b/test/unittest/quick_fix/quick_fix_manager_service_second_test/mock/src/mock_my_flag.cpp index 7467830fbb..46570d8fdf 100644 --- a/test/unittest/quick_fix/quick_fix_manager_service_second_test/mock/src/mock_my_flag.cpp +++ b/test/unittest/quick_fix/quick_fix_manager_service_second_test/mock/src/mock_my_flag.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "../../mock/include/mock_my_flag.h" +#include "mock_my_flag.h" namespace OHOS { namespace AAFwk { diff --git a/test/unittest/quick_fix/quick_fix_manager_service_second_test/mock/src/mock_permission_verification.cpp b/test/unittest/quick_fix/quick_fix_manager_service_second_test/mock/src/mock_permission_verification.cpp index b674488151..d207bf77cd 100644 --- a/test/unittest/quick_fix/quick_fix_manager_service_second_test/mock/src/mock_permission_verification.cpp +++ b/test/unittest/quick_fix/quick_fix_manager_service_second_test/mock/src/mock_permission_verification.cpp @@ -13,8 +13,8 @@ * limitations under the License. */ -#include "../../mock/include/mock_permission_verification.h" -#include "../../mock/include/mock_my_flag.h" +#include "mock_my_flag.h" +#include "mock_permission_verification.h" namespace OHOS { namespace AAFwk {