From c5efcd004c0854a74d214e735368547b305ba779 Mon Sep 17 00:00:00 2001 From: dy_study Date: Thu, 19 May 2022 11:19:05 +0800 Subject: [PATCH] =?UTF-8?q?IssueNo:#I587X1=20Description:Form=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sig:SIG_ApplicationFramework Feature or Bugfix:Feature Binary Source: No Signed-off-by: dy_study Change-Id: If378db4637f8ec1d636c5e46e7f7ef9d547a054f --- OAT.xml | 2 - ability_base/LICENSE | 177 ++++++++++++++++++ ability_base/test/BUILD.gn | 6 - form_runtime/BUILD.gn | 1 - form_runtime/LICENSE | 177 ++++++++++++++++++ form_runtime/test/BUILD.gn | 12 +- form_runtime/test/benchmarktest/BUILD.gn | 27 +++ .../benchmarktest/form_manager_test/BUILD.gn | 0 .../form_manager_test/form_manager_test.cpp | 0 form_runtime/test/fuzztest/BUILD.gn | 24 +++ .../fuzztest/formmanager_fuzzer/BUILD.gn | 0 .../fuzztest/formmanager_fuzzer/corpus/init | 0 .../formmanager_fuzzer/formmanager_fuzzer.cpp | 0 .../formmanager_fuzzer/formmanager_fuzzer.h | 0 .../fuzztest/formmanager_fuzzer/project.xml | 0 .../form_test_bundle/formTestWidget1.hap | Bin .../test}/resource/benchmark/ohos_test.xml | 0 .../fmsSystemTestHostCommonA-signed.hap | Bin .../fmsSystemTestHostCommonB-signed.hap | Bin .../native/fmsSystemTestHostNoPerm-signed.hap | Bin .../native/fmsSystemTestHostNormal-signed.hap | Bin .../fmsSystemTestHostNormalB-signed.hap | Bin .../fmsSystemTestHostNormalC-signed.hap | Bin .../native/fmsSystemTestHostNotSys-signed.hap | Bin .../native/formSystemTestServiceA-signed.hap | Bin .../native/formSystemTestServiceB-signed.hap | Bin .../fmsSystemTestSelfStartingA-signed.hap | Bin .../fmsSystemTestSelfStartingB-signed.hap | Bin .../resource/formsystemtestability/BUILD.gn | 0 .../fmsSystemPerformance/BUILD.gn | 4 +- .../fmsSystemPerformance/config.json | 0 .../include/form_ability_performance.h | 0 .../src/form_ability_performance.cpp | 0 .../fmsSystemStress/BUILD.gn | 4 +- .../fmsSystemStress/config.json | 0 .../include/form_ability_stress.h | 0 .../src/form_ability_stress.cpp | 0 .../fmsSystemTestHostCommonA/BUILD.gn | 8 +- .../fmsSystemTestHostCommonA/config.json | 0 .../include/form_ability_commona.h | 0 .../src/form_ability_commona.cpp | 0 .../fmsSystemTestHostCommonB/BUILD.gn | 8 +- .../fmsSystemTestHostCommonB/config.json | 0 .../include/form_ability_commonb.h | 0 .../src/form_ability_commonb.cpp | 0 .../fmsSystemTestHostNoPerm/BUILD.gn | 4 +- .../fmsSystemTestHostNoPerm/config.json | 0 .../include/form_ability_no_perm.h | 0 .../src/form_ability_no_perm.cpp | 0 .../fmsSystemTestHostNormal/BUILD.gn | 8 +- .../fmsSystemTestHostNormal/config.json | 0 .../include/form_ability_a.h | 0 .../include/form_ability_deleteform.h | 0 .../include/form_ability_releaseform.h | 0 .../src/form_ability_a.cpp | 0 .../src/form_ability_deleteform.cpp | 0 .../src/form_ability_releaseform.cpp | 0 .../fmsSystemTestHostNormalB/BUILD.gn | 8 +- .../fmsSystemTestHostNormalB/config.json | 0 .../include/form_ability_b.h | 0 .../src/form_ability_b.cpp | 0 .../fmsSystemTestHostNormalC/BUILD.gn | 8 +- .../fmsSystemTestHostNormalC/config.json | 0 .../include/form_ability_c.h | 0 .../src/form_ability_c.cpp | 0 .../fmsSystemTestHostNotSys/BUILD.gn | 4 +- .../fmsSystemTestHostNotSys/config.json | 0 .../include/form_ability_not_sys.h | 0 .../src/form_ability_not_sys.cpp | 0 .../selfStartingTestHostA/BUILD.gn | 4 +- .../selfStartingTestHostA/config.json | 0 .../include/form_ability_self_starting_a.h | 0 .../src/form_ability_self_starting_a.cpp | 0 .../selfStartingTestHostB/BUILD.gn | 4 +- .../selfStartingTestHostB/config.json | 0 .../include/form_ability_self_starting_b.h | 0 .../src/form_ability_self_starting_b.cpp | 0 .../formSystemTestServiceA/BUILD.gn | 5 +- .../formSystemTestServiceA/config.json | 0 .../include/form_st_service_ability_A.h | 0 .../src/form_st_service_ability_A.cpp | 0 .../formSystemTestServiceB/BUILD.gn | 5 +- .../formSystemTestServiceB/config.json | 0 .../include/form_st_service_ability_B.h | 0 .../src/form_st_service_ability_B.cpp | 0 .../formSystemTestServiceC/BUILD.gn | 5 +- .../formSystemTestServiceC/config.json | 0 .../include/form_st_service_ability_C.h | 0 .../src/form_st_service_ability_C.cpp | 0 .../formSystemTestServiceD/BUILD.gn | 5 +- .../formSystemTestServiceD/config.json | 0 .../include/form_st_service_ability_D.h | 0 .../src/form_st_service_ability_D.cpp | 0 .../formSystemTestServiceE/BUILD.gn | 5 +- .../formSystemTestServiceE/config.json | 0 .../include/form_st_service_ability_E.h | 0 .../src/form_st_service_ability_E.cpp | 0 .../tool/include/form_test_utils.h | 0 .../tool/src/form_test_utils.cpp | 0 .../test/systemtest}/BUILD.gn | 1 + .../systemtest}/common/include/form_event.h | 0 .../common/include/form_st_common_info.h | 0 .../include/install_tool_status_receiver.h | 0 .../common/include/system_test_form_util.h | 0 .../systemtest}/common/src/form_event.cpp | 0 .../common/src/system_test_form_util.cpp | 0 .../fms_acquire_form_test/BUILD.gn | 10 +- .../fms_acquire_form_test.cpp | 0 .../fms_acquire_form_test_max/BUILD.gn | 10 +- .../fms_acquire_form_test_batch.cpp | 0 .../fms_acquire_form_test_max.cpp | 0 .../systemtest}/fms_delete_form_test/BUILD.gn | 10 +- .../fms_delete_form_test.cpp | 0 .../test/systemtest}/fms_fuzz_test/BUILD.gn | 6 +- .../fms_fuzz_test_config/config.json | 0 .../include/fuzz_test_config_parser.h | 0 .../fms_fuzz_test/include/fuzz_test_manager.h | 0 .../fms_fuzz_test/include/get_param.h | 0 .../fms_fuzz_test/src/fms_fuzz_test.cpp | 0 .../fms_fuzz_test/src/fuzz_test_manager.cpp | 0 .../fms_fuzz_test/src/get_param.cpp | 0 .../systemtest}/fms_performance_test/BUILD.gn | 10 +- .../fms_performance_config.json | 0 .../fms_performance_test.cpp | 0 .../performance_config_parser.h | 0 .../fms_release_form_test/BUILD.gn | 10 +- .../fms_release_form_test.cpp | 0 .../fms_self_starting_test/BUILD.gn | 12 +- .../fms_self_starting_test/FMS_Start_0100.sh | 0 .../fms_self_starting_test/FMS_Start_0200.sh | 0 .../fms_self_starting_test/FMS_Start_0300.sh | 0 .../fms_self_starting_test/FMS_Start_0400.sh | 0 .../fms_self_starting_test.cpp | 0 .../self_starting_test_config_parser.h | 0 .../test/systemtest}/fms_stress_test/BUILD.gn | 10 +- .../fms_stress_test/fms_stress_test.cpp | 0 .../fms_stress_test_config.json | 0 .../stress_test_config_parser.h | 0 .../unittest/fms_form_cache_mgr_test/BUILD.gn | 2 - .../unittest/fms_form_data_mgr_test/BUILD.gn | 2 - .../unittest/fms_form_db_record_test/BUILD.gn | 2 - .../fms_form_host_record_test/BUILD.gn | 2 - .../fms_form_host_record_test.cpp | 1 - .../unittest/fms_form_info_mgr_test/BUILD.gn | 2 - .../fms_form_mgr_add_form_test/BUILD.gn | 5 - .../fms_form_mgr_add_form_test.cpp | 1 - .../fms_form_mgr_cast_temp_form_test/BUILD.gn | 3 - .../fms_form_mgr_cast_temp_form_test.cpp | 1 - .../fms_form_mgr_death_callback_test/BUILD.gn | 2 - .../fms_form_mgr_death_callback_test.cpp | 1 - .../fms_form_mgr_delete_form_test/BUILD.gn | 5 - .../fms_form_mgr_delete_form_test.cpp | 1 - .../BUILD.gn | 2 - .../fms_form_mgr_lifecycle_update_test.cpp | 1 - .../fms_form_mgr_message_event_test/BUILD.gn | 2 - .../fms_form_mgr_message_event_test.cpp | 1 - .../BUILD.gn | 2 - .../BUILD.gn | 2 - .../fms_form_mgr_release_form_test/BUILD.gn | 3 - .../fms_form_mgr_request_form_test/BUILD.gn | 3 - .../fms_form_mgr_update_form_test/BUILD.gn | 2 - .../fms_form_mgr_update_form_test.cpp | 1 - .../fms_form_provider_data_test/BUILD.gn | 2 - .../fms_form_provider_mgr_test/BUILD.gn | 3 - .../fms_form_provider_mgr_test.cpp | 1 - .../fms_form_set_next_refresh_test/BUILD.gn | 3 - .../fms_form_sys_event_receiver_test/BUILD.gn | 3 - .../fms_form_sys_event_receiver_test.cpp | 1 - .../unittest/fms_form_timer_mgr_test/BUILD.gn | 2 - .../ability_runtime/test/moduletest/BUILD.gn | 1 - frameworks/kits/ability/native/test/BUILD.gn | 22 --- frameworks/kits/appkit/native/test/BUILD.gn | 4 - .../test/unittest/ability_delegator/BUILD.gn | 1 - frameworks/kits/appkit/test/BUILD.gn | 4 - frameworks/kits/test/BUILD.gn | 4 - idl/LICENSE | 177 ++++++++++++++++++ idl/OAT.xml | 69 +++++++ services/abilitymgr/BUILD.gn | 1 - services/abilitymgr/test/BUILD.gn | 1 - services/appmgr/test/BUILD.gn | 7 +- test/benchmarktest/BUILD.gn | 7 - test/fuzztest/BUILD.gn | 4 - .../abilitySrc/amsAbilityAppendTestA/BUILD.gn | 7 +- .../abilitySrc/amsAbilityAppendTestB/BUILD.gn | 7 +- .../amsAbilityVisibleTestPageA/BUILD.gn | 8 +- .../amsAbilityVisibleTestServiceB/BUILD.gn | 7 +- .../BUILD.gn | 6 +- .../amsConfigurationUpdatedTest/BUILD.gn | 7 +- .../abilitySrc/amsDataSystemTestA/BUILD.gn | 6 +- .../abilitySrc/amsDataSystemTestB/BUILD.gn | 8 +- .../abilitySrc/amsDataSystemTestC/BUILD.gn | 8 +- .../abilitySrc/amsKitSystemTestA/BUILD.gn | 7 +- .../abilitySrc/amsKitSystemTestB/BUILD.gn | 7 +- .../abilitySrc/amsKitSystemTestDataA/BUILD.gn | 6 +- .../abilitySrc/amsKitSystemTestDataB/BUILD.gn | 6 +- .../abilitySrc/amsKitSystemTestPageA/BUILD.gn | 2 - .../amsKitSystemTestService/BUILD.gn | 2 - .../abilitySrc/amsStDataAbility/BUILD.gn | 5 +- .../abilitySrc/amsSystemTestA/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestB/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestC/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestD/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestDFX/BUILD.gn | 2 - .../abilitySrc/amsSystemTestE/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestErrorK/BUILD.gn | 5 +- .../abilitySrc/amsSystemTestErrorL/BUILD.gn | 5 +- .../abilitySrc/amsSystemTestF/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestG/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestH/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestI/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestM/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestN/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestO/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestP/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestQ/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestR/BUILD.gn | 8 +- .../abilitySrc/amsSystemTestServiceA/BUILD.gn | 2 - .../abilitySrc/amsSystemTestServiceB/BUILD.gn | 2 - .../abilitySrc/amsSystemTestServiceC/BUILD.gn | 2 - .../abilitySrc/amsSystemTestServiceD/BUILD.gn | 2 - .../abilitySrc/amsSystemTestServiceE/BUILD.gn | 2 - .../abilitySrc/amsSystemTestServiceF/BUILD.gn | 2 - .../abilitySrc/amsSystemTestServiceG/BUILD.gn | 2 - .../abilitySrc/amsSystemTestServiceH/BUILD.gn | 2 - .../abilitySrc/fwkAbilityState/BUILD.gn | 7 +- .../abilitySrc/serviceAbilityA/BUILD.gn | 4 +- test/systemtest/BUILD.gn | 5 +- .../common/ams/ams_aa_command_test/BUILD.gn | 10 +- .../ams/ams_ability_append_test/BUILD.gn | 12 +- .../BUILD.gn | 12 +- .../ams/ams_ability_state_test/BUILD.gn | 12 +- .../ams/ams_ability_visible_test/BUILD.gn | 11 +- .../ams/ams_app_process_manage_test/BUILD.gn | 14 +- .../common/ams/ams_check_service/BUILD.gn | 12 +- .../ams_configuration_updated_test/BUILD.gn | 11 +- .../common/ams/ams_data_ability_test/BUILD.gn | 10 +- .../common/ams/ams_dfx_test/BUILD.gn | 11 +- .../ams/ams_service_ability_test/BUILD.gn | 10 +- test/systemtest/common/ams/tool/BUILD.gn | 10 +- .../resource}/aa/dataAbilityBundleForDump.hap | Bin .../resource}/aa/pageAbilityBundleForDump.hap | Bin .../aa/pageAbilityBundleForStart.hap | Bin .../aa/serviceAbilityBundleForStart.hap | Bin .../aa/serviceAbilityBundleForStop.hap | Bin .../test/resource}/ohos_test.xml | 0 245 files changed, 888 insertions(+), 470 deletions(-) create mode 100644 ability_base/LICENSE create mode 100644 form_runtime/LICENSE create mode 100644 form_runtime/test/benchmarktest/BUILD.gn rename {test => form_runtime/test}/benchmarktest/form_manager_test/BUILD.gn (100%) rename {test => form_runtime/test}/benchmarktest/form_manager_test/form_manager_test.cpp (100%) create mode 100644 form_runtime/test/fuzztest/BUILD.gn rename {test => form_runtime/test}/fuzztest/formmanager_fuzzer/BUILD.gn (100%) rename {test => form_runtime/test}/fuzztest/formmanager_fuzzer/corpus/init (100%) rename {test => form_runtime/test}/fuzztest/formmanager_fuzzer/formmanager_fuzzer.cpp (100%) rename {test => form_runtime/test}/fuzztest/formmanager_fuzzer/formmanager_fuzzer.h (100%) rename {test => form_runtime/test}/fuzztest/formmanager_fuzzer/project.xml (100%) rename {test => form_runtime/test}/resource/benchmark/form_test_bundle/formTestWidget1.hap (100%) rename {test => form_runtime/test}/resource/benchmark/ohos_test.xml (100%) rename {test => form_runtime/test}/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostCommonA-signed.hap (100%) rename {test => form_runtime/test}/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostCommonB-signed.hap (100%) rename {test => form_runtime/test}/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNoPerm-signed.hap (100%) rename {test => form_runtime/test}/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormal-signed.hap (100%) rename {test => form_runtime/test}/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormalB-signed.hap (100%) rename {test => form_runtime/test}/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormalC-signed.hap (100%) rename {test => form_runtime/test}/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNotSys-signed.hap (100%) rename {test => form_runtime/test}/resource/fms/fms_provider_ability_bundle/native/formSystemTestServiceA-signed.hap (100%) rename {test => form_runtime/test}/resource/fms/fms_provider_ability_bundle/native/formSystemTestServiceB-signed.hap (100%) rename {test => form_runtime/test}/resource/fms/fms_self_starting_host_bundle/fmsSystemTestSelfStartingA-signed.hap (100%) rename {test => form_runtime/test}/resource/fms/fms_self_starting_host_bundle/fmsSystemTestSelfStartingB-signed.hap (100%) rename {test => form_runtime/test}/resource/formsystemtestability/BUILD.gn (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn (93%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemPerformance/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemPerformance/include/form_ability_performance.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemPerformance/src/form_ability_performance.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemStress/BUILD.gn (93%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemStress/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemStress/include/form_ability_stress.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemStress/src/form_ability_stress.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostCommonA/BUILD.gn (89%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostCommonA/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostCommonA/include/form_ability_commona.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostCommonA/src/form_ability_commona.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostCommonB/BUILD.gn (89%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostCommonB/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostCommonB/include/form_ability_commonb.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostCommonB/src/form_ability_commonb.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn (93%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNoPerm/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNoPerm/include/form_ability_no_perm.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNoPerm/src/form_ability_no_perm.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormal/BUILD.gn (89%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormal/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_a.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_deleteform.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_releaseform.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_a.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_deleteform.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_releaseform.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormalB/BUILD.gn (88%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormalB/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormalB/include/form_ability_b.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormalB/src/form_ability_b.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormalC/BUILD.gn (88%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormalC/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormalC/include/form_ability_c.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNormalC/src/form_ability_c.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn (93%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNotSys/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNotSys/include/form_ability_not_sys.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestHostNotSys/src/form_ability_not_sys.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn (93%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/include/form_ability_self_starting_a.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/src/form_ability_self_starting_a.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn (93%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/include/form_ability_self_starting_b.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/src/form_ability_self_starting_b.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceA/BUILD.gn (91%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceA/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceA/include/form_st_service_ability_A.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceA/src/form_st_service_ability_A.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceB/BUILD.gn (91%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceB/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceB/include/form_st_service_ability_B.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceB/src/form_st_service_ability_B.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceC/BUILD.gn (91%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceC/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceC/include/form_st_service_ability_C.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceC/src/form_st_service_ability_C.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceD/BUILD.gn (91%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceD/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceD/include/form_st_service_ability_D.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceD/src/form_st_service_ability_D.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceE/BUILD.gn (91%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceE/config.json (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceE/include/form_st_service_ability_E.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/formSystemTestServiceE/src/form_st_service_ability_E.cpp (100%) rename {test => form_runtime/test}/resource/formsystemtestability/tool/include/form_test_utils.h (100%) rename {test => form_runtime/test}/resource/formsystemtestability/tool/src/form_test_utils.cpp (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/BUILD.gn (96%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/common/include/form_event.h (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/common/include/form_st_common_info.h (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/common/include/install_tool_status_receiver.h (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/common/include/system_test_form_util.h (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/common/src/form_event.cpp (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/common/src/system_test_form_util.cpp (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_acquire_form_test/BUILD.gn (85%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_acquire_form_test/fms_acquire_form_test.cpp (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_acquire_form_test_max/BUILD.gn (85%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_acquire_form_test_max/fms_acquire_form_test_batch.cpp (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_acquire_form_test_max/fms_acquire_form_test_max.cpp (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_delete_form_test/BUILD.gn (85%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_delete_form_test/fms_delete_form_test.cpp (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_fuzz_test/BUILD.gn (91%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_fuzz_test/fms_fuzz_test_config/config.json (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_fuzz_test/include/fuzz_test_config_parser.h (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_fuzz_test/include/fuzz_test_manager.h (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_fuzz_test/include/get_param.h (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_fuzz_test/src/fms_fuzz_test.cpp (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_fuzz_test/src/fuzz_test_manager.cpp (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_fuzz_test/src/get_param.cpp (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_performance_test/BUILD.gn (85%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_performance_test/fms_performance_config/fms_performance_config.json (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_performance_test/fms_performance_test.cpp (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_performance_test/performance_config_parser.h (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_release_form_test/BUILD.gn (85%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_release_form_test/fms_release_form_test.cpp (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_self_starting_test/BUILD.gn (85%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_self_starting_test/FMS_Start_0100.sh (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_self_starting_test/FMS_Start_0200.sh (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_self_starting_test/FMS_Start_0300.sh (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_self_starting_test/FMS_Start_0400.sh (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_self_starting_test/fms_self_starting_test.cpp (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_self_starting_test/self_starting_test_config_parser.h (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_stress_test/BUILD.gn (85%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_stress_test/fms_stress_test.cpp (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_stress_test/fms_stress_test_config/fms_stress_test_config.json (100%) rename {test/systemtest/common/fms => form_runtime/test/systemtest}/fms_stress_test/stress_test_config_parser.h (100%) create mode 100644 idl/LICENSE create mode 100644 idl/OAT.xml rename {test/resource/tools => tools/test/resource}/aa/dataAbilityBundleForDump.hap (100%) rename {test/resource/tools => tools/test/resource}/aa/pageAbilityBundleForDump.hap (100%) rename {test/resource/tools => tools/test/resource}/aa/pageAbilityBundleForStart.hap (100%) rename {test/resource/tools => tools/test/resource}/aa/serviceAbilityBundleForStart.hap (100%) rename {test/resource/tools => tools/test/resource}/aa/serviceAbilityBundleForStop.hap (100%) rename {test/resource/tools => tools/test/resource}/ohos_test.xml (100%) diff --git a/OAT.xml b/OAT.xml index d4ec02817f..75afe1595f 100644 --- a/OAT.xml +++ b/OAT.xml @@ -62,8 +62,6 @@ Note:If the text contains special characters, please escape them according to th - - diff --git a/ability_base/LICENSE b/ability_base/LICENSE new file mode 100644 index 0000000000..4a459866a5 --- /dev/null +++ b/ability_base/LICENSE @@ -0,0 +1,177 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/ability_base/test/BUILD.gn b/ability_base/test/BUILD.gn index be79eb9a4a..fd047472fb 100644 --- a/ability_base/test/BUILD.gn +++ b/ability_base/test/BUILD.gn @@ -46,7 +46,6 @@ config("want_private_config") { "//sdk/appexecfwk/appexecfwk_base/include", "${base_inner_api_path}/uri/include", "${base_inner_api_path}/want/include", - "${appexecfwk_path}/common/log/include", ] defines = [ @@ -101,7 +100,6 @@ ohos_unittest("patterns_matcher_test") { ] deps = [ - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -124,7 +122,6 @@ ohos_unittest("skills_test") { ] deps = [ - "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -148,7 +145,6 @@ ohos_unittest("want_params_test") { ] deps = [ - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:want", "//third_party/googletest:gtest_main", @@ -169,7 +165,6 @@ ohos_unittest("want_params_wrapper_test") { configs = [ ":module_private_want_param_wrapper_config" ] deps = [ - "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -194,7 +189,6 @@ ohos_unittest("want_test") { ] deps = [ - "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] diff --git a/form_runtime/BUILD.gn b/form_runtime/BUILD.gn index c707acdc55..8b3ec8da6e 100644 --- a/form_runtime/BUILD.gn +++ b/form_runtime/BUILD.gn @@ -27,7 +27,6 @@ ohos_shared_library("libfms") { include_dirs = [ "${services_path}/common:perm_verification", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${kits_path}/appkit/native/ability_runtime", ] sources = [ diff --git a/form_runtime/LICENSE b/form_runtime/LICENSE new file mode 100644 index 0000000000..4a459866a5 --- /dev/null +++ b/form_runtime/LICENSE @@ -0,0 +1,177 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/form_runtime/test/BUILD.gn b/form_runtime/test/BUILD.gn index 4caa61ba4d..28ca62e6b1 100644 --- a/form_runtime/test/BUILD.gn +++ b/form_runtime/test/BUILD.gn @@ -19,10 +19,7 @@ config("formmgr_test_config") { "mock/include", ] - configs = [ - "${form_runtime_path}:formmgr_config", - "${appexecfwk_path}/common:appexecfwk_common_config", - ] + configs = [ "${form_runtime_path}:formmgr_config" ] } public_configs = [ @@ -31,7 +28,6 @@ public_configs = [ ] public_deps = [ - "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -64,3 +60,9 @@ group("unittest") { "unittest/fms_form_timer_mgr_test:unittest", ] } + +group("systemtest") { + testonly = true + + deps = [ "systemtest:systemtest" ] +} diff --git a/form_runtime/test/benchmarktest/BUILD.gn b/form_runtime/test/benchmarktest/BUILD.gn new file mode 100644 index 0000000000..fe4abfa2d7 --- /dev/null +++ b/form_runtime/test/benchmarktest/BUILD.gn @@ -0,0 +1,27 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//foundation/aafwk/standard/aafwk.gni") + +group("benchmarktest") { + testonly = true + + deps = [] + + if (ability_runtime_graphics) { + deps += [ + # deps file + "form_manager_test:benchmarktest", + ] + } +} diff --git a/test/benchmarktest/form_manager_test/BUILD.gn b/form_runtime/test/benchmarktest/form_manager_test/BUILD.gn similarity index 100% rename from test/benchmarktest/form_manager_test/BUILD.gn rename to form_runtime/test/benchmarktest/form_manager_test/BUILD.gn diff --git a/test/benchmarktest/form_manager_test/form_manager_test.cpp b/form_runtime/test/benchmarktest/form_manager_test/form_manager_test.cpp similarity index 100% rename from test/benchmarktest/form_manager_test/form_manager_test.cpp rename to form_runtime/test/benchmarktest/form_manager_test/form_manager_test.cpp diff --git a/form_runtime/test/fuzztest/BUILD.gn b/form_runtime/test/fuzztest/BUILD.gn new file mode 100644 index 0000000000..a3cbecaa8b --- /dev/null +++ b/form_runtime/test/fuzztest/BUILD.gn @@ -0,0 +1,24 @@ +# Copyright (c) 2022 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//foundation/aafwk/standard/aafwk.gni") + +group("fuzztest") { + testonly = true + + deps = [] + + if (ability_runtime_graphics) { + deps += [ "formmanager_fuzzer:fuzztest" ] + } +} diff --git a/test/fuzztest/formmanager_fuzzer/BUILD.gn b/form_runtime/test/fuzztest/formmanager_fuzzer/BUILD.gn similarity index 100% rename from test/fuzztest/formmanager_fuzzer/BUILD.gn rename to form_runtime/test/fuzztest/formmanager_fuzzer/BUILD.gn diff --git a/test/fuzztest/formmanager_fuzzer/corpus/init b/form_runtime/test/fuzztest/formmanager_fuzzer/corpus/init similarity index 100% rename from test/fuzztest/formmanager_fuzzer/corpus/init rename to form_runtime/test/fuzztest/formmanager_fuzzer/corpus/init diff --git a/test/fuzztest/formmanager_fuzzer/formmanager_fuzzer.cpp b/form_runtime/test/fuzztest/formmanager_fuzzer/formmanager_fuzzer.cpp similarity index 100% rename from test/fuzztest/formmanager_fuzzer/formmanager_fuzzer.cpp rename to form_runtime/test/fuzztest/formmanager_fuzzer/formmanager_fuzzer.cpp diff --git a/test/fuzztest/formmanager_fuzzer/formmanager_fuzzer.h b/form_runtime/test/fuzztest/formmanager_fuzzer/formmanager_fuzzer.h similarity index 100% rename from test/fuzztest/formmanager_fuzzer/formmanager_fuzzer.h rename to form_runtime/test/fuzztest/formmanager_fuzzer/formmanager_fuzzer.h diff --git a/test/fuzztest/formmanager_fuzzer/project.xml b/form_runtime/test/fuzztest/formmanager_fuzzer/project.xml similarity index 100% rename from test/fuzztest/formmanager_fuzzer/project.xml rename to form_runtime/test/fuzztest/formmanager_fuzzer/project.xml diff --git a/test/resource/benchmark/form_test_bundle/formTestWidget1.hap b/form_runtime/test/resource/benchmark/form_test_bundle/formTestWidget1.hap similarity index 100% rename from test/resource/benchmark/form_test_bundle/formTestWidget1.hap rename to form_runtime/test/resource/benchmark/form_test_bundle/formTestWidget1.hap diff --git a/test/resource/benchmark/ohos_test.xml b/form_runtime/test/resource/benchmark/ohos_test.xml similarity index 100% rename from test/resource/benchmark/ohos_test.xml rename to form_runtime/test/resource/benchmark/ohos_test.xml diff --git a/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostCommonA-signed.hap b/form_runtime/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostCommonA-signed.hap similarity index 100% rename from test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostCommonA-signed.hap rename to form_runtime/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostCommonA-signed.hap diff --git a/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostCommonB-signed.hap b/form_runtime/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostCommonB-signed.hap similarity index 100% rename from test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostCommonB-signed.hap rename to form_runtime/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostCommonB-signed.hap diff --git a/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNoPerm-signed.hap b/form_runtime/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNoPerm-signed.hap similarity index 100% rename from test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNoPerm-signed.hap rename to form_runtime/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNoPerm-signed.hap diff --git a/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormal-signed.hap b/form_runtime/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormal-signed.hap similarity index 100% rename from test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormal-signed.hap rename to form_runtime/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormal-signed.hap diff --git a/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormalB-signed.hap b/form_runtime/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormalB-signed.hap similarity index 100% rename from test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormalB-signed.hap rename to form_runtime/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormalB-signed.hap diff --git a/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormalC-signed.hap b/form_runtime/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormalC-signed.hap similarity index 100% rename from test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormalC-signed.hap rename to form_runtime/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNormalC-signed.hap diff --git a/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNotSys-signed.hap b/form_runtime/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNotSys-signed.hap similarity index 100% rename from test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNotSys-signed.hap rename to form_runtime/test/resource/fms/fms_host_ability_bundle/native/fmsSystemTestHostNotSys-signed.hap diff --git a/test/resource/fms/fms_provider_ability_bundle/native/formSystemTestServiceA-signed.hap b/form_runtime/test/resource/fms/fms_provider_ability_bundle/native/formSystemTestServiceA-signed.hap similarity index 100% rename from test/resource/fms/fms_provider_ability_bundle/native/formSystemTestServiceA-signed.hap rename to form_runtime/test/resource/fms/fms_provider_ability_bundle/native/formSystemTestServiceA-signed.hap diff --git a/test/resource/fms/fms_provider_ability_bundle/native/formSystemTestServiceB-signed.hap b/form_runtime/test/resource/fms/fms_provider_ability_bundle/native/formSystemTestServiceB-signed.hap similarity index 100% rename from test/resource/fms/fms_provider_ability_bundle/native/formSystemTestServiceB-signed.hap rename to form_runtime/test/resource/fms/fms_provider_ability_bundle/native/formSystemTestServiceB-signed.hap diff --git a/test/resource/fms/fms_self_starting_host_bundle/fmsSystemTestSelfStartingA-signed.hap b/form_runtime/test/resource/fms/fms_self_starting_host_bundle/fmsSystemTestSelfStartingA-signed.hap similarity index 100% rename from test/resource/fms/fms_self_starting_host_bundle/fmsSystemTestSelfStartingA-signed.hap rename to form_runtime/test/resource/fms/fms_self_starting_host_bundle/fmsSystemTestSelfStartingA-signed.hap diff --git a/test/resource/fms/fms_self_starting_host_bundle/fmsSystemTestSelfStartingB-signed.hap b/form_runtime/test/resource/fms/fms_self_starting_host_bundle/fmsSystemTestSelfStartingB-signed.hap similarity index 100% rename from test/resource/fms/fms_self_starting_host_bundle/fmsSystemTestSelfStartingB-signed.hap rename to form_runtime/test/resource/fms/fms_self_starting_host_bundle/fmsSystemTestSelfStartingB-signed.hap diff --git a/test/resource/formsystemtestability/BUILD.gn b/form_runtime/test/resource/formsystemtestability/BUILD.gn similarity index 100% rename from test/resource/formsystemtestability/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/BUILD.gn diff --git a/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn b/form_runtime/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn similarity index 93% rename from test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn index 70a593fd7f..a42ecc2924 100644 --- a/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn @@ -17,13 +17,12 @@ config("fmsSystemPerformanceConfig") { include_dirs = [ "include", "../tool/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "test/systemtest/common/fms/common/include", "${aafwk_path}/interfaces/innerkits/ability_manager/include", "${base_inner_api_path}/uri/include", "${base_inner_api_path}/want/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${appexecfwk_innerkits_path}/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", @@ -51,7 +50,6 @@ ohos_shared_library("fmsSystemPerformance") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/fmsSystemPerformance/config.json b/form_runtime/test/resource/formsystemtestability/fmsSystemPerformance/config.json similarity index 100% rename from test/resource/formsystemtestability/fmsSystemPerformance/config.json rename to form_runtime/test/resource/formsystemtestability/fmsSystemPerformance/config.json diff --git a/test/resource/formsystemtestability/fmsSystemPerformance/include/form_ability_performance.h b/form_runtime/test/resource/formsystemtestability/fmsSystemPerformance/include/form_ability_performance.h similarity index 100% rename from test/resource/formsystemtestability/fmsSystemPerformance/include/form_ability_performance.h rename to form_runtime/test/resource/formsystemtestability/fmsSystemPerformance/include/form_ability_performance.h diff --git a/test/resource/formsystemtestability/fmsSystemPerformance/src/form_ability_performance.cpp b/form_runtime/test/resource/formsystemtestability/fmsSystemPerformance/src/form_ability_performance.cpp similarity index 100% rename from test/resource/formsystemtestability/fmsSystemPerformance/src/form_ability_performance.cpp rename to form_runtime/test/resource/formsystemtestability/fmsSystemPerformance/src/form_ability_performance.cpp diff --git a/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn b/form_runtime/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn similarity index 93% rename from test/resource/formsystemtestability/fmsSystemStress/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn index 5c5039e41a..889380ff1c 100644 --- a/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn @@ -17,13 +17,12 @@ config("fmsSystemStressConfig") { include_dirs = [ "include", "../tool/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "test/systemtest/common/fms/common/include", "${aafwk_path}/interfaces/innerkits/ability_manager/include", "${base_inner_api_path}/uri/include", "${base_inner_api_path}/want/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${appexecfwk_innerkits_path}/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", @@ -51,7 +50,6 @@ ohos_shared_library("fmsSystemStress") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/fmsSystemStress/config.json b/form_runtime/test/resource/formsystemtestability/fmsSystemStress/config.json similarity index 100% rename from test/resource/formsystemtestability/fmsSystemStress/config.json rename to form_runtime/test/resource/formsystemtestability/fmsSystemStress/config.json diff --git a/test/resource/formsystemtestability/fmsSystemStress/include/form_ability_stress.h b/form_runtime/test/resource/formsystemtestability/fmsSystemStress/include/form_ability_stress.h similarity index 100% rename from test/resource/formsystemtestability/fmsSystemStress/include/form_ability_stress.h rename to form_runtime/test/resource/formsystemtestability/fmsSystemStress/include/form_ability_stress.h diff --git a/test/resource/formsystemtestability/fmsSystemStress/src/form_ability_stress.cpp b/form_runtime/test/resource/formsystemtestability/fmsSystemStress/src/form_ability_stress.cpp similarity index 100% rename from test/resource/formsystemtestability/fmsSystemStress/src/form_ability_stress.cpp rename to form_runtime/test/resource/formsystemtestability/fmsSystemStress/src/form_ability_stress.cpp diff --git a/test/resource/formsystemtestability/fmsSystemTestHostCommonA/BUILD.gn b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonA/BUILD.gn similarity index 89% rename from test/resource/formsystemtestability/fmsSystemTestHostCommonA/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonA/BUILD.gn index 85b50e9d74..56c4f59aed 100644 --- a/test/resource/formsystemtestability/fmsSystemTestHostCommonA/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonA/BUILD.gn @@ -17,13 +17,12 @@ config("fmsSystemTestHostCommonAConfig") { include_dirs = [ "include", "../tool/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "test/systemtest/common/fms/common/include", "${aafwk_path}/interfaces/innerkits/ability_manager/include", "${base_inner_api_path}/uri/include", "${base_inner_api_path}/want/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${appexecfwk_innerkits_path}/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", @@ -38,10 +37,10 @@ config("fmsSystemTestHostCommonAConfig") { } ohos_shared_library("fmsSystemTestHostCommonA") { sources = [ - "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp", - "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp", "../tool/src/form_test_utils.cpp", "src/form_ability_commona.cpp", + "test/systemtest/common/fms/common/src/form_event.cpp", + "test/systemtest/common/fms/common/src/system_test_form_util.cpp", ] cflags = [] if (target_cpu == "arm") { @@ -57,7 +56,6 @@ ohos_shared_library("fmsSystemTestHostCommonA") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/services/abilitymgr:abilityms", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/fmsSystemTestHostCommonA/config.json b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonA/config.json similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostCommonA/config.json rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonA/config.json diff --git a/test/resource/formsystemtestability/fmsSystemTestHostCommonA/include/form_ability_commona.h b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonA/include/form_ability_commona.h similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostCommonA/include/form_ability_commona.h rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonA/include/form_ability_commona.h diff --git a/test/resource/formsystemtestability/fmsSystemTestHostCommonA/src/form_ability_commona.cpp b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonA/src/form_ability_commona.cpp similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostCommonA/src/form_ability_commona.cpp rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonA/src/form_ability_commona.cpp diff --git a/test/resource/formsystemtestability/fmsSystemTestHostCommonB/BUILD.gn b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonB/BUILD.gn similarity index 89% rename from test/resource/formsystemtestability/fmsSystemTestHostCommonB/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonB/BUILD.gn index 40c197f2db..b5c62f5ce8 100644 --- a/test/resource/formsystemtestability/fmsSystemTestHostCommonB/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonB/BUILD.gn @@ -17,13 +17,12 @@ config("fmsSystemTestHostCommonBConfig") { include_dirs = [ "include", "../tool/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "test/systemtest/common/fms/common/include", "${aafwk_path}/interfaces/innerkits/ability_manager/include", "${base_inner_api_path}/uri/include", "${base_inner_api_path}/want/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${appexecfwk_innerkits_path}/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", @@ -38,10 +37,10 @@ config("fmsSystemTestHostCommonBConfig") { } ohos_shared_library("fmsSystemTestHostCommonB") { sources = [ - "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp", - "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp", "../tool/src/form_test_utils.cpp", "src/form_ability_commonb.cpp", + "test/systemtest/common/fms/common/src/form_event.cpp", + "test/systemtest/common/fms/common/src/system_test_form_util.cpp", ] cflags = [] if (target_cpu == "arm") { @@ -57,7 +56,6 @@ ohos_shared_library("fmsSystemTestHostCommonB") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/services/abilitymgr:abilityms", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/fmsSystemTestHostCommonB/config.json b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonB/config.json similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostCommonB/config.json rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonB/config.json diff --git a/test/resource/formsystemtestability/fmsSystemTestHostCommonB/include/form_ability_commonb.h b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonB/include/form_ability_commonb.h similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostCommonB/include/form_ability_commonb.h rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonB/include/form_ability_commonb.h diff --git a/test/resource/formsystemtestability/fmsSystemTestHostCommonB/src/form_ability_commonb.cpp b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonB/src/form_ability_commonb.cpp similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostCommonB/src/form_ability_commonb.cpp rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonB/src/form_ability_commonb.cpp diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn similarity index 93% rename from test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn index 633637d139..696ae6879b 100644 --- a/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn @@ -17,13 +17,12 @@ config("fmsSystemTestHostNoPermConfig") { include_dirs = [ "include", "../tool/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "test/systemtest/common/fms/common/include", "${aafwk_path}/interfaces/innerkits/ability_manager/include", "${base_inner_api_path}/uri/include", "${base_inner_api_path}/want/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${appexecfwk_innerkits_path}/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", @@ -51,7 +50,6 @@ ohos_shared_library("fmsSystemTestHostNoPerm") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/config.json b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/config.json similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNoPerm/config.json rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/config.json diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/include/form_ability_no_perm.h b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/include/form_ability_no_perm.h similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNoPerm/include/form_ability_no_perm.h rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/include/form_ability_no_perm.h diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/src/form_ability_no_perm.cpp b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/src/form_ability_no_perm.cpp similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNoPerm/src/form_ability_no_perm.cpp rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/src/form_ability_no_perm.cpp diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormal/BUILD.gn b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/BUILD.gn similarity index 89% rename from test/resource/formsystemtestability/fmsSystemTestHostNormal/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/BUILD.gn index fcd22f1229..c0189b046e 100644 --- a/test/resource/formsystemtestability/fmsSystemTestHostNormal/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/BUILD.gn @@ -17,13 +17,12 @@ config("fmsSystemTestHostNormalConfig") { include_dirs = [ "include", "../tool/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "test/systemtest/common/fms/common/include", "${aafwk_path}/interfaces/innerkits/ability_manager/include", "${base_inner_api_path}/uri/include", "${base_inner_api_path}/want/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${appexecfwk_innerkits_path}/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", @@ -38,12 +37,12 @@ config("fmsSystemTestHostNormalConfig") { } ohos_shared_library("fmsSystemTestHostNormal") { sources = [ - "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp", - "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp", "../tool/src/form_test_utils.cpp", "src/form_ability_a.cpp", "src/form_ability_deleteform.cpp", "src/form_ability_releaseform.cpp", + "test/systemtest/common/fms/common/src/form_event.cpp", + "test/systemtest/common/fms/common/src/system_test_form_util.cpp", ] cflags = [] if (target_cpu == "arm") { @@ -59,7 +58,6 @@ ohos_shared_library("fmsSystemTestHostNormal") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/services/abilitymgr:abilityms", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormal/config.json b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/config.json similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNormal/config.json rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/config.json diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_a.h b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_a.h similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_a.h rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_a.h diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_deleteform.h b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_deleteform.h similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_deleteform.h rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_deleteform.h diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_releaseform.h b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_releaseform.h similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_releaseform.h rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/include/form_ability_releaseform.h diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_a.cpp b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_a.cpp similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_a.cpp rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_a.cpp diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_deleteform.cpp b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_deleteform.cpp similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_deleteform.cpp rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_deleteform.cpp diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_releaseform.cpp b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_releaseform.cpp similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_releaseform.cpp rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/src/form_ability_releaseform.cpp diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormalB/BUILD.gn b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalB/BUILD.gn similarity index 88% rename from test/resource/formsystemtestability/fmsSystemTestHostNormalB/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalB/BUILD.gn index 6970bfbe4a..8238236bf1 100644 --- a/test/resource/formsystemtestability/fmsSystemTestHostNormalB/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalB/BUILD.gn @@ -17,13 +17,12 @@ config("fmsSystemTestHostNormalBConfig") { include_dirs = [ "include", "../tool/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "test/systemtest/common/fms/common/include", "${aafwk_path}/interfaces/innerkits/ability_manager/include", "${base_inner_api_path}/uri/include", "${base_inner_api_path}/want/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${appexecfwk_innerkits_path}/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", @@ -38,10 +37,10 @@ config("fmsSystemTestHostNormalBConfig") { } ohos_shared_library("fmsSystemTestHostNormalB") { sources = [ - "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp", - "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp", "../tool/src/form_test_utils.cpp", "src/form_ability_b.cpp", + "test/systemtest/common/fms/common/src/form_event.cpp", + "test/systemtest/common/fms/common/src/system_test_form_util.cpp", ] cflags = [] if (target_cpu == "arm") { @@ -57,7 +56,6 @@ ohos_shared_library("fmsSystemTestHostNormalB") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/services/abilitymgr:abilityms", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormalB/config.json b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalB/config.json similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNormalB/config.json rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalB/config.json diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormalB/include/form_ability_b.h b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalB/include/form_ability_b.h similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNormalB/include/form_ability_b.h rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalB/include/form_ability_b.h diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormalB/src/form_ability_b.cpp b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalB/src/form_ability_b.cpp similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNormalB/src/form_ability_b.cpp rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalB/src/form_ability_b.cpp diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormalC/BUILD.gn b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalC/BUILD.gn similarity index 88% rename from test/resource/formsystemtestability/fmsSystemTestHostNormalC/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalC/BUILD.gn index df34f0d79d..f4a2828d8e 100644 --- a/test/resource/formsystemtestability/fmsSystemTestHostNormalC/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalC/BUILD.gn @@ -17,13 +17,12 @@ config("fmsSystemTestHostNormalCConfig") { include_dirs = [ "include", "../tool/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "test/systemtest/common/fms/common/include", "${aafwk_path}/interfaces/innerkits/ability_manager/include", "${base_inner_api_path}/uri/include", "${base_inner_api_path}/want/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${appexecfwk_innerkits_path}/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", @@ -38,10 +37,10 @@ config("fmsSystemTestHostNormalCConfig") { } ohos_shared_library("fmsSystemTestHostNormalC") { sources = [ - "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp", - "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp", "../tool/src/form_test_utils.cpp", "src/form_ability_c.cpp", + "test/systemtest/common/fms/common/src/form_event.cpp", + "test/systemtest/common/fms/common/src/system_test_form_util.cpp", ] cflags = [] if (target_cpu == "arm") { @@ -57,7 +56,6 @@ ohos_shared_library("fmsSystemTestHostNormalC") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/services/abilitymgr:abilityms", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormalC/config.json b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalC/config.json similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNormalC/config.json rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalC/config.json diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormalC/include/form_ability_c.h b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalC/include/form_ability_c.h similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNormalC/include/form_ability_c.h rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalC/include/form_ability_c.h diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNormalC/src/form_ability_c.cpp b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalC/src/form_ability_c.cpp similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNormalC/src/form_ability_c.cpp rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalC/src/form_ability_c.cpp diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn similarity index 93% rename from test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn index 49d726451f..98945d19c8 100644 --- a/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn @@ -17,13 +17,12 @@ config("fmsSystemTestHostNotSysConfig") { include_dirs = [ "include", "../tool/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "test/systemtest/common/fms/common/include", "${aafwk_path}/interfaces/innerkits/ability_manager/include", "${base_inner_api_path}/uri/include", "${base_inner_api_path}/want/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${appexecfwk_innerkits_path}/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", @@ -51,7 +50,6 @@ ohos_shared_library("fmsSystemTestHostNotSys") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNotSys/config.json b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNotSys/config.json similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNotSys/config.json rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNotSys/config.json diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNotSys/include/form_ability_not_sys.h b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNotSys/include/form_ability_not_sys.h similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNotSys/include/form_ability_not_sys.h rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNotSys/include/form_ability_not_sys.h diff --git a/test/resource/formsystemtestability/fmsSystemTestHostNotSys/src/form_ability_not_sys.cpp b/form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNotSys/src/form_ability_not_sys.cpp similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestHostNotSys/src/form_ability_not_sys.cpp rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNotSys/src/form_ability_not_sys.cpp diff --git a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn b/form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn similarity index 93% rename from test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn index 4f36824d55..b47ff020ab 100644 --- a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn @@ -17,13 +17,12 @@ config("selfStartingTestHostAConfig") { include_dirs = [ "include", "../../tool/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "test/systemtest/common/fms/common/include", "${aafwk_path}/interfaces/innerkits/ability_manager/include", "${base_inner_api_path}/uri/include", "${base_inner_api_path}/want/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${appexecfwk_innerkits_path}/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", @@ -51,7 +50,6 @@ ohos_shared_library("selfStartingTestHostA") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/config.json b/form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/config.json similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/config.json rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/config.json diff --git a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/include/form_ability_self_starting_a.h b/form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/include/form_ability_self_starting_a.h similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/include/form_ability_self_starting_a.h rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/include/form_ability_self_starting_a.h diff --git a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/src/form_ability_self_starting_a.cpp b/form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/src/form_ability_self_starting_a.cpp similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/src/form_ability_self_starting_a.cpp rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/src/form_ability_self_starting_a.cpp diff --git a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn b/form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn similarity index 93% rename from test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn index e9ed40ce12..c4f3a298dc 100644 --- a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn @@ -17,13 +17,12 @@ config("selfStartingTestHostBConfig") { include_dirs = [ "include", "../../tool/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "test/systemtest/common/fms/common/include", "${aafwk_path}/interfaces/innerkits/ability_manager/include", "${base_inner_api_path}/uri/include", "${base_inner_api_path}/want/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${appexecfwk_innerkits_path}/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", @@ -51,7 +50,6 @@ ohos_shared_library("selfStartingTestHostB") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/config.json b/form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/config.json similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/config.json rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/config.json diff --git a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/include/form_ability_self_starting_b.h b/form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/include/form_ability_self_starting_b.h similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/include/form_ability_self_starting_b.h rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/include/form_ability_self_starting_b.h diff --git a/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/src/form_ability_self_starting_b.cpp b/form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/src/form_ability_self_starting_b.cpp similarity index 100% rename from test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/src/form_ability_self_starting_b.cpp rename to form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/src/form_ability_self_starting_b.cpp diff --git a/test/resource/formsystemtestability/formSystemTestServiceA/BUILD.gn b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceA/BUILD.gn similarity index 91% rename from test/resource/formsystemtestability/formSystemTestServiceA/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceA/BUILD.gn index 310fd99cd2..7be4bbe5e6 100644 --- a/test/resource/formsystemtestability/formSystemTestServiceA/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceA/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -subdemosystem_path = "${appexecfwk_path}/test/resource/formsystemtestability/formSystemTestServiceA" +subdemosystem_path = + "test/resource/formsystemtestability/formSystemTestServiceA" config("formSystemTestAConfig") { visibility = [ ":*" ] include_dirs = [ @@ -25,7 +26,6 @@ config("formSystemTestAConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${even_path}/cesfwk/innerkits/include", "${even_path}/cesfwk/kits/native/include", ] @@ -43,7 +43,6 @@ ohos_shared_library("formSystemTestServiceA") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/formSystemTestServiceA/config.json b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceA/config.json similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceA/config.json rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceA/config.json diff --git a/test/resource/formsystemtestability/formSystemTestServiceA/include/form_st_service_ability_A.h b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceA/include/form_st_service_ability_A.h similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceA/include/form_st_service_ability_A.h rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceA/include/form_st_service_ability_A.h diff --git a/test/resource/formsystemtestability/formSystemTestServiceA/src/form_st_service_ability_A.cpp b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceA/src/form_st_service_ability_A.cpp similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceA/src/form_st_service_ability_A.cpp rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceA/src/form_st_service_ability_A.cpp diff --git a/test/resource/formsystemtestability/formSystemTestServiceB/BUILD.gn b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceB/BUILD.gn similarity index 91% rename from test/resource/formsystemtestability/formSystemTestServiceB/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceB/BUILD.gn index cba1376122..6581094dad 100644 --- a/test/resource/formsystemtestability/formSystemTestServiceB/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceB/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -subdemosystem_path = "${appexecfwk_path}/test/resource/formsystemtestability/formSystemTestServiceB" +subdemosystem_path = + "test/resource/formsystemtestability/formSystemTestServiceB" config("formSystemTestBConfig") { visibility = [ ":*" ] include_dirs = [ @@ -25,7 +26,6 @@ config("formSystemTestBConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${even_path}/cesfwk/innerkits/include", "${even_path}/cesfwk/kits/native/include", ] @@ -43,7 +43,6 @@ ohos_shared_library("formSystemTestServiceB") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/formSystemTestServiceB/config.json b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceB/config.json similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceB/config.json rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceB/config.json diff --git a/test/resource/formsystemtestability/formSystemTestServiceB/include/form_st_service_ability_B.h b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceB/include/form_st_service_ability_B.h similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceB/include/form_st_service_ability_B.h rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceB/include/form_st_service_ability_B.h diff --git a/test/resource/formsystemtestability/formSystemTestServiceB/src/form_st_service_ability_B.cpp b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceB/src/form_st_service_ability_B.cpp similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceB/src/form_st_service_ability_B.cpp rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceB/src/form_st_service_ability_B.cpp diff --git a/test/resource/formsystemtestability/formSystemTestServiceC/BUILD.gn b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceC/BUILD.gn similarity index 91% rename from test/resource/formsystemtestability/formSystemTestServiceC/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceC/BUILD.gn index 18ceae35e1..03f301132b 100644 --- a/test/resource/formsystemtestability/formSystemTestServiceC/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceC/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -subdemosystem_path = "${appexecfwk_path}/test/resource/formsystemtestability/formSystemTestServiceC" +subdemosystem_path = + "test/resource/formsystemtestability/formSystemTestServiceC" config("formSystemTestCConfig") { visibility = [ ":*" ] include_dirs = [ @@ -25,7 +26,6 @@ config("formSystemTestCConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${even_path}/cesfwk/innerkits/include", "${even_path}/cesfwk/kits/native/include", ] @@ -43,7 +43,6 @@ ohos_shared_library("formSystemTestServiceC") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/formSystemTestServiceC/config.json b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceC/config.json similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceC/config.json rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceC/config.json diff --git a/test/resource/formsystemtestability/formSystemTestServiceC/include/form_st_service_ability_C.h b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceC/include/form_st_service_ability_C.h similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceC/include/form_st_service_ability_C.h rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceC/include/form_st_service_ability_C.h diff --git a/test/resource/formsystemtestability/formSystemTestServiceC/src/form_st_service_ability_C.cpp b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceC/src/form_st_service_ability_C.cpp similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceC/src/form_st_service_ability_C.cpp rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceC/src/form_st_service_ability_C.cpp diff --git a/test/resource/formsystemtestability/formSystemTestServiceD/BUILD.gn b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceD/BUILD.gn similarity index 91% rename from test/resource/formsystemtestability/formSystemTestServiceD/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceD/BUILD.gn index 17dc29a5fb..00425e2d16 100644 --- a/test/resource/formsystemtestability/formSystemTestServiceD/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceD/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -subdemosystem_path = "${appexecfwk_path}/test/resource/formsystemtestability/formSystemTestServiceD" +subdemosystem_path = + "test/resource/formsystemtestability/formSystemTestServiceD" config("formSystemTestDConfig") { visibility = [ ":*" ] include_dirs = [ @@ -25,7 +26,6 @@ config("formSystemTestDConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${even_path}/cesfwk/innerkits/include", "${even_path}/cesfwk/kits/native/include", ] @@ -43,7 +43,6 @@ ohos_shared_library("formSystemTestServiceD") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/formSystemTestServiceD/config.json b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceD/config.json similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceD/config.json rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceD/config.json diff --git a/test/resource/formsystemtestability/formSystemTestServiceD/include/form_st_service_ability_D.h b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceD/include/form_st_service_ability_D.h similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceD/include/form_st_service_ability_D.h rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceD/include/form_st_service_ability_D.h diff --git a/test/resource/formsystemtestability/formSystemTestServiceD/src/form_st_service_ability_D.cpp b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceD/src/form_st_service_ability_D.cpp similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceD/src/form_st_service_ability_D.cpp rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceD/src/form_st_service_ability_D.cpp diff --git a/test/resource/formsystemtestability/formSystemTestServiceE/BUILD.gn b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceE/BUILD.gn similarity index 91% rename from test/resource/formsystemtestability/formSystemTestServiceE/BUILD.gn rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceE/BUILD.gn index facf32405d..d7fe26bb52 100644 --- a/test/resource/formsystemtestability/formSystemTestServiceE/BUILD.gn +++ b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceE/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -subdemosystem_path = "${appexecfwk_path}/test/resource/formsystemtestability/formSystemTestServiceE" +subdemosystem_path = + "test/resource/formsystemtestability/formSystemTestServiceE" config("formSystemTestEConfig") { visibility = [ ":*" ] include_dirs = [ @@ -25,7 +26,6 @@ config("formSystemTestEConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${even_path}/cesfwk/innerkits/include", "${even_path}/cesfwk/kits/native/include", ] @@ -43,7 +43,6 @@ ohos_shared_library("formSystemTestServiceE") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//utils/native/base:utilsbase", diff --git a/test/resource/formsystemtestability/formSystemTestServiceE/config.json b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceE/config.json similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceE/config.json rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceE/config.json diff --git a/test/resource/formsystemtestability/formSystemTestServiceE/include/form_st_service_ability_E.h b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceE/include/form_st_service_ability_E.h similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceE/include/form_st_service_ability_E.h rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceE/include/form_st_service_ability_E.h diff --git a/test/resource/formsystemtestability/formSystemTestServiceE/src/form_st_service_ability_E.cpp b/form_runtime/test/resource/formsystemtestability/formSystemTestServiceE/src/form_st_service_ability_E.cpp similarity index 100% rename from test/resource/formsystemtestability/formSystemTestServiceE/src/form_st_service_ability_E.cpp rename to form_runtime/test/resource/formsystemtestability/formSystemTestServiceE/src/form_st_service_ability_E.cpp diff --git a/test/resource/formsystemtestability/tool/include/form_test_utils.h b/form_runtime/test/resource/formsystemtestability/tool/include/form_test_utils.h similarity index 100% rename from test/resource/formsystemtestability/tool/include/form_test_utils.h rename to form_runtime/test/resource/formsystemtestability/tool/include/form_test_utils.h diff --git a/test/resource/formsystemtestability/tool/src/form_test_utils.cpp b/form_runtime/test/resource/formsystemtestability/tool/src/form_test_utils.cpp similarity index 100% rename from test/resource/formsystemtestability/tool/src/form_test_utils.cpp rename to form_runtime/test/resource/formsystemtestability/tool/src/form_test_utils.cpp diff --git a/test/systemtest/common/fms/BUILD.gn b/form_runtime/test/systemtest/BUILD.gn similarity index 96% rename from test/systemtest/common/fms/BUILD.gn rename to form_runtime/test/systemtest/BUILD.gn index 63266a9c6a..ff79cca4ad 100644 --- a/test/systemtest/common/fms/BUILD.gn +++ b/form_runtime/test/systemtest/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/ohos.gni") +import("//foundation/aafwk/standard/aafwk.gni") config("form_manager_test_config") { defines = [ diff --git a/test/systemtest/common/fms/common/include/form_event.h b/form_runtime/test/systemtest/common/include/form_event.h similarity index 100% rename from test/systemtest/common/fms/common/include/form_event.h rename to form_runtime/test/systemtest/common/include/form_event.h diff --git a/test/systemtest/common/fms/common/include/form_st_common_info.h b/form_runtime/test/systemtest/common/include/form_st_common_info.h similarity index 100% rename from test/systemtest/common/fms/common/include/form_st_common_info.h rename to form_runtime/test/systemtest/common/include/form_st_common_info.h diff --git a/test/systemtest/common/fms/common/include/install_tool_status_receiver.h b/form_runtime/test/systemtest/common/include/install_tool_status_receiver.h similarity index 100% rename from test/systemtest/common/fms/common/include/install_tool_status_receiver.h rename to form_runtime/test/systemtest/common/include/install_tool_status_receiver.h diff --git a/test/systemtest/common/fms/common/include/system_test_form_util.h b/form_runtime/test/systemtest/common/include/system_test_form_util.h similarity index 100% rename from test/systemtest/common/fms/common/include/system_test_form_util.h rename to form_runtime/test/systemtest/common/include/system_test_form_util.h diff --git a/test/systemtest/common/fms/common/src/form_event.cpp b/form_runtime/test/systemtest/common/src/form_event.cpp similarity index 100% rename from test/systemtest/common/fms/common/src/form_event.cpp rename to form_runtime/test/systemtest/common/src/form_event.cpp diff --git a/test/systemtest/common/fms/common/src/system_test_form_util.cpp b/form_runtime/test/systemtest/common/src/system_test_form_util.cpp similarity index 100% rename from test/systemtest/common/fms/common/src/system_test_form_util.cpp rename to form_runtime/test/systemtest/common/src/system_test_form_util.cpp diff --git a/test/systemtest/common/fms/fms_acquire_form_test/BUILD.gn b/form_runtime/test/systemtest/fms_acquire_form_test/BUILD.gn similarity index 85% rename from test/systemtest/common/fms/fms_acquire_form_test/BUILD.gn rename to form_runtime/test/systemtest/fms_acquire_form_test/BUILD.gn index d0a9e80de1..22a954b4c1 100644 --- a/test/systemtest/common/fms/fms_acquire_form_test/BUILD.gn +++ b/form_runtime/test/systemtest/fms_acquire_form_test/BUILD.gn @@ -12,20 +12,21 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") -module_output_path = "appexecfwk_standard/formmanagerst" +module_output_path = "form_runtime/formmanagerst" ohos_systemtest("FmsAcquireFormTest") { module_out_path = module_output_path include_dirs = [ + "../common/fms/common/include", "${aafwk_path}/interfaces/innerkits/ability_manager/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", "${distributedschedule_path}/safwk/services/safwk/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp", - "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp", + "../common/fms/common/src/form_event.cpp", + "../common/fms/common/src/system_test_form_util.cpp", "fms_acquire_form_test.cpp", ] @@ -44,7 +45,6 @@ ohos_systemtest("FmsAcquireFormTest") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_acquire_form_test/fms_acquire_form_test.cpp b/form_runtime/test/systemtest/fms_acquire_form_test/fms_acquire_form_test.cpp similarity index 100% rename from test/systemtest/common/fms/fms_acquire_form_test/fms_acquire_form_test.cpp rename to form_runtime/test/systemtest/fms_acquire_form_test/fms_acquire_form_test.cpp diff --git a/test/systemtest/common/fms/fms_acquire_form_test_max/BUILD.gn b/form_runtime/test/systemtest/fms_acquire_form_test_max/BUILD.gn similarity index 85% rename from test/systemtest/common/fms/fms_acquire_form_test_max/BUILD.gn rename to form_runtime/test/systemtest/fms_acquire_form_test_max/BUILD.gn index 502f56176c..ec443f858f 100644 --- a/test/systemtest/common/fms/fms_acquire_form_test_max/BUILD.gn +++ b/form_runtime/test/systemtest/fms_acquire_form_test_max/BUILD.gn @@ -12,20 +12,21 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") -module_output_path = "appexecfwk_standard/formmanagerst" +module_output_path = "form_runtime/formmanagerst" ohos_systemtest("FmsAcquireFormTestMax") { module_out_path = module_output_path include_dirs = [ "${aafwk_path}/interfaces/innerkits/ability_manager/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "../common/fms/common/include", "${distributedschedule_path}/safwk/services/safwk/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp", - "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp", + "../common/fms/common/src/form_event.cpp", + "../common/fms/common/src/system_test_form_util.cpp", "fms_acquire_form_test_batch.cpp", ] @@ -44,7 +45,6 @@ ohos_systemtest("FmsAcquireFormTestMax") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_acquire_form_test_max/fms_acquire_form_test_batch.cpp b/form_runtime/test/systemtest/fms_acquire_form_test_max/fms_acquire_form_test_batch.cpp similarity index 100% rename from test/systemtest/common/fms/fms_acquire_form_test_max/fms_acquire_form_test_batch.cpp rename to form_runtime/test/systemtest/fms_acquire_form_test_max/fms_acquire_form_test_batch.cpp diff --git a/test/systemtest/common/fms/fms_acquire_form_test_max/fms_acquire_form_test_max.cpp b/form_runtime/test/systemtest/fms_acquire_form_test_max/fms_acquire_form_test_max.cpp similarity index 100% rename from test/systemtest/common/fms/fms_acquire_form_test_max/fms_acquire_form_test_max.cpp rename to form_runtime/test/systemtest/fms_acquire_form_test_max/fms_acquire_form_test_max.cpp diff --git a/test/systemtest/common/fms/fms_delete_form_test/BUILD.gn b/form_runtime/test/systemtest/fms_delete_form_test/BUILD.gn similarity index 85% rename from test/systemtest/common/fms/fms_delete_form_test/BUILD.gn rename to form_runtime/test/systemtest/fms_delete_form_test/BUILD.gn index c82a8fac2b..ee21ee7049 100644 --- a/test/systemtest/common/fms/fms_delete_form_test/BUILD.gn +++ b/form_runtime/test/systemtest/fms_delete_form_test/BUILD.gn @@ -12,20 +12,21 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") -module_output_path = "appexecfwk_standard/formmanagerst" +module_output_path = "form_runtime/formmanagerst" ohos_systemtest("FormDeleteFormTest") { module_out_path = module_output_path include_dirs = [ "${aafwk_path}/interfaces/innerkits/ability_manager/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "../common/fms/common/include", "${distributedschedule_path}/safwk/services/safwk/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp", - "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp", + "../common/fms/common/src/form_event.cpp", + "../common/fms/common/src/system_test_form_util.cpp", "fms_delete_form_test.cpp", ] @@ -44,7 +45,6 @@ ohos_systemtest("FormDeleteFormTest") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_delete_form_test/fms_delete_form_test.cpp b/form_runtime/test/systemtest/fms_delete_form_test/fms_delete_form_test.cpp similarity index 100% rename from test/systemtest/common/fms/fms_delete_form_test/fms_delete_form_test.cpp rename to form_runtime/test/systemtest/fms_delete_form_test/fms_delete_form_test.cpp diff --git a/test/systemtest/common/fms/fms_fuzz_test/BUILD.gn b/form_runtime/test/systemtest/fms_fuzz_test/BUILD.gn similarity index 91% rename from test/systemtest/common/fms/fms_fuzz_test/BUILD.gn rename to form_runtime/test/systemtest/fms_fuzz_test/BUILD.gn index e50983ea7c..4caa522020 100644 --- a/test/systemtest/common/fms/fms_fuzz_test/BUILD.gn +++ b/form_runtime/test/systemtest/fms_fuzz_test/BUILD.gn @@ -12,14 +12,15 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") -module_output_path = "appexecfwk_standard/formmanagerst" +module_output_path = "form_runtime/formmanagerst" ohos_systemtest("fmsFuzzTest") { module_out_path = module_output_path include_dirs = [ + "./include", "${aafwk_path}/interfaces/innerkits/ability_manager/include", - "${appexecfwk_path}/test/systemtest/common/fms/fms_fuzz_test/include", "${distributedschedule_path}/safwk/services/safwk/include", ] @@ -44,7 +45,6 @@ ohos_systemtest("fmsFuzzTest") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_fuzz_test/fms_fuzz_test_config/config.json b/form_runtime/test/systemtest/fms_fuzz_test/fms_fuzz_test_config/config.json similarity index 100% rename from test/systemtest/common/fms/fms_fuzz_test/fms_fuzz_test_config/config.json rename to form_runtime/test/systemtest/fms_fuzz_test/fms_fuzz_test_config/config.json diff --git a/test/systemtest/common/fms/fms_fuzz_test/include/fuzz_test_config_parser.h b/form_runtime/test/systemtest/fms_fuzz_test/include/fuzz_test_config_parser.h similarity index 100% rename from test/systemtest/common/fms/fms_fuzz_test/include/fuzz_test_config_parser.h rename to form_runtime/test/systemtest/fms_fuzz_test/include/fuzz_test_config_parser.h diff --git a/test/systemtest/common/fms/fms_fuzz_test/include/fuzz_test_manager.h b/form_runtime/test/systemtest/fms_fuzz_test/include/fuzz_test_manager.h similarity index 100% rename from test/systemtest/common/fms/fms_fuzz_test/include/fuzz_test_manager.h rename to form_runtime/test/systemtest/fms_fuzz_test/include/fuzz_test_manager.h diff --git a/test/systemtest/common/fms/fms_fuzz_test/include/get_param.h b/form_runtime/test/systemtest/fms_fuzz_test/include/get_param.h similarity index 100% rename from test/systemtest/common/fms/fms_fuzz_test/include/get_param.h rename to form_runtime/test/systemtest/fms_fuzz_test/include/get_param.h diff --git a/test/systemtest/common/fms/fms_fuzz_test/src/fms_fuzz_test.cpp b/form_runtime/test/systemtest/fms_fuzz_test/src/fms_fuzz_test.cpp similarity index 100% rename from test/systemtest/common/fms/fms_fuzz_test/src/fms_fuzz_test.cpp rename to form_runtime/test/systemtest/fms_fuzz_test/src/fms_fuzz_test.cpp diff --git a/test/systemtest/common/fms/fms_fuzz_test/src/fuzz_test_manager.cpp b/form_runtime/test/systemtest/fms_fuzz_test/src/fuzz_test_manager.cpp similarity index 100% rename from test/systemtest/common/fms/fms_fuzz_test/src/fuzz_test_manager.cpp rename to form_runtime/test/systemtest/fms_fuzz_test/src/fuzz_test_manager.cpp diff --git a/test/systemtest/common/fms/fms_fuzz_test/src/get_param.cpp b/form_runtime/test/systemtest/fms_fuzz_test/src/get_param.cpp similarity index 100% rename from test/systemtest/common/fms/fms_fuzz_test/src/get_param.cpp rename to form_runtime/test/systemtest/fms_fuzz_test/src/get_param.cpp diff --git a/test/systemtest/common/fms/fms_performance_test/BUILD.gn b/form_runtime/test/systemtest/fms_performance_test/BUILD.gn similarity index 85% rename from test/systemtest/common/fms/fms_performance_test/BUILD.gn rename to form_runtime/test/systemtest/fms_performance_test/BUILD.gn index 7038ed1b3f..9d11af6cf9 100644 --- a/test/systemtest/common/fms/fms_performance_test/BUILD.gn +++ b/form_runtime/test/systemtest/fms_performance_test/BUILD.gn @@ -12,20 +12,21 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") -module_output_path = "appexecfwk_standard/formmanagerst" +module_output_path = "form_runtime/formmanagerst" ohos_systemtest("FmsPerformanceTest") { module_out_path = module_output_path include_dirs = [ "${aafwk_path}/interfaces/innerkits/ability_manager/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "../common/fms/common/include", "${distributedschedule_path}/safwk/services/safwk/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp", - "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp", + "../common/fms/common/src/form_event.cpp", + "../common/fms/common/src/system_test_form_util.cpp", "fms_performance_test.cpp", ] @@ -44,7 +45,6 @@ ohos_systemtest("FmsPerformanceTest") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_performance_test/fms_performance_config/fms_performance_config.json b/form_runtime/test/systemtest/fms_performance_test/fms_performance_config/fms_performance_config.json similarity index 100% rename from test/systemtest/common/fms/fms_performance_test/fms_performance_config/fms_performance_config.json rename to form_runtime/test/systemtest/fms_performance_test/fms_performance_config/fms_performance_config.json diff --git a/test/systemtest/common/fms/fms_performance_test/fms_performance_test.cpp b/form_runtime/test/systemtest/fms_performance_test/fms_performance_test.cpp similarity index 100% rename from test/systemtest/common/fms/fms_performance_test/fms_performance_test.cpp rename to form_runtime/test/systemtest/fms_performance_test/fms_performance_test.cpp diff --git a/test/systemtest/common/fms/fms_performance_test/performance_config_parser.h b/form_runtime/test/systemtest/fms_performance_test/performance_config_parser.h similarity index 100% rename from test/systemtest/common/fms/fms_performance_test/performance_config_parser.h rename to form_runtime/test/systemtest/fms_performance_test/performance_config_parser.h diff --git a/test/systemtest/common/fms/fms_release_form_test/BUILD.gn b/form_runtime/test/systemtest/fms_release_form_test/BUILD.gn similarity index 85% rename from test/systemtest/common/fms/fms_release_form_test/BUILD.gn rename to form_runtime/test/systemtest/fms_release_form_test/BUILD.gn index bf690d30e3..fff7d6b557 100644 --- a/test/systemtest/common/fms/fms_release_form_test/BUILD.gn +++ b/form_runtime/test/systemtest/fms_release_form_test/BUILD.gn @@ -12,20 +12,21 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") -module_output_path = "appexecfwk_standard/formmanagerst" +module_output_path = "form_runtime/formmanagerst" ohos_systemtest("FormReleaseFormTest") { module_out_path = module_output_path include_dirs = [ "${aafwk_path}/interfaces/innerkits/ability_manager/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "../common/fms/common/include", "${distributedschedule_path}/safwk/services/safwk/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp", - "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp", + "../common/fms/common/src/form_event.cpp", + "../common/fms/common/src/system_test_form_util.cpp", "fms_release_form_test.cpp", ] @@ -44,7 +45,6 @@ ohos_systemtest("FormReleaseFormTest") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_release_form_test/fms_release_form_test.cpp b/form_runtime/test/systemtest/fms_release_form_test/fms_release_form_test.cpp similarity index 100% rename from test/systemtest/common/fms/fms_release_form_test/fms_release_form_test.cpp rename to form_runtime/test/systemtest/fms_release_form_test/fms_release_form_test.cpp diff --git a/test/systemtest/common/fms/fms_self_starting_test/BUILD.gn b/form_runtime/test/systemtest/fms_self_starting_test/BUILD.gn similarity index 85% rename from test/systemtest/common/fms/fms_self_starting_test/BUILD.gn rename to form_runtime/test/systemtest/fms_self_starting_test/BUILD.gn index a3e39cf640..d974d3024b 100644 --- a/test/systemtest/common/fms/fms_self_starting_test/BUILD.gn +++ b/form_runtime/test/systemtest/fms_self_starting_test/BUILD.gn @@ -12,14 +12,15 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") -module_output_path = "appexecfwk_standard/formmanagerst" +module_output_path = "form_runtime/formmanagerst" ohos_systemtest("FmsSelfStartingTest") { module_out_path = module_output_path include_dirs = [ "${aafwk_path}/interfaces/innerkits/ability_manager/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "../common/fms/common/include", "${appexecfwk_path}/services/formmgr/include", "${distributedschedule_path}/safwk/services/safwk/include", "${distributeddatamgr_path}/distributeddatamgr/interfaces/innerkits/distributeddata/include", @@ -27,8 +28,8 @@ ohos_systemtest("FmsSelfStartingTest") { sources = [ "${appexecfwk_path}/services/formmgr/include/form_db_info.h", - "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp", - "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp", + "../common/fms/common/src/form_event.cpp", + "../common/fms/common/src/system_test_form_util.cpp", "fms_self_starting_test.cpp", ] @@ -47,9 +48,8 @@ ohos_systemtest("FmsSelfStartingTest") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributeddatamgr_path}/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner", - "${form_runtime_path}/services:libfms", + "${form_runtime_path}:libfms", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_self_starting_test/FMS_Start_0100.sh b/form_runtime/test/systemtest/fms_self_starting_test/FMS_Start_0100.sh similarity index 100% rename from test/systemtest/common/fms/fms_self_starting_test/FMS_Start_0100.sh rename to form_runtime/test/systemtest/fms_self_starting_test/FMS_Start_0100.sh diff --git a/test/systemtest/common/fms/fms_self_starting_test/FMS_Start_0200.sh b/form_runtime/test/systemtest/fms_self_starting_test/FMS_Start_0200.sh similarity index 100% rename from test/systemtest/common/fms/fms_self_starting_test/FMS_Start_0200.sh rename to form_runtime/test/systemtest/fms_self_starting_test/FMS_Start_0200.sh diff --git a/test/systemtest/common/fms/fms_self_starting_test/FMS_Start_0300.sh b/form_runtime/test/systemtest/fms_self_starting_test/FMS_Start_0300.sh similarity index 100% rename from test/systemtest/common/fms/fms_self_starting_test/FMS_Start_0300.sh rename to form_runtime/test/systemtest/fms_self_starting_test/FMS_Start_0300.sh diff --git a/test/systemtest/common/fms/fms_self_starting_test/FMS_Start_0400.sh b/form_runtime/test/systemtest/fms_self_starting_test/FMS_Start_0400.sh similarity index 100% rename from test/systemtest/common/fms/fms_self_starting_test/FMS_Start_0400.sh rename to form_runtime/test/systemtest/fms_self_starting_test/FMS_Start_0400.sh diff --git a/test/systemtest/common/fms/fms_self_starting_test/fms_self_starting_test.cpp b/form_runtime/test/systemtest/fms_self_starting_test/fms_self_starting_test.cpp similarity index 100% rename from test/systemtest/common/fms/fms_self_starting_test/fms_self_starting_test.cpp rename to form_runtime/test/systemtest/fms_self_starting_test/fms_self_starting_test.cpp diff --git a/test/systemtest/common/fms/fms_self_starting_test/self_starting_test_config_parser.h b/form_runtime/test/systemtest/fms_self_starting_test/self_starting_test_config_parser.h similarity index 100% rename from test/systemtest/common/fms/fms_self_starting_test/self_starting_test_config_parser.h rename to form_runtime/test/systemtest/fms_self_starting_test/self_starting_test_config_parser.h diff --git a/test/systemtest/common/fms/fms_stress_test/BUILD.gn b/form_runtime/test/systemtest/fms_stress_test/BUILD.gn similarity index 85% rename from test/systemtest/common/fms/fms_stress_test/BUILD.gn rename to form_runtime/test/systemtest/fms_stress_test/BUILD.gn index d6762be16a..4942902644 100644 --- a/test/systemtest/common/fms/fms_stress_test/BUILD.gn +++ b/form_runtime/test/systemtest/fms_stress_test/BUILD.gn @@ -12,20 +12,21 @@ # limitations under the License. import("//build/test.gni") +import("//foundation/aafwk/standard/aafwk.gni") -module_output_path = "appexecfwk_standard/formmanagerst" +module_output_path = "form_runtime/formmanagerst" ohos_systemtest("FmsStressTest") { module_out_path = module_output_path include_dirs = [ "${aafwk_path}/interfaces/innerkits/ability_manager/include", - "${appexecfwk_path}/test/systemtest/common/fms/common/include", + "../common/fms/common/include", "${distributedschedule_path}/safwk/services/safwk/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp", - "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp", + "../common/fms/common/src/form_event.cpp", + "../common/fms/common/src/system_test_form_util.cpp", "fms_stress_test.cpp", ] @@ -44,7 +45,6 @@ ohos_systemtest("FmsStressTest") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", ] diff --git a/test/systemtest/common/fms/fms_stress_test/fms_stress_test.cpp b/form_runtime/test/systemtest/fms_stress_test/fms_stress_test.cpp similarity index 100% rename from test/systemtest/common/fms/fms_stress_test/fms_stress_test.cpp rename to form_runtime/test/systemtest/fms_stress_test/fms_stress_test.cpp diff --git a/test/systemtest/common/fms/fms_stress_test/fms_stress_test_config/fms_stress_test_config.json b/form_runtime/test/systemtest/fms_stress_test/fms_stress_test_config/fms_stress_test_config.json similarity index 100% rename from test/systemtest/common/fms/fms_stress_test/fms_stress_test_config/fms_stress_test_config.json rename to form_runtime/test/systemtest/fms_stress_test/fms_stress_test_config/fms_stress_test_config.json diff --git a/test/systemtest/common/fms/fms_stress_test/stress_test_config_parser.h b/form_runtime/test/systemtest/fms_stress_test/stress_test_config_parser.h similarity index 100% rename from test/systemtest/common/fms/fms_stress_test/stress_test_config_parser.h rename to form_runtime/test/systemtest/fms_stress_test/stress_test_config_parser.h diff --git a/form_runtime/test/unittest/fms_form_cache_mgr_test/BUILD.gn b/form_runtime/test/unittest/fms_form_cache_mgr_test/BUILD.gn index 08121bbf05..2a2e6c1bba 100644 --- a/form_runtime/test/unittest/fms_form_cache_mgr_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_cache_mgr_test/BUILD.gn @@ -25,7 +25,6 @@ ohos_unittest("FmsFormCacheMgrTest") { "//third_party/zlib/contrib/minizip", "//third_party/zlib", "${appexecfwk_innerkits_path}/libeventhandler/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -47,7 +46,6 @@ ohos_unittest("FmsFormCacheMgrTest") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms_target", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${base_path}:base", "${base_path}:configuration", diff --git a/form_runtime/test/unittest/fms_form_data_mgr_test/BUILD.gn b/form_runtime/test/unittest/fms_form_data_mgr_test/BUILD.gn index 582a9e3109..43918ccfbf 100644 --- a/form_runtime/test/unittest/fms_form_data_mgr_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_data_mgr_test/BUILD.gn @@ -26,7 +26,6 @@ ohos_unittest("FmsFormDataMgrTest") { include_dirs = [ "//third_party/json/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_inner_api_path}/appexecfwk_base/include/", @@ -51,7 +50,6 @@ ohos_unittest("FmsFormDataMgrTest") { deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${form_runtime_path}:fms_target", #"${libs_path}/libeventhandler:libeventhandler_target", diff --git a/form_runtime/test/unittest/fms_form_db_record_test/BUILD.gn b/form_runtime/test/unittest/fms_form_db_record_test/BUILD.gn index 987633306c..d7e4762a53 100644 --- a/form_runtime/test/unittest/fms_form_db_record_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_db_record_test/BUILD.gn @@ -23,7 +23,6 @@ ohos_unittest("FmsFormDbRecordTest") { include_dirs = [ "//third_party/json/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_inner_api_path}/appexecfwk_base/include/", @@ -47,7 +46,6 @@ ohos_unittest("FmsFormDbRecordTest") { deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${form_runtime_path}:fms_target", #"${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", diff --git a/form_runtime/test/unittest/fms_form_host_record_test/BUILD.gn b/form_runtime/test/unittest/fms_form_host_record_test/BUILD.gn index 0947a0e7d6..72c9c0ee98 100644 --- a/form_runtime/test/unittest/fms_form_host_record_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_host_record_test/BUILD.gn @@ -30,7 +30,6 @@ ohos_unittest("FmsFormHostRecordTest") { "//third_party/zlib/contrib/minizip", "//third_party/zlib", "${appexecfwk_innerkits_path}/libeventhandler/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -53,7 +52,6 @@ ohos_unittest("FmsFormHostRecordTest") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms_target", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${base_path}:base", "${base_path}:configuration", diff --git a/form_runtime/test/unittest/fms_form_host_record_test/fms_form_host_record_test.cpp b/form_runtime/test/unittest/fms_form_host_record_test/fms_form_host_record_test.cpp index 06c3e6538c..77ef4e48e9 100644 --- a/form_runtime/test/unittest/fms_form_host_record_test/fms_form_host_record_test.cpp +++ b/form_runtime/test/unittest/fms_form_host_record_test/fms_form_host_record_test.cpp @@ -25,7 +25,6 @@ #undef private #include "form_mgr_service.h" #include "if_system_ability_manager.h" -#include "inner_bundle_info.h" #include "ipc_skeleton.h" #include "iservice_registry.h" diff --git a/form_runtime/test/unittest/fms_form_info_mgr_test/BUILD.gn b/form_runtime/test/unittest/fms_form_info_mgr_test/BUILD.gn index feee541de5..15b4932365 100644 --- a/form_runtime/test/unittest/fms_form_info_mgr_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_info_mgr_test/BUILD.gn @@ -30,7 +30,6 @@ ohos_unittest("FmsFormInfoMgrTest") { "//third_party/zlib/contrib/minizip", "//third_party/zlib", "${appexecfwk_innerkits_path}/libeventhandler/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -53,7 +52,6 @@ ohos_unittest("FmsFormInfoMgrTest") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms_target", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${base_path}:base", "${base_path}:configuration", diff --git a/form_runtime/test/unittest/fms_form_mgr_add_form_test/BUILD.gn b/form_runtime/test/unittest/fms_form_mgr_add_form_test/BUILD.gn index abf4cfdb35..20616ea920 100644 --- a/form_runtime/test/unittest/fms_form_mgr_add_form_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_mgr_add_form_test/BUILD.gn @@ -30,7 +30,6 @@ ohos_unittest("FmsFormMgrAddFormTest") { "//third_party/zlib/contrib/minizip", "//third_party/zlib", "${appexecfwk_innerkits_path}/libeventhandler/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -43,9 +42,6 @@ ohos_unittest("FmsFormMgrAddFormTest") { configs = [ "${form_runtime_path}/test:formmgr_test_config", "${aafwk_path}/services/abilitymgr:abilityms_config", - "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", - - # "${appexecfwk_inner_api_path}/appexecfwk_core:bundlemgr_sdk_config", ] cflags = [] if (target_cpu == "arm") { @@ -55,7 +51,6 @@ ohos_unittest("FmsFormMgrAddFormTest") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms_target", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${base_path}:base", "${base_path}:configuration", diff --git a/form_runtime/test/unittest/fms_form_mgr_add_form_test/fms_form_mgr_add_form_test.cpp b/form_runtime/test/unittest/fms_form_mgr_add_form_test/fms_form_mgr_add_form_test.cpp index ea8df47bf5..204e6d4fa0 100644 --- a/form_runtime/test/unittest/fms_form_mgr_add_form_test/fms_form_mgr_add_form_test.cpp +++ b/form_runtime/test/unittest/fms_form_mgr_add_form_test/fms_form_mgr_add_form_test.cpp @@ -31,7 +31,6 @@ #include "form_mgr_errors.h" #include "form_mgr_service.h" #include "if_system_ability_manager.h" -#include "inner_bundle_info.h" #include "ipc_skeleton.h" #include "iservice_registry.h" diff --git a/form_runtime/test/unittest/fms_form_mgr_cast_temp_form_test/BUILD.gn b/form_runtime/test/unittest/fms_form_mgr_cast_temp_form_test/BUILD.gn index c55ff7f1ca..cd43d9dd9a 100644 --- a/form_runtime/test/unittest/fms_form_mgr_cast_temp_form_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_mgr_cast_temp_form_test/BUILD.gn @@ -30,7 +30,6 @@ ohos_unittest("FmsFormMgrCastTempFormTest") { "//third_party/zlib/contrib/minizip", "//third_party/zlib", "${appexecfwk_innerkits_path}/libeventhandler/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -44,7 +43,6 @@ ohos_unittest("FmsFormMgrCastTempFormTest") { configs = [ "${form_runtime_path}/test:formmgr_test_config", "${aafwk_path}/services/abilitymgr:abilityms_config", - "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", ] cflags = [] if (target_cpu == "arm") { @@ -54,7 +52,6 @@ ohos_unittest("FmsFormMgrCastTempFormTest") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms_target", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${base_path}:base", "${base_path}:configuration", diff --git a/form_runtime/test/unittest/fms_form_mgr_cast_temp_form_test/fms_form_mgr_cast_temp_form_test.cpp b/form_runtime/test/unittest/fms_form_mgr_cast_temp_form_test/fms_form_mgr_cast_temp_form_test.cpp index baa3b692b1..6ca2209dee 100644 --- a/form_runtime/test/unittest/fms_form_mgr_cast_temp_form_test/fms_form_mgr_cast_temp_form_test.cpp +++ b/form_runtime/test/unittest/fms_form_mgr_cast_temp_form_test/fms_form_mgr_cast_temp_form_test.cpp @@ -27,7 +27,6 @@ #include "form_mgr_errors.h" #include "form_mgr_service.h" #include "if_system_ability_manager.h" -#include "inner_bundle_info.h" #include "ipc_skeleton.h" #include "iservice_registry.h" diff --git a/form_runtime/test/unittest/fms_form_mgr_death_callback_test/BUILD.gn b/form_runtime/test/unittest/fms_form_mgr_death_callback_test/BUILD.gn index 3f08e2f941..fb94219b3e 100644 --- a/form_runtime/test/unittest/fms_form_mgr_death_callback_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_mgr_death_callback_test/BUILD.gn @@ -32,7 +32,6 @@ ohos_unittest("FmsFormMgrDeathCallbackTest") { "//third_party/zlib/contrib/minizip", "//third_party/zlib", "${appexecfwk_innerkits_path}/libeventhandler/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -54,7 +53,6 @@ ohos_unittest("FmsFormMgrDeathCallbackTest") { deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${base_path}:base", "${base_path}:configuration", diff --git a/form_runtime/test/unittest/fms_form_mgr_death_callback_test/fms_form_mgr_death_callback_test.cpp b/form_runtime/test/unittest/fms_form_mgr_death_callback_test/fms_form_mgr_death_callback_test.cpp index 6b82fbad01..ef29649974 100644 --- a/form_runtime/test/unittest/fms_form_mgr_death_callback_test/fms_form_mgr_death_callback_test.cpp +++ b/form_runtime/test/unittest/fms_form_mgr_death_callback_test/fms_form_mgr_death_callback_test.cpp @@ -29,7 +29,6 @@ #undef private #include "form_mgr_service.h" #include "if_system_ability_manager.h" -#include "inner_bundle_info.h" #include "ipc_skeleton.h" #include "iservice_registry.h" diff --git a/form_runtime/test/unittest/fms_form_mgr_delete_form_test/BUILD.gn b/form_runtime/test/unittest/fms_form_mgr_delete_form_test/BUILD.gn index 156fc3458c..c73db2b658 100644 --- a/form_runtime/test/unittest/fms_form_mgr_delete_form_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_mgr_delete_form_test/BUILD.gn @@ -30,7 +30,6 @@ ohos_unittest("FmsFormMgrDeleteFormTest") { "//third_party/zlib/contrib/minizip", "//third_party/zlib", "${appexecfwk_innerkits_path}/libeventhandler/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -44,9 +43,6 @@ ohos_unittest("FmsFormMgrDeleteFormTest") { configs = [ "${form_runtime_path}/test:formmgr_test_config", "${aafwk_path}/services/abilitymgr:abilityms_config", - "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", - - # "${appexecfwk_inner_api_path}/appexecfwk_core:bundlemgr_sdk_config", ] cflags = [] if (target_cpu == "arm") { @@ -55,7 +51,6 @@ ohos_unittest("FmsFormMgrDeleteFormTest") { deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${base_path}:base", "${base_path}:configuration", diff --git a/form_runtime/test/unittest/fms_form_mgr_delete_form_test/fms_form_mgr_delete_form_test.cpp b/form_runtime/test/unittest/fms_form_mgr_delete_form_test/fms_form_mgr_delete_form_test.cpp index 5dbb2cce8c..18e7d07673 100644 --- a/form_runtime/test/unittest/fms_form_mgr_delete_form_test/fms_form_mgr_delete_form_test.cpp +++ b/form_runtime/test/unittest/fms_form_mgr_delete_form_test/fms_form_mgr_delete_form_test.cpp @@ -26,7 +26,6 @@ #include "form_mgr_errors.h" #include "form_mgr_service.h" #include "if_system_ability_manager.h" -#include "inner_bundle_info.h" #include "ipc_skeleton.h" #include "iservice_registry.h" diff --git a/form_runtime/test/unittest/fms_form_mgr_lifecycle_update_test/BUILD.gn b/form_runtime/test/unittest/fms_form_mgr_lifecycle_update_test/BUILD.gn index 870dcaa6a1..f9c16c71f1 100644 --- a/form_runtime/test/unittest/fms_form_mgr_lifecycle_update_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_mgr_lifecycle_update_test/BUILD.gn @@ -27,7 +27,6 @@ ohos_unittest("FmsFormMgrLifecycleUpdateTest") { include_dirs = [ "//third_party/json/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -59,7 +58,6 @@ ohos_unittest("FmsFormMgrLifecycleUpdateTest") { #"${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", #"//base/startup/appspawn_standard:appspawn_socket_client", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:want", "${distributedschedule_path}/safwk/interfaces/innerkits/safwk:system_ability_fwk", diff --git a/form_runtime/test/unittest/fms_form_mgr_lifecycle_update_test/fms_form_mgr_lifecycle_update_test.cpp b/form_runtime/test/unittest/fms_form_mgr_lifecycle_update_test/fms_form_mgr_lifecycle_update_test.cpp index 637750351f..7beffca675 100644 --- a/form_runtime/test/unittest/fms_form_mgr_lifecycle_update_test/fms_form_mgr_lifecycle_update_test.cpp +++ b/form_runtime/test/unittest/fms_form_mgr_lifecycle_update_test/fms_form_mgr_lifecycle_update_test.cpp @@ -26,7 +26,6 @@ #include "form_mgr_service.h" #undef private #include "if_system_ability_manager.h" -#include "inner_bundle_info.h" #include "ipc_skeleton.h" #include "iservice_registry.h" diff --git a/form_runtime/test/unittest/fms_form_mgr_message_event_test/BUILD.gn b/form_runtime/test/unittest/fms_form_mgr_message_event_test/BUILD.gn index a925d47662..0c828d8ad9 100644 --- a/form_runtime/test/unittest/fms_form_mgr_message_event_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_mgr_message_event_test/BUILD.gn @@ -30,7 +30,6 @@ ohos_unittest("FmsFormMgrMessageEventTest") { "//third_party/zlib/contrib/minizip", "//third_party/zlib", "${appexecfwk_innerkits_path}/libeventhandler/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -53,7 +52,6 @@ ohos_unittest("FmsFormMgrMessageEventTest") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms_target", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${base_path}:base", "${base_path}:want", diff --git a/form_runtime/test/unittest/fms_form_mgr_message_event_test/fms_form_mgr_message_event_test.cpp b/form_runtime/test/unittest/fms_form_mgr_message_event_test/fms_form_mgr_message_event_test.cpp index 933f8821c5..15c2426508 100644 --- a/form_runtime/test/unittest/fms_form_mgr_message_event_test/fms_form_mgr_message_event_test.cpp +++ b/form_runtime/test/unittest/fms_form_mgr_message_event_test/fms_form_mgr_message_event_test.cpp @@ -26,7 +26,6 @@ #include "form_mgr_errors.h" #include "form_mgr_service.h" #include "if_system_ability_manager.h" -#include "inner_bundle_info.h" #include "ipc_skeleton.h" #include "iservice_registry.h" diff --git a/form_runtime/test/unittest/fms_form_mgr_notify_invisible_forms_test/BUILD.gn b/form_runtime/test/unittest/fms_form_mgr_notify_invisible_forms_test/BUILD.gn index d4682b2929..bd9b81e30c 100644 --- a/form_runtime/test/unittest/fms_form_mgr_notify_invisible_forms_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_mgr_notify_invisible_forms_test/BUILD.gn @@ -27,7 +27,6 @@ ohos_unittest("FmsFormMgrNotifyInvisibleFormsTest") { include_dirs = [ "//third_party/json/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -58,7 +57,6 @@ ohos_unittest("FmsFormMgrNotifyInvisibleFormsTest") { #"${libs_path}/libeventhandler:libeventhandler_target", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:want", "${distributedschedule_path}/safwk/interfaces/innerkits/safwk:system_ability_fwk", diff --git a/form_runtime/test/unittest/fms_form_mgr_notify_visible_forms_test/BUILD.gn b/form_runtime/test/unittest/fms_form_mgr_notify_visible_forms_test/BUILD.gn index 2dcdaaffec..905e4f99ed 100644 --- a/form_runtime/test/unittest/fms_form_mgr_notify_visible_forms_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_mgr_notify_visible_forms_test/BUILD.gn @@ -27,7 +27,6 @@ ohos_unittest("FmsFormMgrNotifyVisibleFormsTest") { include_dirs = [ "//third_party/json/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -53,7 +52,6 @@ ohos_unittest("FmsFormMgrNotifyVisibleFormsTest") { deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:want", "${distributedschedule_path}/safwk/interfaces/innerkits/safwk:system_ability_fwk", diff --git a/form_runtime/test/unittest/fms_form_mgr_release_form_test/BUILD.gn b/form_runtime/test/unittest/fms_form_mgr_release_form_test/BUILD.gn index b3a31e658a..8d510ea08a 100644 --- a/form_runtime/test/unittest/fms_form_mgr_release_form_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_mgr_release_form_test/BUILD.gn @@ -30,7 +30,6 @@ ohos_unittest("FmsFormMgrReleaseFormTest") { "//third_party/zlib/contrib/minizip", "//third_party/zlib", "${appexecfwk_innerkits_path}/libeventhandler/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -44,7 +43,6 @@ ohos_unittest("FmsFormMgrReleaseFormTest") { configs = [ "${form_runtime_path}/test:formmgr_test_config", "${aafwk_path}/services/abilitymgr:abilityms_config", - "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", ] cflags = [] if (target_cpu == "arm") { @@ -53,7 +51,6 @@ ohos_unittest("FmsFormMgrReleaseFormTest") { deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${base_path}:base", "${base_path}:want", diff --git a/form_runtime/test/unittest/fms_form_mgr_request_form_test/BUILD.gn b/form_runtime/test/unittest/fms_form_mgr_request_form_test/BUILD.gn index ead4cc1e27..3ca79dc8a4 100644 --- a/form_runtime/test/unittest/fms_form_mgr_request_form_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_mgr_request_form_test/BUILD.gn @@ -30,7 +30,6 @@ ohos_unittest("FmsFormMgrRequestFormTest") { "//third_party/zlib/contrib/minizip", "//third_party/zlib", "${appexecfwk_innerkits_path}/libeventhandler/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -44,7 +43,6 @@ ohos_unittest("FmsFormMgrRequestFormTest") { configs = [ "${form_runtime_path}/test:formmgr_test_config", "${aafwk_path}/services/abilitymgr:abilityms_config", - "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", ] cflags = [] if (target_cpu == "arm") { @@ -53,7 +51,6 @@ ohos_unittest("FmsFormMgrRequestFormTest") { deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${base_path}:base", "${base_path}:want", diff --git a/form_runtime/test/unittest/fms_form_mgr_update_form_test/BUILD.gn b/form_runtime/test/unittest/fms_form_mgr_update_form_test/BUILD.gn index ea77bd2b8a..2ad10acb4b 100644 --- a/form_runtime/test/unittest/fms_form_mgr_update_form_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_mgr_update_form_test/BUILD.gn @@ -30,7 +30,6 @@ ohos_unittest("FmsFormMgrUpdateFormTest") { "//third_party/zlib/contrib/minizip", "//third_party/zlib", "${appexecfwk_innerkits_path}/libeventhandler/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -54,7 +53,6 @@ ohos_unittest("FmsFormMgrUpdateFormTest") { deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${base_path}:base", "${base_path}:want", diff --git a/form_runtime/test/unittest/fms_form_mgr_update_form_test/fms_form_mgr_update_form_test.cpp b/form_runtime/test/unittest/fms_form_mgr_update_form_test/fms_form_mgr_update_form_test.cpp index 196373549d..4fed61602e 100644 --- a/form_runtime/test/unittest/fms_form_mgr_update_form_test/fms_form_mgr_update_form_test.cpp +++ b/form_runtime/test/unittest/fms_form_mgr_update_form_test/fms_form_mgr_update_form_test.cpp @@ -27,7 +27,6 @@ #include "form_mgr_adapter.h" #include "form_mgr_service.h" #include "if_system_ability_manager.h" -#include "inner_bundle_info.h" #include "ipc_skeleton.h" #include "iservice_registry.h" diff --git a/form_runtime/test/unittest/fms_form_provider_data_test/BUILD.gn b/form_runtime/test/unittest/fms_form_provider_data_test/BUILD.gn index 96f99329cf..233892150f 100644 --- a/form_runtime/test/unittest/fms_form_provider_data_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_provider_data_test/BUILD.gn @@ -23,7 +23,6 @@ ohos_unittest("FmsFormProviderDataTest") { include_dirs = [ "//third_party/json/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_inner_api_path}/appexecfwk_base/include/", "${form_runtime_path}/interfaces/inner_api/include", @@ -41,7 +40,6 @@ ohos_unittest("FmsFormProviderDataTest") { deps = [ "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:want", "${distributedschedule_path}/safwk/interfaces/innerkits/safwk:system_ability_fwk", diff --git a/form_runtime/test/unittest/fms_form_provider_mgr_test/BUILD.gn b/form_runtime/test/unittest/fms_form_provider_mgr_test/BUILD.gn index 6ff457cd17..31ec8623bb 100644 --- a/form_runtime/test/unittest/fms_form_provider_mgr_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_provider_mgr_test/BUILD.gn @@ -30,7 +30,6 @@ ohos_unittest("FmsFormProviderMgrTest") { "//third_party/zlib/contrib/minizip", "//third_party/zlib", "${appexecfwk_innerkits_path}/libeventhandler/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -44,7 +43,6 @@ ohos_unittest("FmsFormProviderMgrTest") { configs = [ "${form_runtime_path}/test:formmgr_test_config", "${aafwk_path}/services/abilitymgr:abilityms_config", - "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", ] cflags = [] if (target_cpu == "arm") { @@ -54,7 +52,6 @@ ohos_unittest("FmsFormProviderMgrTest") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms_target", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${base_path}:base", "${base_path}:want", diff --git a/form_runtime/test/unittest/fms_form_provider_mgr_test/fms_form_provider_mgr_test.cpp b/form_runtime/test/unittest/fms_form_provider_mgr_test/fms_form_provider_mgr_test.cpp index 0ad2a2606c..75077c039d 100644 --- a/form_runtime/test/unittest/fms_form_provider_mgr_test/fms_form_provider_mgr_test.cpp +++ b/form_runtime/test/unittest/fms_form_provider_mgr_test/fms_form_provider_mgr_test.cpp @@ -28,7 +28,6 @@ #include "form_mgr_service.h" #include "form_provider_mgr.h" #include "if_system_ability_manager.h" -#include "inner_bundle_info.h" #include "ipc_skeleton.h" #include "iservice_registry.h" diff --git a/form_runtime/test/unittest/fms_form_set_next_refresh_test/BUILD.gn b/form_runtime/test/unittest/fms_form_set_next_refresh_test/BUILD.gn index 5272a7e231..11e691172c 100644 --- a/form_runtime/test/unittest/fms_form_set_next_refresh_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_set_next_refresh_test/BUILD.gn @@ -26,7 +26,6 @@ ohos_unittest("FmsFormSetNextRefreshTest") { include_dirs = [ "//third_party/json/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -42,7 +41,6 @@ ohos_unittest("FmsFormSetNextRefreshTest") { configs = [ "${form_runtime_path}/test:formmgr_test_config", "${aafwk_path}/services/abilitymgr:abilityms_config", - "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", #"${appexecfwk_inner_api_path}/appexecfwk_core:bundlemgr_sdk_config", #"${form_runtime_path}:formmgr_config", @@ -55,7 +53,6 @@ ohos_unittest("FmsFormSetNextRefreshTest") { "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${form_runtime_path}:fms_target", "${form_runtime_path}:fmskit_native", "//base/miscservices/time/services:time_service", diff --git a/form_runtime/test/unittest/fms_form_sys_event_receiver_test/BUILD.gn b/form_runtime/test/unittest/fms_form_sys_event_receiver_test/BUILD.gn index 4424e9d5ba..c2732d9c61 100644 --- a/form_runtime/test/unittest/fms_form_sys_event_receiver_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_sys_event_receiver_test/BUILD.gn @@ -30,7 +30,6 @@ ohos_unittest("FmsFormSysEventReceiverTest") { "//third_party/zlib/contrib/minizip", "//third_party/zlib", "${appexecfwk_innerkits_path}/libeventhandler/include", - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${appexecfwk_path}/services/bundlemgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", @@ -44,7 +43,6 @@ ohos_unittest("FmsFormSysEventReceiverTest") { configs = [ "${form_runtime_path}/test:formmgr_test_config", "${aafwk_path}/services/abilitymgr:abilityms_config", - "${appexecfwk_path}/services/bundlemgr/test:bundlemgr_test_config", # "${appexecfwk_inner_api_path}/appexecfwk_core:bundlemgr_sdk_config", ] @@ -56,7 +54,6 @@ ohos_unittest("FmsFormSysEventReceiverTest") { "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_target", "${form_runtime_path}:fms_target", "${form_runtime_path}:fmskit_native", diff --git a/form_runtime/test/unittest/fms_form_sys_event_receiver_test/fms_form_sys_event_receiver_test.cpp b/form_runtime/test/unittest/fms_form_sys_event_receiver_test/fms_form_sys_event_receiver_test.cpp index 85a5760277..c6d949fcaa 100644 --- a/form_runtime/test/unittest/fms_form_sys_event_receiver_test/fms_form_sys_event_receiver_test.cpp +++ b/form_runtime/test/unittest/fms_form_sys_event_receiver_test/fms_form_sys_event_receiver_test.cpp @@ -32,7 +32,6 @@ #include "form_refresh_limiter.h" #include "form_sys_event_receiver.h" #include "if_system_ability_manager.h" -#include "inner_bundle_info.h" #include "ipc_skeleton.h" #include "form_bms_helper.h" #include "iservice_registry.h" diff --git a/form_runtime/test/unittest/fms_form_timer_mgr_test/BUILD.gn b/form_runtime/test/unittest/fms_form_timer_mgr_test/BUILD.gn index 88ff942552..29c9e713a9 100644 --- a/form_runtime/test/unittest/fms_form_timer_mgr_test/BUILD.gn +++ b/form_runtime/test/unittest/fms_form_timer_mgr_test/BUILD.gn @@ -22,7 +22,6 @@ ohos_unittest("FmsFormTimerMgrTest") { sources = [ "fms_form_timer_mgr_test.cpp" ] include_dirs = [ - "${appexecfwk_path}/common/log/include/", "${aafwk_path}/services/formmgr/include", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy/include", "${appexecfwk_inner_api_path}/appexecfwk_base/include/", @@ -37,7 +36,6 @@ ohos_unittest("FmsFormTimerMgrTest") { } deps = [ "${aafwk_path}/frameworks/kits/wantagent:wantagent_innerkits", - "${appexecfwk_path}/common:libappexecfwk_common", "${form_runtime_path}:fms_target", "//base/miscservices/time/services:time_service", "//third_party/googletest:gmock_main", diff --git a/frameworks/kits/ability/ability_runtime/test/moduletest/BUILD.gn b/frameworks/kits/ability/ability_runtime/test/moduletest/BUILD.gn index 72bb16ef0f..89e261baa3 100644 --- a/frameworks/kits/ability/ability_runtime/test/moduletest/BUILD.gn +++ b/frameworks/kits/ability/ability_runtime/test/moduletest/BUILD.gn @@ -45,7 +45,6 @@ ohos_moduletest("ability_caller_fw_module_test") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:want", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", diff --git a/frameworks/kits/ability/native/test/BUILD.gn b/frameworks/kits/ability/native/test/BUILD.gn index 95b430ba3f..17a03ed381 100644 --- a/frameworks/kits/ability/native/test/BUILD.gn +++ b/frameworks/kits/ability/native/test/BUILD.gn @@ -100,7 +100,6 @@ ohos_unittest("ability_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:want", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "${global_path}/resource_management/frameworks/resmgr:global_resmgr", @@ -142,7 +141,6 @@ ohos_unittest("ability_lifecycle_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:want", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -176,7 +174,6 @@ ohos_unittest("ability_lifecycle_executor_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:configuration", "${base_path}:want", @@ -291,7 +288,6 @@ ohos_unittest("page_ability_impl_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:want", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -325,7 +321,6 @@ ohos_unittest("service_ability_impl_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:want", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -360,7 +355,6 @@ ohos_unittest("scene_created_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:want", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -422,7 +416,6 @@ ohos_unittest("data_ability_operation_test") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "${global_path}/resource_management/frameworks/resmgr:global_resmgr", "//third_party/googletest:gmock_main", @@ -463,7 +456,6 @@ ohos_unittest("ability_impl_active_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "${global_path}/resource_management/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", @@ -503,7 +495,6 @@ ohos_unittest("ability_impl_test") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "${global_path}/resource_management/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", @@ -558,7 +549,6 @@ ohos_unittest("ability_thread_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "${global_path}/resource_management/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", @@ -605,7 +595,6 @@ ohos_unittest("ability_thread_call_request_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", ] @@ -640,7 +629,6 @@ ohos_unittest("form_provider_client_test") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:configuration", "${base_path}:want", @@ -684,7 +672,6 @@ ohos_unittest("data_ability_impl_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "${global_path}/resource_management/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", @@ -737,7 +724,6 @@ ohos_unittest("data_ability_impl_file_secondpart_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "${global_path}/resource_management/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", @@ -790,7 +776,6 @@ ohos_unittest("data_ability_impl_file_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "${global_path}/resource_management/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", @@ -845,7 +830,6 @@ ohos_unittest("ability_thread_dataability_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "${global_path}/resource_management/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", @@ -907,7 +891,6 @@ ohos_unittest("data_uri_utils_test") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -931,7 +914,6 @@ ohos_unittest("pac_map_test") { deps = [ "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:want", "//third_party/googletest:gtest_main", @@ -992,7 +974,6 @@ ohos_unittest("task_handler_client_test") { deps = [ "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:want", "//third_party/googletest:gtest_main", @@ -1042,7 +1023,6 @@ ohos_unittest("data_ability_result_test") { deps = [ "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", - "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gtest_main", ] @@ -1079,7 +1059,6 @@ ohos_unittest("form_host_client_test") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:want", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", @@ -1121,7 +1100,6 @@ ohos_unittest("continuation_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "${global_path}/resource_management/frameworks/resmgr:global_resmgr", "//third_party/googletest:gtest_main", diff --git a/frameworks/kits/appkit/native/test/BUILD.gn b/frameworks/kits/appkit/native/test/BUILD.gn index 19bc9c7b76..4eb26d24c2 100644 --- a/frameworks/kits/appkit/native/test/BUILD.gn +++ b/frameworks/kits/appkit/native/test/BUILD.gn @@ -120,7 +120,6 @@ ohos_unittest("application_test") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:base", "${base_path}:want", @@ -158,7 +157,6 @@ ohos_unittest("context_container_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:want", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -192,7 +190,6 @@ ohos_unittest("context_deal_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:want", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gmock_main", @@ -228,7 +225,6 @@ ohos_unittest("application_impl_test") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:base", "${base_path}:want", diff --git a/frameworks/kits/appkit/native/test/unittest/ability_delegator/BUILD.gn b/frameworks/kits/appkit/native/test/unittest/ability_delegator/BUILD.gn index 4d62055660..fb08603e84 100644 --- a/frameworks/kits/appkit/native/test/unittest/ability_delegator/BUILD.gn +++ b/frameworks/kits/appkit/native/test/unittest/ability_delegator/BUILD.gn @@ -98,7 +98,6 @@ ohos_unittest("iability_monitor_unittest") { deps = [ "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/appkit:appkit_delegator", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:want", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", diff --git a/frameworks/kits/appkit/test/BUILD.gn b/frameworks/kits/appkit/test/BUILD.gn index 7bc372ee3d..83c50714e2 100644 --- a/frameworks/kits/appkit/test/BUILD.gn +++ b/frameworks/kits/appkit/test/BUILD.gn @@ -64,7 +64,6 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_first") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:configuration", "${base_path}:want", @@ -106,7 +105,6 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_second") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:configuration", "${base_path}:want", @@ -148,7 +146,6 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_third") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:configuration", "${base_path}:want", @@ -190,7 +187,6 @@ ohos_moduletest("appexecfwk_appkit_native_app_module_test_fourth") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${base_path}:base", "${base_path}:configuration", "${base_path}:want", diff --git a/frameworks/kits/test/BUILD.gn b/frameworks/kits/test/BUILD.gn index b41dc29540..35b0fb0941 100644 --- a/frameworks/kits/test/BUILD.gn +++ b/frameworks/kits/test/BUILD.gn @@ -85,7 +85,6 @@ ohos_moduletest("ability_moduletest") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "${global_path}/resource_management/frameworks/resmgr:global_resmgr", "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility", @@ -145,7 +144,6 @@ ohos_moduletest("ability_conetxt_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "${global_path}/resource_management/frameworks/resmgr:global_resmgr", "//third_party/googletest:gmock_main", @@ -186,7 +184,6 @@ ohos_moduletest("ability_thread_call_request_module_test") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", "${appexecfwk_innerkits_path}/libeventhandler:libeventhandler", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", ] @@ -241,7 +238,6 @@ ohos_moduletest("data_ability_operation_moduletest") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${distributedschedule_path}/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "${global_path}/resource_management/frameworks/resmgr:global_resmgr", "//third_party/googletest:gmock_main", diff --git a/idl/LICENSE b/idl/LICENSE new file mode 100644 index 0000000000..4a459866a5 --- /dev/null +++ b/idl/LICENSE @@ -0,0 +1,177 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/idl/OAT.xml b/idl/OAT.xml new file mode 100644 index 0000000000..60bfad8ca7 --- /dev/null +++ b/idl/OAT.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index 91481204fd..3c12a25f40 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -44,7 +44,6 @@ config("abilityms_config") { "//base/hiviewdfx/hiview/adapter/utility/include", "//base/account/os_account/frameworks/common/account_error/include", "//base/account/os_account/frameworks/common/database/include", - "//base/account/os_account/frameworks/common/log/include", "//base/account/os_account/interfaces/innerkits/osaccount/native/include", "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include", "//base/startup/syspara_lite/interfaces/innerkits/native/syspara/include", diff --git a/services/abilitymgr/test/BUILD.gn b/services/abilitymgr/test/BUILD.gn index be6a033bc9..702f127109 100644 --- a/services/abilitymgr/test/BUILD.gn +++ b/services/abilitymgr/test/BUILD.gn @@ -70,7 +70,6 @@ ohos_source_set("abilityms_test_source") { "${aafwk_path}/interfaces/innerkits/dataobs_manager/include", "//base/account/os_account/frameworks/common/account_error/include", "//base/account/os_account/frameworks/common/database/include", - "//base/account/os_account/frameworks/common/log/include", "//base/account/os_account/interfaces/innerkits/osaccount/native/include", "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include/xcollie", ] diff --git a/services/appmgr/test/BUILD.gn b/services/appmgr/test/BUILD.gn index 4db396fbea..2e7e0bdfc4 100644 --- a/services/appmgr/test/BUILD.gn +++ b/services/appmgr/test/BUILD.gn @@ -55,16 +55,11 @@ ohos_source_set("appmgr_test_source") { "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/render_scheduler_host.cpp", "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/render_scheduler_proxy.cpp", "${aafwk_path}/interfaces/innerkits/app_manager/src/appmgr/running_process_info.cpp", - "${appexecfwk_inner_api_path}/appexecfwk_base/src/ability_info.cpp", - "${appexecfwk_inner_api_path}/appexecfwk_base/src/application_info.cpp", - "${appexecfwk_inner_api_path}/appexecfwk_base/src/bundle_info.cpp", - "${appexecfwk_inner_api_path}/appexecfwk_base/src/bundle_user_info.cpp", ] include_dirs = [ "//third_party/json/include", "${aafwk_path}/services/appmgr/include/lmks", - "${appexecfwk_inner_api_path}/appexecfwk_core/include", ] public_configs = [ @@ -73,7 +68,6 @@ ohos_source_set("appmgr_test_source") { ] public_deps = [ - "${appexecfwk_path}/common:libappexecfwk_common", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -97,6 +91,7 @@ ohos_source_set("appmgr_test_source") { external_deps = [ "ability_base:configuration", + "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "common_event_service:cesfwk_core", "common_event_service:cesfwk_innerkits", diff --git a/test/benchmarktest/BUILD.gn b/test/benchmarktest/BUILD.gn index d4f7608389..4c5ac447e5 100644 --- a/test/benchmarktest/BUILD.gn +++ b/test/benchmarktest/BUILD.gn @@ -21,11 +21,4 @@ group("benchmarktest") { "ability_manager_test:benchmarktest", "mission_manager_test:benchmarktest", ] - - if (ability_runtime_graphics) { - deps += [ - # deps file - "form_manager_test:benchmarktest", - ] - } } diff --git a/test/fuzztest/BUILD.gn b/test/fuzztest/BUILD.gn index f190c9de63..0e877e0b43 100644 --- a/test/fuzztest/BUILD.gn +++ b/test/fuzztest/BUILD.gn @@ -32,8 +32,4 @@ group("fuzztest") { "wantagenthelperstring_fuzzer:fuzztest", "wantagenthelpertrigger_fuzzer:fuzztest", ] - - if (ability_runtime_graphics) { - deps += [ "formmanager_fuzzer:fuzztest" ] - } } diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn index 3600ed2b41..46f3c00327 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsAbilityAppendTestAConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsAbilityAppendTestAConfig") { "${services_path}/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${common_path}/log/include", - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn index fca8d38d6a..9411589146 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsAbilityAppendTestBConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsAbilityAppendTestBConfig") { "${services_path}/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${common_path}/log/include", - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn index 3946dacccc..99d1ef11f1 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsAbilityVisibleTestPageAConfig") { visibility = [ ":*" ] include_dirs = [ @@ -29,7 +29,6 @@ config("amsAbilityVisibleTestPageAConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -54,7 +53,6 @@ ohos_shared_library("amsAbilityVisibleTestPageA") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "${distributeddatamgr_path}/appdatamgr/interfaces/inner_api/native/dataability:native_dataability", diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn index e499dd532c..15d9e0ebab 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn @@ -11,9 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = "test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsAbilityVisibleTestServiceBConfig") { visibility = [ ":*" ] include_dirs = [ @@ -28,7 +27,6 @@ config("amsAbilityVisibleTestServiceBConfig") { "${aafwk_path}/frameworks/kits/appkit/native/ability_runtime", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -54,7 +52,6 @@ ohos_shared_library("amsAbilityVisibleTestServiceB") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "${distributeddatamgr_path}/appdatamgr/interfaces/inner_api/native/dataability:native_dataability", diff --git a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedSingletonTest/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedSingletonTest/BUILD.gn index 3bb8b35fb0..df965e5ab4 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedSingletonTest/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedSingletonTest/BUILD.gn @@ -11,9 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedSingletonTest" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = "test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedSingletonTest" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsConfigurationUpdatedSingletonTestConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +25,6 @@ config("amsConfigurationUpdatedSingletonTestConfig") { "${services_path}/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${common_path}/log/include", - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", "${SUBST_TOOLS_DIR}/include", ] defines = [ diff --git a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/BUILD.gn index 4c07475748..2046f79a63 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsConfigurationUpdatedTestConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsConfigurationUpdatedTestConfig") { "${services_path}/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${common_path}/log/include", - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", "${SUBST_TOOLS_DIR}/include", ] defines = [ diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn index 18382bac87..5293e1f9f8 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn @@ -12,9 +12,9 @@ # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsDataSystemTestAConfig") { visibility = [ ":*" ] include_dirs = [ diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn index bc4cb96d29..f885be1806 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn @@ -12,9 +12,9 @@ # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsDataSystemTestBConfig") { visibility = [ ":*" ] include_dirs = [ @@ -27,7 +27,6 @@ config("amsDataSystemTestBConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -53,7 +52,6 @@ ohos_shared_library("amsDataSystemTestB") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "${distributeddatamgr_path}/appdatamgr/interfaces/inner_api/native/dataability:native_dataability", diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn index 731e47c731..19aeec58b1 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn @@ -12,9 +12,9 @@ # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsDataSystemTestCConfig") { visibility = [ ":*" ] include_dirs = [ @@ -27,7 +27,6 @@ config("amsDataSystemTestCConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -53,7 +52,6 @@ ohos_shared_library("amsDataSystemTestC") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "${distributeddatamgr_path}/appdatamgr/interfaces/inner_api/native/dataability:native_dataability", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn index 7c64787b7a..09c3091aed 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsKitSystemTestAConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsKitSystemTestAConfig") { "${services_path}/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${common_path}/log/include", - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn index 1a30a4ad54..93ac7b0113 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsKitSystemTestBConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsKitSystemTestBConfig") { "${services_path}/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${common_path}/log/include", - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn index 63fe611394..b6fbef1afd 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn @@ -12,9 +12,9 @@ # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsKitSystemTestDataAConfig") { visibility = [ ":*" ] include_dirs = [ diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn index bcd9d2d46c..9d9d69579d 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn @@ -12,9 +12,9 @@ # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsKitSystemTestDataBConfig") { visibility = [ ":*" ] include_dirs = [ diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn index 36d62f6036..276e908feb 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn @@ -26,7 +26,6 @@ config("amsSystemTestCConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "//third_party/jsoncpp/include", ] defines = [ @@ -52,7 +51,6 @@ ohos_shared_library("amsKitSystemTestPageA") { "${aafwk_path}/services/abilitymgr:abilityms", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "${libs_path}/libeventhandler:libeventhandler_target", diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn index e56dfdad69..4d7571e4f5 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn @@ -23,7 +23,6 @@ config("amsKitSystemTestServiceconfig") { "${base_inner_api_path}/want/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${appexecfwk_innerkits_path}/libeventhandler/include", "${aafwk_path}/frameworks/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", @@ -56,7 +55,6 @@ ohos_shared_library("amsKitSystemTestService") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "${libs_path}/libeventhandler:libeventhandler_target", diff --git a/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn index dab60bcc16..beb566432c 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsStDataAbility/BUILD.gn @@ -13,7 +13,8 @@ import("//build/ohos.gni") import("//foundation/aafwk/standard/aafwk.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsStDataAbility" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsStDataAbility" config("verify_act_ability_config") { visibility = [ ":*" ] @@ -27,7 +28,6 @@ config("verify_act_ability_config") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", ] defines = [ "AMS_LOG_TAG = \"amsStDataAbility\"", @@ -52,7 +52,6 @@ ohos_shared_library("amsStDataAbility") { "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//utils/native/base:utilsbase", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn index 6e573b5075..4603766831 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestA" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestA" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestAConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestAConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -51,7 +50,6 @@ ohos_shared_library("amsSystemTestA") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn index c1d59c68d9..bae7f4572b 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestB" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestB" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestBConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestBConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -46,7 +45,6 @@ ohos_shared_library("amsSystemTestB") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn index f565596a8d..c10d855021 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestC" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestC" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestCConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestCConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -48,7 +47,6 @@ ohos_shared_library("amsSystemTestC") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn index 8d968ff7bb..f5f9d0055e 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestD" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestD" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestDConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestDConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -47,7 +46,6 @@ ohos_shared_library("amsSystemTestD") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn index 7ed8f17fef..f2e1b46219 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn @@ -27,7 +27,6 @@ config("amsSystemTestCConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -49,7 +48,6 @@ ohos_shared_library("amsSystemTestDFX") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn index 5c5ef35b5f..c2cda664f6 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestE" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestE" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestEConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestEConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -46,7 +45,6 @@ ohos_shared_library("amsSystemTestE") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn index 200e5f6534..9f1c790b3e 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK/BUILD.gn @@ -11,7 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorK" config("amsSystemTestErrorKConfig") { visibility = [ ":*" ] include_dirs = [ @@ -24,7 +25,6 @@ config("amsSystemTestErrorKConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "//third_party/jsoncpp/include", ] defines = [ @@ -40,7 +40,6 @@ ohos_shared_library("amsSystemTestErrorK") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn index ff9b838fa2..7e1c45833b 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL/BUILD.gn @@ -11,7 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestErrorL" config("amsSystemTestErrorLConfig") { visibility = [ ":*" ] include_dirs = [ @@ -24,7 +25,6 @@ config("amsSystemTestErrorLConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "//third_party/jsoncpp/include", ] defines = [ @@ -40,7 +40,6 @@ ohos_shared_library("amsSystemTestErrorL") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn index b795b5e32c..86cdc57b19 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestF" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestF" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestFConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestFConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -48,7 +47,6 @@ ohos_shared_library("amsSystemTestF") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn index 467c4e5f9b..2d305fd9a0 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestG" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestG" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestGConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestGConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -47,7 +46,6 @@ ohos_shared_library("amsSystemTestG") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn index a4d35cbfa5..059beddccc 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestH" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestH" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestHConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestHConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -46,7 +45,6 @@ ohos_shared_library("amsSystemTestH") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn index 7f5700492a..00675828f8 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestI" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestI" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestIConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestIConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -49,7 +48,6 @@ ohos_shared_library("amsSystemTestI") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn index 00bb4d9ec8..84ed00192a 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestM" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestM" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestMConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestMConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -46,7 +45,6 @@ ohos_shared_library("amsSystemTestM") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn index 25e57ce2f3..ae3b6c7fc5 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestN" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestN" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestNConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestNConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -49,7 +48,6 @@ ohos_shared_library("amsSystemTestN") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn index c845331345..eaaf7d303d 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestO" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestO" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestOConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestOConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -46,7 +45,6 @@ ohos_shared_library("amsSystemTestO") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn index 60f30dee08..65bd9dde64 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestP" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestP" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestPConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestPConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -46,7 +45,6 @@ ohos_shared_library("amsSystemTestP") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn index cabc3e5738..6a2c16792a 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestQ" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestQConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestQConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -49,7 +48,6 @@ ohos_shared_library("amsSystemTestQ") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn index 6cca7bd375..2cc29d5e9c 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsSystemTestR" -SUBST_TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/amsSystemTestR" +SUBST_TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestRConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +26,6 @@ config("amsSystemTestRConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${SUBST_TOOLS_DIR}/include", "//third_party/jsoncpp/include", ] @@ -49,7 +48,6 @@ ohos_shared_library("amsSystemTestR") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn index 1f455d60f3..59cd681e7c 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn @@ -26,7 +26,6 @@ config("amsSystemTestCConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "//third_party/jsoncpp/include", ] defines = [ @@ -43,7 +42,6 @@ ohos_shared_library("amsSystemTestServiceA") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//utils/native/base:utilsbase", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn index a8745c127d..2cb73d4a0f 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn @@ -26,7 +26,6 @@ config("amsSystemTestCConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "//third_party/jsoncpp/include", ] defines = [ @@ -46,7 +45,6 @@ ohos_shared_library("amsSystemTestServiceB") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn index 541326e319..c7dac97390 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn @@ -26,7 +26,6 @@ config("amsSystemTestCConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "//third_party/jsoncpp/include", ] defines = [ @@ -42,7 +41,6 @@ ohos_shared_library("amsSystemTestServiceC") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//third_party/jsoncpp:jsoncpp", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn index 5f6d4a90a3..ce28a795b6 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn @@ -26,7 +26,6 @@ config("amsSystemTestCConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "//third_party/jsoncpp/include", ] defines = [ @@ -43,7 +42,6 @@ ohos_shared_library("amsSystemTestServiceD") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn index 91cc25524e..b47b7ba0b2 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn @@ -26,7 +26,6 @@ config("amsSystemTestCConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "//third_party/jsoncpp/include", ] defines = [ @@ -43,7 +42,6 @@ ohos_shared_library("amsSystemTestServiceE") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn index 2d4715cb1c..07dd998b8e 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn @@ -26,7 +26,6 @@ config("amsSystemTestCConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "//third_party/jsoncpp/include", ] defines = [ @@ -42,7 +41,6 @@ ohos_shared_library("amsSystemTestServiceF") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn index ce8cb5e70d..0608f8dd37 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn @@ -26,7 +26,6 @@ config("amsSystemTestCConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "//third_party/jsoncpp/include", ] defines = [ @@ -43,7 +42,6 @@ ohos_shared_library("amsSystemTestServiceG") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn index 3effa2f739..914e34b72f 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn @@ -26,7 +26,6 @@ config("amsSystemTestCConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "//third_party/jsoncpp/include", ] defines = [ @@ -43,7 +42,6 @@ ohos_shared_library("amsSystemTestServiceH") { "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utilsbase", diff --git a/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn index 50ac69fb24..c45821350b 100644 --- a/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/BUILD.gn @@ -11,9 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. import("//build/ohos.gni") -APP_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/fwkAbilityState" -TOOLS_DIR = - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +APP_DIR = "test/resource/amssystemtestability/abilitySrc/fwkAbilityState" +TOOLS_DIR = "test/resource/amssystemtestability/abilitySrc/tools" config("amsSystemTestAConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,7 +25,6 @@ config("amsSystemTestAConfig") { "${appexecfwk_path}/services/bundlemgr/include", "${aafwk_path}/services/abilitymgr/include", "${aafwk_path}/services/common/include", - "${appexecfwk_path}/common/log/include", "${TOOLS_DIR}/include", ] defines = [ @@ -51,7 +49,6 @@ ohos_shared_library("fwkAbilityState") { "${aafwk_path}/frameworks/kits/appkit:appkit_native", "${aafwk_path}/interfaces/innerkits/app_manager:app_manager", "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base", - "${appexecfwk_path}/common:libappexecfwk_common", "${appexecfwk_path}/services/bundlemgr:libbms", "${base_path}:want", "//utils/native/base:utilsbase", diff --git a/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/BUILD.gn index c8aab9a5be..3d8e336a6d 100644 --- a/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/serviceAbilityA/BUILD.gn @@ -12,7 +12,8 @@ # limitations under the License. import("//build/ohos.gni") -SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/serviceAbilityA" +SUBDEMOSYSTEM_DIR = + "test/resource/amssystemtestability/abilitySrc/serviceAbilityA" config("service_ability_a_config") { visibility = [ ":*" ] @@ -37,7 +38,6 @@ ohos_shared_library("serviceAbilityA") { deps = [ "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/appkit:appkit_native", - "${appexecfwk_path}/common:libappexecfwk_common", ] external_deps = [ "ability_base:want", diff --git a/test/systemtest/BUILD.gn b/test/systemtest/BUILD.gn index 6b2d8557b8..540dd62e34 100644 --- a/test/systemtest/BUILD.gn +++ b/test/systemtest/BUILD.gn @@ -22,8 +22,5 @@ config("system_test_config") { group("systemtest") { testonly = true - deps = [ - "common/ams:systemtest", - "common/fms:systemtest", - ] + deps = [ "common/ams:systemtest" ] } diff --git a/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn b/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn index 03e5999844..5dea5010c4 100644 --- a/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn @@ -20,17 +20,17 @@ ohos_systemtest("ams_aa_command_test") { include_dirs = [ "${distributedschedule_path}/safwk/services/safwk/include", "${aafwk_path}/tools/aa/include", - "${appexecfwk_path}/test/systemtest/common/ams/tool/include", + "test/systemtest/common/ams/tool/include", "${distributedschedule_path}/safwk/services/safwk/include", "//third_party/jsoncpp/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_aa_command_test.cpp", + "test/systemtest/common/ams/tool/src/event.cpp", + "test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "test/systemtest/common/ams/tool/src/stoperator.cpp", ] configs = [ diff --git a/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn index 5be4febe35..924ca63544 100644 --- a/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn @@ -17,18 +17,18 @@ ohos_systemtest("ams_ability_append_test") { module_out_path = module_output_path include_dirs = [ - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common/", + "test/resource/amssystemtestability/abilitySrc/common/", "${distributedschedule_path}/safwk/services/safwk/include", - "${appexecfwk_path}/test/systemtest/common/ams/tool/include", + "test/systemtest/common/ams/tool/include", "//third_party/jsoncpp/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_ability_append_test.cpp", + "test/systemtest/common/ams/tool/src/event.cpp", + "test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "test/systemtest/common/ams/tool/src/stoperator.cpp", ] configs = [ diff --git a/test/systemtest/common/ams/ams_ability_state_age_manual_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_state_age_manual_test/BUILD.gn index c9bdf34acb..522f722c84 100644 --- a/test/systemtest/common/ams/ams_ability_state_age_manual_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_ability_state_age_manual_test/BUILD.gn @@ -37,15 +37,15 @@ ohos_systemtest("ams_ability_state_age_manual_test") { include_dirs = [ "${distributedschedule_path}/safwk/services/safwk/include", - "${appexecfwk_path}/test/systemtest/common/ams/tool/include", + "test/systemtest/common/ams/tool/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_ability_state_age_manual_test.cpp", + "test/systemtest/common/ams/tool/src/event.cpp", + "test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "test/systemtest/common/ams/tool/src/stoperator.cpp", ] configs = [ @@ -55,7 +55,7 @@ ohos_systemtest("ams_ability_state_age_manual_test") { # "${aafwk_path}/frameworks/kits/appkit:appkit_config", ":system_test_ams_ability_state_age_manual_test_config", - "${appexecfwk_path}/test/systemtest/common/ams/tool/:system_test_ability_util_config", + "test/systemtest/common/ams/tool/:system_test_ability_util_config", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_config", ] cflags = [] diff --git a/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn index 6996915ad1..33cadff32c 100644 --- a/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_ability_state_test/BUILD.gn @@ -37,15 +37,15 @@ ohos_systemtest("ams_ability_state_test") { include_dirs = [ "${distributedschedule_path}/safwk/services/safwk/include", - "${appexecfwk_path}/test/systemtest/common/ams/tool/include", + "test/systemtest/common/ams/tool/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_ability_state_test.cpp", + "test/systemtest/common/ams/tool/src/event.cpp", + "test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "test/systemtest/common/ams/tool/src/stoperator.cpp", ] configs = [ @@ -55,7 +55,7 @@ ohos_systemtest("ams_ability_state_test") { # "${aafwk_path}/frameworks/kits/appkit:appkit_config", ":system_test_ams_ability_state_test_config", - "${appexecfwk_path}/test/systemtest/common/ams/tool/:system_test_ability_util_config", + "test/systemtest/common/ams/tool/:system_test_ability_util_config", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_config", ] cflags = [] diff --git a/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn index dc72b18f46..249e9ecab3 100644 --- a/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_ability_visible_test/BUILD.gn @@ -18,17 +18,16 @@ ohos_systemtest("ams_ability_visible_test") { include_dirs = [ "${distributedschedule_path}/safwk/services/safwk/include", - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", - "${appexecfwk_path}/test/systemtest/common/ams/tool/include", + "test/systemtest/common/ams/tool/include", "//third_party/jsoncpp/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_ability_visible_test.cpp", + "test/systemtest/common/ams/tool/src/event.cpp", + "test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "test/systemtest/common/ams/tool/src/stoperator.cpp", ] configs = [ diff --git a/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn b/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn index 8016b9f48a..a50eea6dcf 100644 --- a/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn @@ -18,17 +18,16 @@ ohos_systemtest("ams_app_process_manage_test") { include_dirs = [ "${distributedschedule_path}/safwk/services/safwk/include", - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", - "${appexecfwk_path}/test/systemtest/common/ams/tool/include", + "test/systemtest/common/ams/tool/include", "//third_party/jsoncpp/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_app_process_manage_test.cpp", + "test/systemtest/common/ams/tool/src/event.cpp", + "test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "test/systemtest/common/ams/tool/src/stoperator.cpp", ] configs = [ @@ -58,8 +57,7 @@ ohos_systemtest("ams_app_process_manage_test") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] - resource_config_file = - "${appexecfwk_path}/test/resource/mstbundlemgrservice/ohos_test.xml" + resource_config_file = "test/resource/mstbundlemgrservice/ohos_test.xml" } group("systemtest") { diff --git a/test/systemtest/common/ams/ams_check_service/BUILD.gn b/test/systemtest/common/ams/ams_check_service/BUILD.gn index fcaf965ef7..f3696e0341 100644 --- a/test/systemtest/common/ams/ams_check_service/BUILD.gn +++ b/test/systemtest/common/ams/ams_check_service/BUILD.gn @@ -37,15 +37,15 @@ ohos_systemtest("ams_check_service") { include_dirs = [ "${distributedschedule_path}/safwk/services/safwk/include", - "${appexecfwk_path}/test/systemtest/common/ams/tool/include", + "test/systemtest/common/ams/tool/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "access_control_check.cpp", + "test/systemtest/common/ams/tool/src/event.cpp", + "test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "test/systemtest/common/ams/tool/src/stoperator.cpp", ] configs = [ @@ -54,7 +54,7 @@ ohos_systemtest("ams_check_service") { # "${aafwk_path}/frameworks/kits/appkit:appkit_config", ":ams_check_service_config", - "${appexecfwk_path}/test/systemtest/common/ams/tool/:system_test_ability_util_config", + "test/systemtest/common/ams/tool/:system_test_ability_util_config", "${appexecfwk_path}/libs/libeventhandler:libeventhandler_config", ] cflags = [] diff --git a/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn b/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn index 81679a4d1d..bbee3066e1 100644 --- a/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_configuration_updated_test/BUILD.gn @@ -18,17 +18,16 @@ ohos_systemtest("ams_configuration_updated_test") { include_dirs = [ "${distributedschedule_path}/safwk/services/safwk/include", - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", - "${appexecfwk_path}/test/systemtest/common/ams/tool/include", + "test/systemtest/common/ams/tool/include", "//third_party/jsoncpp/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_configuration_updated_test.cpp", + "test/systemtest/common/ams/tool/src/event.cpp", + "test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "test/systemtest/common/ams/tool/src/stoperator.cpp", ] configs = [ diff --git a/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn b/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn index 043af4cdcb..eb9b726ed9 100644 --- a/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn @@ -20,16 +20,16 @@ ohos_systemtest("ams_data_ability_test") { include_dirs = [ "${distributedschedule_path}/safwk/services/safwk/include", - "${appexecfwk_path}/test/systemtest/common/ams/tool/include", + "test/systemtest/common/ams/tool/include", "//third_party/jsoncpp/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_data_ability_test.cpp", + "test/systemtest/common/ams/tool/src/event.cpp", + "test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "test/systemtest/common/ams/tool/src/stoperator.cpp", ] configs = [ diff --git a/test/systemtest/common/ams/ams_dfx_test/BUILD.gn b/test/systemtest/common/ams/ams_dfx_test/BUILD.gn index caa4ada185..3b30e2c673 100644 --- a/test/systemtest/common/ams/ams_dfx_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_dfx_test/BUILD.gn @@ -18,17 +18,16 @@ ohos_systemtest("ams_dfx_test") { include_dirs = [ "${distributedschedule_path}/safwk/services/safwk/include", - "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", - "${appexecfwk_path}/test/systemtest/common/ams/tool/include", + "test/systemtest/common/ams/tool/include", "//third_party/jsoncpp/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_dfx_test.cpp", + "test/systemtest/common/ams/tool/src/event.cpp", + "test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "test/systemtest/common/ams/tool/src/stoperator.cpp", ] configs = [ diff --git a/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn b/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn index 54436a676b..cac9f1e06d 100644 --- a/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn @@ -20,16 +20,16 @@ ohos_systemtest("ams_service_ability_test") { include_dirs = [ "${distributedschedule_path}/services/safwk/include", - "${appexecfwk_path}/test/systemtest/common/ams/tool/include", + "test/systemtest/common/ams/tool/include", "//third_party/jsoncpp/include", ] sources = [ - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", "ams_service_ability_test.cpp", + "test/systemtest/common/ams/tool/src/event.cpp", + "test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "test/systemtest/common/ams/tool/src/stoperator.cpp", ] configs = [ diff --git a/test/systemtest/common/ams/tool/BUILD.gn b/test/systemtest/common/ams/tool/BUILD.gn index f7400efc54..531f934e03 100644 --- a/test/systemtest/common/ams/tool/BUILD.gn +++ b/test/systemtest/common/ams/tool/BUILD.gn @@ -16,7 +16,7 @@ import("//build/test.gni") config("system_test_ability_util_config") { include_dirs = [ "//third_party/jsoncpp/include", - "${appexecfwk_path}/test/systemtest/common/ams/tool/include", + "test/systemtest/common/ams/tool/include", "${distributedschedule_path}/safwk/services/safwk/include", ] cflags = [] @@ -27,10 +27,10 @@ config("system_test_ability_util_config") { ohos_shared_library("system_test_ability_util_lib") { sources = [ - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/event.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/st_ability_util.cpp", - "${appexecfwk_path}/test/systemtest/common/ams/tool/src/stoperator.cpp", + "test/systemtest/common/ams/tool/src/event.cpp", + "test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "test/systemtest/common/ams/tool/src/st_ability_util.cpp", + "test/systemtest/common/ams/tool/src/stoperator.cpp", ] configs = [ diff --git a/test/resource/tools/aa/dataAbilityBundleForDump.hap b/tools/test/resource/aa/dataAbilityBundleForDump.hap similarity index 100% rename from test/resource/tools/aa/dataAbilityBundleForDump.hap rename to tools/test/resource/aa/dataAbilityBundleForDump.hap diff --git a/test/resource/tools/aa/pageAbilityBundleForDump.hap b/tools/test/resource/aa/pageAbilityBundleForDump.hap similarity index 100% rename from test/resource/tools/aa/pageAbilityBundleForDump.hap rename to tools/test/resource/aa/pageAbilityBundleForDump.hap diff --git a/test/resource/tools/aa/pageAbilityBundleForStart.hap b/tools/test/resource/aa/pageAbilityBundleForStart.hap similarity index 100% rename from test/resource/tools/aa/pageAbilityBundleForStart.hap rename to tools/test/resource/aa/pageAbilityBundleForStart.hap diff --git a/test/resource/tools/aa/serviceAbilityBundleForStart.hap b/tools/test/resource/aa/serviceAbilityBundleForStart.hap similarity index 100% rename from test/resource/tools/aa/serviceAbilityBundleForStart.hap rename to tools/test/resource/aa/serviceAbilityBundleForStart.hap diff --git a/test/resource/tools/aa/serviceAbilityBundleForStop.hap b/tools/test/resource/aa/serviceAbilityBundleForStop.hap similarity index 100% rename from test/resource/tools/aa/serviceAbilityBundleForStop.hap rename to tools/test/resource/aa/serviceAbilityBundleForStop.hap diff --git a/test/resource/tools/ohos_test.xml b/tools/test/resource/ohos_test.xml similarity index 100% rename from test/resource/tools/ohos_test.xml rename to tools/test/resource/ohos_test.xml