From 055227e664bd13e98fddf5ca53f4e881e175317d Mon Sep 17 00:00:00 2001 From: chengxingzhen Date: Mon, 19 Dec 2022 21:06:33 +0800 Subject: [PATCH] =?UTF-8?q?xts=E7=AD=BE=E5=90=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chengxingzhen --- ability/ability_runtime/BUILD.gn | 2 - .../entry/src/main/config.json | 4 +- .../signature/openharmony_sx.p7b | Bin 3443 -> 3651 bytes .../AppScope/app.json | 21 - .../resources/base/element/string.json | 8 - .../resources/base/media/app_icon.png | Bin 6790 -> 0 bytes .../ActsAmsUsersExtensionSystemTest/BUILD.gn | 43 - .../ActsAmsUsersExtensionSystemTest/Test.json | 32 - .../src/main/ets/Application/AbilityStage.ts | 23 - .../src/main/ets/MainAbility/MainAbility.ts | 54 - .../ets/MainAbility/pages/index/index.ets | 31 - .../ets/MainAbility/pages/second/second.ets | 43 - .../src/main/ets/MainAbility2/MainAbility2.ts | 53 - .../main/ets/ServiceAbility/ServiceAbility.ts | 246 --- .../ets/ServiceAbility2/ServiceAbility2.ts | 53 - .../ets/TestRunner/OpenHarmonyTestRunner.ts | 78 - .../entry/src/main/ets/test/Ability.test.ets | 968 ---------- .../entry/src/main/ets/test/List.test.ets | 20 - .../entry/src/main/module.json | 129 -- .../main/resources/base/element/string.json | 32 - .../src/main/resources/base/media/icon.png | Bin 6790 -> 0 bytes .../resources/base/profile/main_pages.json | 6 - .../signature/openharmony_sx.p7b | Bin 3820 -> 0 bytes .../AppScope/app.json | 21 - .../resources/base/element/string.json | 8 - .../resources/base/media/app_icon.png | Bin 6790 -> 0 bytes .../ActsAmsUsersExtensionThirdTest/BUILD.gn | 43 - .../ActsAmsUsersExtensionThirdTest/Test.json | 31 - .../src/main/ets/Application/AbilityStage.ts | 23 - .../src/main/ets/MainAbility/MainAbility.ts | 54 - .../ets/MainAbility/pages/index/index.ets | 31 - .../ets/MainAbility/pages/second/second.ets | 44 - .../src/main/ets/MainAbility2/MainAbility2.ts | 53 - .../main/ets/ServiceAbility/ServiceAbility.ts | 206 --- .../ets/ServiceAbility2/ServiceAbility2.ts | 54 - .../src/main/ets/TestAbility/TestAbility.ts | 51 - .../src/main/ets/TestAbility/pages/index.ets | 48 - .../ets/TestRunner/OpenHarmonyTestRunner.ts | 78 - .../entry/src/main/ets/test/Ability.test.ets | 828 --------- .../entry/src/main/ets/test/List.test.ets | 20 - .../entry/src/main/module.json | 77 - .../main/resources/base/element/string.json | 32 - .../src/main/resources/base/media/icon.png | Bin 6790 -> 0 bytes .../resources/base/profile/main_pages.json | 6 - .../signature/openharmony_sx.p7b | Bin 3820 -> 0 bytes .../entry/src/main/module.json | 4 +- .../signature/openharmony_sx.p7b | Bin 3426 -> 3640 bytes .../entry/src/main/module.json | 4 +- .../signature/openharmony_sx.p7b | Bin 3426 -> 3644 bytes .../signature/openharmony_sx.p7b | Bin 3426 -> 3645 bytes .../main/ets/ServiceAbility/ServiceAbility.ts | 49 - .../entry/src/main/module.json | 75 +- .../signature/openharmony_sx.p7b | Bin 3820 -> 3729 bytes .../signature/openharmony_sx_thirdparty.p7b | Bin 3426 -> 3657 bytes ability/ability_runtime/actsusers/BUILD.gn | 4 - .../AppScope/app.json | 21 - .../resources/base/element/string.json | 8 - .../resources/base/media/app_icon.png | Bin 6790 -> 0 bytes .../BUILD.gn | 43 - .../Test.json | 33 - .../src/main/ets/Application/AbilityStage.ts | 23 - .../src/main/ets/MainAbility/MainAbility.ts | 50 - .../ets/MainAbility/pages/index/index.ets | 42 - .../ets/MainAbility/pages/second/second.ets | 43 - .../main/ets/ServiceAbility/ServiceAbility.ts | 205 --- .../src/main/ets/ServiceAbility/service.ts | 25 - .../ets/ServiceAbility2/ServiceAbility2.ts | 61 - .../src/main/ets/ServiceAbility2/service.ts | 25 - .../src/main/ets/TestAbility/TestAbility.ts | 51 - .../src/main/ets/TestAbility/pages/index.ets | 48 - .../ets/TestRunner/OpenHarmonyTestRunner.ts | 78 - .../entry/src/main/ets/test/List.test.ets | 18 - .../ets/test/manyusersabilitytest.test.ets | 838 --------- .../entry/src/main/module.json | 109 -- .../main/resources/base/element/string.json | 32 - .../src/main/resources/base/media/icon.png | Bin 6790 -> 0 bytes .../resources/base/profile/main_pages.json | 6 - .../signature/openharmony_sx.p7b | Bin 3820 -> 0 bytes .../AppScope/app.json | 21 - .../resources/base/element/string.json | 8 - .../resources/base/media/app_icon.png | Bin 6790 -> 0 bytes .../actsmanyuserthirdabilitytest/BUILD.gn | 43 - .../actsmanyuserthirdabilitytest/Test.json | 33 - .../src/main/ets/Application/AbilityStage.ts | 23 - .../src/main/ets/MainAbility/MainAbility.ts | 51 - .../ets/MainAbility/pages/index/index.ets | 42 - .../ets/MainAbility/pages/second/second.ets | 43 - .../main/ets/ServiceAbility/ServiceAbility.ts | 206 --- .../src/main/ets/ServiceAbility/service.ts | 25 - .../ets/ServiceAbility2/ServiceAbility2.ts | 63 - .../src/main/ets/ServiceAbility2/service.ts | 25 - .../src/main/ets/TestAbility/TestAbility.ts | 51 - .../src/main/ets/TestAbility/pages/index.ets | 48 - .../ets/TestRunner/OpenHarmonyTestRunner.ts | 78 - .../entry/src/main/ets/test/List.test.ets | 19 - .../ets/test/manyusersabilitytest.test.ets | 912 ---------- .../entry/src/main/module.json | 58 - .../main/resources/base/element/string.json | 32 - .../src/main/resources/base/media/icon.png | Bin 6790 -> 0 bytes .../resources/base/profile/main_pages.json | 6 - .../signature/openharmony_sx.p7b | Bin 3820 -> 0 bytes .../amscontextualinforquery/BUILD.gn | 3 - .../AppScope/app.json | 21 - .../resources/base/element/string.json | 8 - .../resources/base/media/app_icon.png | Bin 6790 -> 0 bytes .../actsamsextensionmodulehap/BUILD.gn | 45 - .../src/main/ets/Application/AbilityStage.ts | 23 - .../src/main/ets/MainAbility/MainAbility.ts | 99 - .../main/ets/ServiceAbility/ServiceAbility.ts | 50 - .../src/main/ets/ServiceAbility/service.ts | 25 - .../entry/src/main/ets/pages/index/index.ets | 37 - .../src/main/ets/pages/second/second.ets | 43 - .../entry/src/main/module.json | 101 -- .../main/resources/base/element/string.json | 32 - .../src/main/resources/base/media/icon.png | Bin 6790 -> 0 bytes .../resources/base/profile/main_pages.json | 6 - .../signature/openharmony_sx.p7b | Bin 3820 -> 0 bytes .../entry/src/main/module.json | 52 +- .../signature/openharmony_sx.p7b | Bin 3442 -> 3697 bytes .../AppScope/app.json | 21 - .../resources/base/element/string.json | 8 - .../resources/base/media/app_icon.png | Bin 6790 -> 0 bytes .../actsamsstaticextensioninfohap/BUILD.gn | 45 - .../src/main/ets/Application/AbilityStage.ts | 23 - .../src/main/ets/MainAbility/MainAbility.ts | 51 - .../main/ets/ServiceAbility/ServiceAbility.ts | 57 - .../src/main/ets/ServiceAbility/service.ts | 25 - .../entry/src/main/ets/pages/index/index.ets | 37 - .../src/main/ets/pages/second/second.ets | 43 - .../entry/src/main/module.json | 91 - .../main/resources/base/element/string.json | 32 - .../src/main/resources/base/media/icon.png | Bin 6790 -> 0 bytes .../resources/base/profile/main_pages.json | 6 - .../signature/openharmony_sx.p7b | Bin 3820 -> 0 bytes .../AppScope/app.json | 21 - .../resources/base/element/string.json | 8 - .../resources/base/media/app_icon.png | Bin 15458 -> 0 bytes .../actsamsstaticextensioninfotest/BUILD.gn | 43 - .../actsamsstaticextensioninfotest/Test.json | 43 - .../src/main/ets/Application/AbilityStage.ts | 22 - .../src/main/ets/MainAbility/MainAbility.ts | 50 - .../ets/MainAbility/pages/index/index.ets | 56 - .../ets/MainAbility/pages/second/second.ets | 43 - .../main/ets/ServiceAbility/ServiceAbility.ts | 56 - .../src/main/ets/ServiceAbility/service.ts | 25 - .../src/main/ets/TestAbility/TestAbility.ts | 50 - .../src/main/ets/TestAbility/pages/index.ets | 48 - .../ets/TestRunner/OpenHarmonyTestRunner.ts | 78 - .../entry/src/main/ets/test/Ability.test.ets | 473 ----- .../entry/src/main/ets/test/List.test.ets | 22 - .../entry/src/main/module.json | 95 - .../main/resources/base/element/string.json | 32 - .../src/main/resources/base/media/icon.png | Bin 15458 -> 0 bytes .../resources/base/profile/main_pages.json | 6 - .../signature/openharmony_sx.p7b | Bin 3820 -> 0 bytes .../entry/src/main/module.json | 44 +- .../signature/openharmony_sx.p7b | Bin 3442 -> 3661 bytes .../entry/src/main/module.json | 44 +- .../signature/openharmony_sx.p7b | Bin 3442 -> 3661 bytes .../entry/src/main/module.json | 52 +- .../signature/openharmony_sx.p7b | Bin 3442 -> 3692 bytes .../entry/src/main/ets/test/Ability.test.ets | 1 + .../entry/src/main/module.json | 44 +- .../signature/openharmony_sx.p7b | Bin 3442 -> 3653 bytes .../entry/src/main/ets/test/Ability.test.ets | 1 + .../entry/src/main/module.json | 40 +- .../signature/openharmony_sx.p7b | Bin 3442 -> 3655 bytes .../signature/openharmony_sx.p7b | Bin 3443 -> 3648 bytes .../facoverapi/signature/openharmony_sx.p7b | Bin 3455 -> 3638 bytes .../signature/openharmony_sx.p7b | Bin 3455 -> 3643 bytes .../signature/openharmony_sx.p7b | Bin 3443 -> 3647 bytes .../faauxiliary/signature/openharmony_sx.p7b | Bin 3443 -> 3649 bytes .../signature/openharmony_sx.p7b | Bin 3443 -> 3652 bytes .../signature/openharmony_sx.p7b | Bin 3443 -> 3664 bytes .../signature/openharmony_sx.p7b | Bin 3443 -> 3647 bytes .../signature/openharmony_sx.p7b | Bin 3443 -> 3654 bytes .../startability/signature/openharmony_sx.p7b | Bin 3443 -> 3638 bytes .../signature/openharmony_sx.p7b | Bin 3443 -> 3647 bytes .../signature/openharmony_sx.p7b | Bin 3443 -> 3647 bytes .../signature/openharmony_sx.p7b | Bin 3643 -> 3642 bytes .../signature/openharmony_sx.p7b | Bin 3641 -> 3638 bytes .../signature/openharmony_sx.p7b | Bin 3641 -> 3638 bytes .../signature/openharmony_sx.p7b | Bin 3641 -> 3637 bytes .../signature/openharmony_sx.p7b | Bin 3641 -> 3638 bytes ability/ability_runtime/zidltest/BUILD.gn | 24 - .../actsamszidlclienttest/AppScope/app.json | 21 - .../resources/base/element/string.json | 8 - .../resources/base/media/app_icon.png | Bin 15458 -> 0 bytes .../zidltest/actsamszidlclienttest/BUILD.gn | 43 - .../zidltest/actsamszidlclienttest/Test.json | 31 - .../src/main/ets/Application/AbilityStage.ts | 23 - .../src/main/ets/MainAbility/MainAbility.ts | 51 - .../main/ets/ServiceAbility/ServiceAbility.ts | 434 ----- .../interfaceDeclare/i_interface_declare.ts | 21 - .../interface_declare_proxy.ts | 44 - .../interface_declare_stub.ts | 47 - .../src/main/ets/ServiceAbility/service.ts | 25 - .../zidlTool/i_zidl_tool_test.ts | 105 -- .../zidlTool/my_sequenceable.ts | 28 - .../zidlTool/zidl_tool_test_stub.ts | 549 ------ .../ets/ServiceAbility2/ServiceAbility2.ts | 65 - .../src/main/ets/ServiceAbility2/service.ts | 25 - ..._interface_attribute_declaratoin_oneway.ts | 25 - ...rface_attribute_declaratoin_oneway_stub.ts | 64 - .../interfaceDeclare/i_interface_declare.ts | 21 - .../interface_declare_proxy.ts | 44 - .../interface_declare_stub.ts | 47 - .../entry/src/main/ets/pages/index.ets | 64 - .../entry/src/main/ets/pages/index/index.ets | 66 - .../entry/src/main/ets/pages/second.ets | 43 - .../src/main/ets/pages/second/second.ets | 43 - .../entry/src/main/ets/test/Ability.test.ets | 1586 ----------------- .../entry/src/main/ets/test/List.test.ets | 22 - .../src/main/ets/zidlTool/i_zidl_tool_test.ts | 105 -- .../src/main/ets/zidlTool/my_sequenceable.ts | 28 - .../main/ets/zidlTool/zidl_tool_test_proxy.ts | 948 ---------- ..._interface_attribute_declaratoin_oneway.ts | 25 - ...face_attribute_declaratoin_oneway_proxy.ts | 77 - .../entry/src/main/module.json | 101 -- .../main/resources/base/element/string.json | 32 - .../src/main/resources/base/media/icon.png | Bin 15458 -> 0 bytes .../resources/base/profile/main_pages.json | 6 - .../signature/openharmony_sx.p7b | Bin 3820 -> 0 bytes .../actsamszidlservice/AppScope/app.json | 21 - .../resources/base/element/string.json | 8 - .../resources/base/media/app_icon.png | Bin 6790 -> 0 bytes .../zidltest/actsamszidlservice/BUILD.gn | 45 - .../src/main/ets/Application/AbilityStage.ts | 23 - .../src/main/ets/MainAbility/MainAbility.ts | 51 - .../main/ets/ServiceAbility/ServiceAbility.ts | 434 ----- .../interfaceDeclare/i_interface_declare.ts | 21 - .../interface_declare_proxy.ts | 44 - .../interface_declare_stub.ts | 47 - .../src/main/ets/ServiceAbility/service.ts | 25 - .../zidlTool/i_zidl_tool_test.ts | 105 -- .../zidlTool/my_sequenceable.ts | 28 - .../zidlTool/zidl_tool_test_stub.ts | 549 ------ .../ets/ServiceAbility2/ServiceAbility2.ts | 65 - .../src/main/ets/ServiceAbility2/service.ts | 25 - ..._interface_attribute_declaratoin_oneway.ts | 25 - ...rface_attribute_declaratoin_oneway_stub.ts | 64 - .../entry/src/main/ets/pages/index/index.ets | 37 - .../src/main/ets/pages/second/second.ets | 43 - .../entry/src/main/module.json | 100 -- .../main/resources/base/element/string.json | 32 - .../src/main/resources/base/media/icon.png | Bin 6790 -> 0 bytes .../resources/base/profile/main_pages.json | 6 - .../signature/openharmony_sx.p7b | Bin 4623 -> 0 bytes 248 files changed, 70 insertions(+), 16236 deletions(-) delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/AppScope/app.json delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/AppScope/resources/base/element/string.json delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/AppScope/resources/base/media/app_icon.png delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/BUILD.gn delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/Test.json delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/Application/AbilityStage.ts delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility/MainAbility.ts delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility/pages/index/index.ets delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility/pages/second/second.ets delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/test/Ability.test.ets delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/test/List.test.ets delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/module.json delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/resources/base/element/string.json delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/resources/base/media/icon.png delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/resources/base/profile/main_pages.json delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/signature/openharmony_sx.p7b delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/AppScope/app.json delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/AppScope/resources/base/element/string.json delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/AppScope/resources/base/media/app_icon.png delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/BUILD.gn delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/Test.json delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/Application/AbilityStage.ts delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/MainAbility/MainAbility.ts delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/MainAbility/pages/index/index.ets delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/MainAbility/pages/second/second.ets delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/MainAbility2/MainAbility2.ts delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestAbility/TestAbility.ts delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestAbility/pages/index.ets delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/test/Ability.test.ets delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/test/List.test.ets delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/module.json delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/resources/base/element/string.json delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/resources/base/media/icon.png delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/resources/base/profile/main_pages.json delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/signature/openharmony_sx.p7b delete mode 100644 ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/AppScope/app.json delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/AppScope/resources/base/element/string.json delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/AppScope/resources/base/media/app_icon.png delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/BUILD.gn delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/Test.json delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/Application/AbilityStage.ts delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/MainAbility/pages/index/index.ets delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/MainAbility/pages/second/second.ets delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility/service.ts delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility2/service.ts delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestAbility/TestAbility.ts delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestAbility/pages/index.ets delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/test/List.test.ets delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/module.json delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/resources/base/element/string.json delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/resources/base/media/icon.png delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/resources/base/profile/main_pages.json delete mode 100644 ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/signature/openharmony_sx.p7b delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/AppScope/app.json delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/AppScope/resources/base/element/string.json delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/AppScope/resources/base/media/app_icon.png delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/BUILD.gn delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/Test.json delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/Application/AbilityStage.ts delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/MainAbility/pages/index/index.ets delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/MainAbility/pages/second/second.ets delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility/service.ts delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility2/service.ts delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/TestAbility/TestAbility.ts delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/TestAbility/pages/index.ets delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/test/List.test.ets delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/module.json delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/resources/base/element/string.json delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/resources/base/media/icon.png delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/resources/base/profile/main_pages.json delete mode 100644 ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/signature/openharmony_sx.p7b delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/AppScope/app.json delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/AppScope/resources/base/element/string.json delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/AppScope/resources/base/media/app_icon.png delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/Application/AbilityStage.ts delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/MainAbility/MainAbility.ts delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/ServiceAbility/ServiceAbility.ts delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/ServiceAbility/service.ts delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/pages/index/index.ets delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/pages/second/second.ets delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/module.json delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/resources/base/element/string.json delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/resources/base/media/icon.png delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/resources/base/profile/main_pages.json delete mode 100755 ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/signature/openharmony_sx.p7b delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/AppScope/app.json delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/AppScope/resources/base/element/string.json delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/AppScope/resources/base/media/app_icon.png delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/Application/AbilityStage.ts delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/MainAbility/MainAbility.ts delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/ServiceAbility/ServiceAbility.ts delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/ServiceAbility/service.ts delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/pages/index/index.ets delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/pages/second/second.ets delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/module.json delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/resources/base/element/string.json delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/resources/base/media/icon.png delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/resources/base/profile/main_pages.json delete mode 100755 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/signature/openharmony_sx.p7b delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/AppScope/app.json delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/AppScope/resources/base/element/string.json delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/AppScope/resources/base/media/app_icon.png delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/Test.json delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/Application/AbilityStage.ts delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/MainAbility.ts delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/pages/index/index.ets delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/pages/second/second.ets delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/ServiceAbility/service.ts delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/TestAbility/TestAbility.ts delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/TestAbility/pages/index.ets delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/List.test.ets delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/module.json delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/resources/base/element/string.json delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/resources/base/media/icon.png delete mode 100644 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/resources/base/profile/main_pages.json delete mode 100755 ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/signature/openharmony_sx.p7b delete mode 100644 ability/ability_runtime/zidltest/BUILD.gn delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/AppScope/app.json delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/AppScope/resources/base/element/string.json delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/AppScope/resources/base/media/app_icon.png delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/BUILD.gn delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/Test.json delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/Application/AbilityStage.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/MainAbility/MainAbility.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/interfaceDeclare/i_interface_declare.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_proxy.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_stub.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/service.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/zidlTool/i_zidl_tool_test.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/zidlTool/my_sequenceable.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/zidlTool/zidl_tool_test_stub.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/service.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/i_interface_attribute_declaratoin_oneway.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/interface_attribute_declaratoin_oneway_stub.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/interfaceDeclare/i_interface_declare.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/interfaceDeclare/interface_declare_proxy.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/interfaceDeclare/interface_declare_stub.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/index.ets delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/index/index.ets delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/second.ets delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/second/second.ets delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/test/Ability.test.ets delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/test/List.test.ets delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlTool/i_zidl_tool_test.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlTool/my_sequenceable.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlTool/zidl_tool_test_proxy.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlToolOneWay/i_interface_attribute_declaratoin_oneway.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlToolOneWay/interface_attribute_declaratoin_oneway_proxy.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/module.json delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/resources/base/element/string.json delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/resources/base/media/icon.png delete mode 100644 ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/resources/base/profile/main_pages.json delete mode 100755 ability/ability_runtime/zidltest/actsamszidlclienttest/signature/openharmony_sx.p7b delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/AppScope/app.json delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/AppScope/resources/base/element/string.json delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/AppScope/resources/base/media/app_icon.png delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/BUILD.gn delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/Application/AbilityStage.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/MainAbility/MainAbility.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/ServiceAbility.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/interfaceDeclare/i_interface_declare.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_proxy.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_stub.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/service.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/zidlTool/i_zidl_tool_test.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/zidlTool/my_sequenceable.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/zidlTool/zidl_tool_test_stub.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/service.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/i_interface_attribute_declaratoin_oneway.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/interface_attribute_declaratoin_oneway_stub.ts delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/pages/index/index.ets delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/pages/second/second.ets delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/module.json delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/resources/base/element/string.json delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/resources/base/media/icon.png delete mode 100644 ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/resources/base/profile/main_pages.json delete mode 100755 ability/ability_runtime/zidltest/actsamszidlservice/signature/openharmony_sx.p7b diff --git a/ability/ability_runtime/BUILD.gn b/ability/ability_runtime/BUILD.gn index 4fa4688ac..59b0565f3 100644 --- a/ability/ability_runtime/BUILD.gn +++ b/ability/ability_runtime/BUILD.gn @@ -54,8 +54,6 @@ group("ability_runtime") { "stage:stage", "want:want", "workercontextcover:workercontextcover", - - #"zidltest:zidltest", ] } } diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/config.json b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/config.json index aab032882..4967aad91 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/config.json +++ b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/entry/src/main/config.json @@ -18,8 +18,8 @@ "mainAbility": ".MainAbility", "srcPath": "", "deviceType": [ - "default", - "tablet" + "default", + "tablet" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/signature/openharmony_sx.p7b b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/signature/openharmony_sx.p7b index 66b4457a8a81fb8d3356cf46d67226c850944858..b36f2bc9d9f2e86047f36f73236632442ae16a43 100644 GIT binary patch delta 624 zcmew?by%j}po!0(jZ>@5qwPB{BRkWACO!k8kPZ_gqam*WHydX{n+IbmGYb==K@;nJ zghIvzO{^DKnpn?NE0v`d6=&w>>E!?=jKKD8n-w;(4~ue2Cw zNorA9W^!tAWpPPrZel^EIna{Cf*hcpy!@iv#2hfUKsPNlv81#JWK>3eaXdsS9%#2x zEl_!KPO*|zwNheEPJVf6iY|m7t)vtSlq^Us%FQeWc?GPdD7Cm`G7qbMJ;db&MVV!p zIjQNXy2*(JiAk9`nI)O2K!wptjv&Jv3krNob4oG;it>R@EC#v-A`Dho8Bmm&UzAx= z8CaTHl$n}>ChJ;}oKu>T>QkD%LOn*UvL1=L*P(Q?S*NT$VJdhJ%Mz{gJ9+p|0 znUs_2mtT^ZR;d)b*_w43d%dBNp@D&k0T4tP=)>cUlf_VpMd5YK&N-*IZJE2%ilOwb z_i^9Qe@cWmT~rY>+y9{wzlnd zo>^vhYo3(w)dvR~9+d^hPcHub52$37vm-;O>nyJ`$_iYT!v8*eTKv~il;=+vdz0(= JDSgN5^8i~V;gA3T delta 368 zcmX>s^I0n0pour1jZ>@5qwPB{BRkWACf)>~Pz)0zqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcI&gu!#9W|&lA)e~p25TkhWsU!1t5M= zYEEimajMe94DE>rZ8q~UE@1ZXFG$VvNG!_D&#Tl+EGW<`Ni8l>(osq*$N_37t}HG| z&5cjaFG>ZA73ij=CYF=}c~(jp`Ni>2d7wU}$>OZ8o4MJRvDX_I8CV#Y8ycAyM;YkD z-Ob5jsKlbsS0JUwB~>lzXREYEyJd#zv%~Mr0)50DE=m7Vko;r+31bEeFTW>VQCN_Ap>xXC+)Yy%gdcqrcmq^2FJhzV8Kwp6 fLjHc9x?cD_>niW9^Q%>sGah{2aCX~6_BDI}O8$Q; diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/AppScope/app.json b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/AppScope/app.json deleted file mode 100644 index ac69de9d7..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/AppScope/app.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "app": { - "bundleName": "com.acts.actsinterfacemultiusersextensiontest", - "vendor": "huawei", - "versionCode": 1000000, - "versionName": "1.0.0", - "debug": false, - "icon" : "$media:icon", - "label" : "$string:app_name", - "description" : "$string:description_application", - "distributedNotificationEnabled": true, - "keepAlive" : true, - "singleUser": true, - "minAPIVersion": 8, - "targetAPIVersion": 8, - "car": { - "apiCompatibleVersion": 8, - "singleUser": false - } - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/AppScope/resources/base/element/string.json b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/AppScope/resources/base/element/string.json deleted file mode 100644 index be09cccde..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/AppScope/resources/base/element/string.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "ohosProject" - } - ] -} diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/AppScope/resources/base/media/app_icon.png b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/AppScope/resources/base/media/app_icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6790 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 { - router.back() - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts deleted file mode 100644 index c14e759e1..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2021 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 Ability from '@ohos.app.ability.UIAbility' -import commonEvent from "@ohos.commonEvent" - -export default class MainAbility2 extends Ability { - - onCreate(want, launchParam) { - console.log("MainAbility2 onCreate"); - globalThis.abilityContext2 = this.context - } - - onDestroy() { - console.log("MainAbility2 onDestroy"); - } - - onWindowStageCreate(windowStage) { - console.log("MainAbility2 onWindowStageCreate"); - windowStage.setUIContent(this.context, "MainAbility/pages/index/second", null); - commonEvent.publish("ACTS_InterfaceMultiUsersExtension_CommonEvent", () => { - console.log("publish Publish ACTS_InterfaceMultiUsersExtension_CommonEvent callback") - globalThis.abilityContext2.terminateSelf().then(() => { - commonEvent.publish("ACTS_TerminateSelf_CommonEvent", ()=>{ - console.log('terminateSelf promise'); - }); - }); - }) - } - - onWindowStageDestroy() { - console.log("MainAbility2 onWindowStageDestroy"); - } - - onForeground() { - console.log("MainAbility2 onForeground"); - } - - onBackground() { - console.log("MainAbility2 onBackground"); - } -}; diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts deleted file mode 100644 index 9585ba864..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts +++ /dev/null @@ -1,246 +0,0 @@ -/* - * Copyright (c) 2021 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 ServiceExtensionAbility from '@ohos.application.ServiceExtensionAbility' -import rpc from '@ohos.rpc'; -class Stub extends rpc.RemoteObject { - constructor(des) { - super(des); - } - onRemoteRequest(code, data, reply, option) { - reply.writeNoException(); - reply.writeString("success"); - return true; - } -} -export default class ServiceAbility extends ServiceExtensionAbility { - onCreate(want) { - console.log('ServiceAbility onCreate'); - } - onDestory(){ - console.log('ServiceAbility onDestory'); - } - onRequest(want,startId) { - console.log('ServiceAbility onRequest'); - } - - onConnect(want) { - console.log('ServiceAbility onConnect'); - console.log('globalThis.startnum is' + globalThis.startnum); - switch (globalThis.startnum) { - case 1: - this.context.startAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.MainAbility2' - },{ - windowMode:0 - } - ).then((data) => { - console.debug("====>startAbility end====>"); - console.debug("====>data is====>" + JSON.stringify(data)); - }).catch((err)=>{ - console.debug("==== err is====>"+ JSON.stringify(err)); - console.debug("==== errCode is====>"+ JSON.stringify(err.code)); - }) - break; - case 2: - this.context.startAbility( - { - bundleName: 'com.acts.error', - abilityName: 'com.acts.error.MainAbility2' - },{ - windowMode:0 - }).then(()=>{ - console.debug("====>startAbility end====>"); - }) - console.debug("====>case 2 end====>"); - var myStub1 = new Stub("com.acts.actsinterfacemultiusersextensiontest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub1; - break; - case 3: - this.context.startAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.MainAbility2' - },{ - windowMode:0 - },(err,data) => { - console.debug("==== err is====>"+ JSON.stringify(err)); - console.debug("==== errCode is====>"+ JSON.stringify(err.code)); - console.debug("====>startAbility end====>" ); - }) - var myStub7 = new Stub("com.acts.actsinterfacemultiusersextensiontest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub7; - break; - case 4: - this.context.startAbility( - { - bundleName: 'com.acts.error', - abilityName: 'com.acts.error.MainAbility2' - },{ - windowMode:0 - },(err,data) => { - console.debug("==== err is====>"+ JSON.stringify(err)); - console.debug("==== errCode is====>"+ JSON.stringify(err.code)); - console.debug("====>startAbility end====>" ); - }) - var myStub2 = new Stub("com.acts.actsinterfacemultiusersextensiontest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub2; - break; - case 5: - this.context.startAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility2' - }).then((data)=>{ - console.debug("====>startAbility end====>"); - console.debug("====>data is====>" + JSON.stringify(data)); - }) - break; - case 6: - this.context.startAbility( - { - bundleName: 'com.acts.error', - abilityName: 'com.acts.error.ServiceAbility2' - }).then(()=>{ - console.debug("====>startAbility end====>"); - }) - var myStub3 = new Stub("com.acts.actsinterfacemultiusersextensiontest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub3; - break; - case 7: - this.context.startAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility2' - },(err,data) => { - console.debug("==== err is====>"+ JSON.stringify(err)); - console.debug("==== errCode is====>"+ JSON.stringify(err.code)); - console.debug("====>startAbility end====>" ); - }) - var myStub8 = new Stub("com.acts.actsinterfacemultiusersextensiontest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub8; - break; - case 8: - this.context.startAbility( - { - bundleName: 'com.acts.error', - abilityName: 'com.acts.error.ServiceAbility2' - },(err,data) => { - console.debug("==== err is====>"+ JSON.stringify(err)); - console.debug("==== errCode is====>"+ JSON.stringify(err.code)); - console.debug("====>startAbility end====>" ); - }) - var myStub4 = new Stub("com.acts.actsinterfacemultiusersextensiontest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub4; - break; - case 9: - this.context.startAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility2' - }).then(()=>{ - console.debug("====>startAbility end====>"); - }) - var myStub11 = new Stub("com.acts.actsinterfacemultiusersextensiontest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub11; - break; - case 10: - this.context.startAbility( - { - bundleName: 'com.acts.error', - abilityName: 'com.acts.error.ServiceAbility2' - }).then(()=>{ - console.debug("====>startAbility end====>"); - }) - var myStub5 = new Stub("com.acts.actsinterfacemultiusersextensiontest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub5; - break; - case 11: - this.context.startAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility2' - }).then(()=>{ - console.debug("====>startAbility end====>"); - }) - var myStub12 = new Stub("com.acts.actsinterfacemultiusersextensiontest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub12; - break; - case 12: - this.context.startAbility( - { - bundleName: 'com.acts.error', - abilityName: 'com.acts.error.ServiceAbility2' - },(err,data) => { - console.debug("==== err is====>"+ JSON.stringify(err)); - console.debug("==== errCode is====>"+ JSON.stringify(err.code)); - console.debug("====>startAbility end====>" ); - }) - var myStub6 = new Stub("com.acts.actsinterfacemultiusersextensiontest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub6; - break; - case 13: - this.context.startAbility( - { - bundleName: 'com.example.userservicesystemapi7', - abilityName: 'com.example.userservicesystemapi7.ServiceAbility' - }).then(() => { - console.debug("====>startAbility end====>" ); - }) - var myStub9 = new Stub("com.acts.actsinterfacemultiusersextensiontest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub9; - break; - case 14: - this.context.startAbility( - { - bundleName: 'com.example.userservicesystemapi7', - abilityName: 'com.example.userservicesystemapi7.ServiceAbility' - },(err,data) => { - console.debug("==== err is====>"+ JSON.stringify(err)); - console.debug("==== errCode is====>"+ JSON.stringify(err.code)); - console.debug("====>startAbility end====>" ); - }) - var myStub10 = new Stub("com.acts.actsinterfacemultiusersextensiontest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub10; - break; - default: - break; - } - return new rpc.RemoteObject('connect'); - - } - - onDisconnect(want) { - console.log('ServiceAbility onDisconnect'); - } - - onDestroy() { - console.log('ServiceAbility onDestroy'); - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts deleted file mode 100644 index 9d589e3d0..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2021 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 ServiceExtensionAbility from '@ohos.application.ServiceExtensionAbility' -import commonEvent from "@ohos.commonEvent" -import rpc from '@ohos.rpc'; - -export default class ServiceAbility2 extends ServiceExtensionAbility { - onCreate(want) { - console.log('ServiceAbility2 onCreate'); - } - - onDestory(){ - console.log('ServiceAbility2 onDestory'); - } - - onRequest(want,startId) { - console.log('ServiceAbility2 onRequest'); - commonEvent.publish("ACTS_InterfaceMultiUsersExtension_CommonEvent", () => { - console.log("publish Publish ACTS_InterfaceMultiUsersExtension_CommonEvent callback") - this.context.terminateSelf().then(() => { - commonEvent.publish("ACTS_TerminateSelf_CommonEvent", ()=>{ - console.log('terminateSelf promise'); - }); - }); - }) - } - - onConnect(want) { - console.log('ServiceAbility2 onConnect'); - return new rpc.RemoteObject('connect'); - } - - onDisconnect(want) { - console.log('ServiceAbility2 onDisconnect, want:' + want.abilityName); - } - - onDestroy() { - console.log('ServiceAbility2 onDestroy'); - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts deleted file mode 100644 index 9f9cabbe3..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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 TestRunner from '@ohos.application.testRunner' -import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' - -var abilityDelegator = undefined -var abilityDelegatorArguments = undefined - -function translateParamsToString(parameters) { - const keySet = new Set([ - '-s class', '-s notClass', '-s suite', '-s it', - '-s level', '-s testType', '-s size', '-s timeout', - '-s dryRun' - ]) - let targetParams = ''; - for (const key in parameters) { - if (keySet.has(key)) { - targetParams = `${targetParams} ${key} ${parameters[key]}` - } - } - return targetParams.trim() -} - -async function onAbilityCreateCallback() { - console.log("onAbilityCreateCallback"); -} - -async function addAbilityMonitorCallback(err: any) { - console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) -} - -export default class OpenHarmonyTestRunner implements TestRunner { - constructor() { - } - - onPrepare() { - console.info("OpenHarmonyTestRunner OnPrepare ") - } - - async onRun() { - console.log('OpenHarmonyTestRunner onRun run') - abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' - let lMonitor = { - abilityName: testAbilityName, - onAbilityCreate: onAbilityCreateCallback, - }; - abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) - var cmd = 'aa start -d 0 -a com.acts.actsinterfacemultiusersextensiontest.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName - cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) - var debug = abilityDelegatorArguments.parameters["-D"] - if (debug == 'true') - { - cmd += ' -D' - } - console.info('cmd : '+cmd) - abilityDelegator.executeShellCommand(cmd, - (err: any, d: any) => { - console.info('executeShellCommand : err : ' + JSON.stringify(err)); - console.info('executeShellCommand : data : ' + d.stdResult); - console.info('executeShellCommand : data : ' + d.exitCode); - }) - console.info('OpenHarmonyTestRunner onRun end') - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/test/Ability.test.ets deleted file mode 100644 index a3563c2fa..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/test/Ability.test.ets +++ /dev/null @@ -1,968 +0,0 @@ -/* - * Copyright (c) 2021 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 { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" -import commonEvent from '@ohos.commonEvent' -import osaccount from '@ohos.account.osAccount' - -var subscriberInfo_MainAbility = { - events: ["ACTS_InterfaceMultiUsersExtension_CommonEvent"] -}; -var subscriberInfo_MainAbility2 = { - events: ["ACTS_TerminateSelf_CommonEvent"] -}; -var subscriberInfo_MainAbility3 = { - events: ["ACTS_InterfaceMultiUsers_0100_Start_CommonEvent"] -}; -var osAccountManager -const START_ABILITY_TIMEOUT = 6000; -globalThis.number = 0; -console.debug("====>in Ability.test====>"); -export default function abilityTest() { - console.debug("====>in function abilityTest====>"); - describe('ActsInterfaceMultiUsersExtensionTest', function () { - console.debug("====>in ACTS_InterfaceMultiUsers====>"); - - /* - * @tc.number : ACTS_ExtensionStartAbility_0100 - * @tc.name : start new ability - * @tc.desc : Start an ability with the parameter startability with options succeeded.(promise) - */ - it('ACTS_ExtensionStartAbility_0100', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 1 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack(err, data) { - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0100 Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent") { - startresult = true - } - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo) => { - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0100start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(true); - setTimeout(() => { - done() - }, 1000) - } - - function timeout() { - console.debug('in ACTS_ExtensionStartAbility_0100 timeout'); - if (flag == true) { - expect().assertFail(); - console.debug('ACTS_ExtensionStartAbility_0100 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) - } - } - - setTimeout(timeout, START_ABILITY_TIMEOUT); - }) - - /* - * @tc.number : ACTS_ExtensionStartAbility_0200 - * @tc.name : start new ability - * @tc.desc : Start an ability with the parameter startability with options failed.(promise) - */ - it('ACTS_ExtensionStartAbility_0200', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 2 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack(err, data) { - expect().assertFail(); - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0200 Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent") { - startresult = true - } - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - setTimeout(() => { - done(); - }, 1000) - } - function onConnectCallback(element, remote) { - console.log(' onConnectCallback====> element=' + JSON.stringify(element)); - console.log(' onConnectCallback====> remote=' + JSON.stringify(remote)); - setTimeout(() => { - console.log('====>in timeout'); - console.debug("====>flag is====>" + JSON.stringify(flag)); - if (flag == true) { - console.debug('ACTS_ExtensionStartAbility_0200 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - }, 1000); - } - function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); - } - - function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo) => { - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0200start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - }) - - /* - * @tc.number : ACTS_ExtensionStartAbility_0300 - * @tc.name : start new ability - * @tc.desc : Start an ability with the parameter startability with options succeeded.(callback) - */ - it('ACTS_ExtensionStartAbility_0300', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 3 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack(err, data) { - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0300 Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent") { - startresult = true - } - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo) => { - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0300start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(true); - setTimeout(() => { - done() - }, 1000) - } - - function timeout() { - console.debug('in ACTS_ExtensionStartAbility_0300 timeout'); - if (flag == true) { - expect().assertFail(); - console.debug('ACTS_ExtensionStartAbility_0300 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) - } - } - - setTimeout(timeout, START_ABILITY_TIMEOUT); - }) - - /* - * @tc.number : ACTS_ExtensionStartAbility_0400 - * @tc.name : start new ability - * @tc.desc : Start an ability with the parameter startability with options failed.(callback) - */ - it('ACTS_ExtensionStartAbility_0400', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 4 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack(err, data) { - expect().assertFail(); - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0400 Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent") { - startresult = true - } - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - setTimeout(() => { - done(); - }, 1000) - } - function onConnectCallback(element, remote) { - console.log(' onConnectCallback====> element=' + JSON.stringify(element)); - console.log(' onConnectCallback====> remote=' + JSON.stringify(remote)); - setTimeout(() => { - console.log('====>in timeout'); - console.debug("====>flag is====>" + JSON.stringify(flag)); - if (flag == true) { - console.debug('ACTS_ExtensionStartAbility_0400 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - }, 1000); - } - function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); - } - - function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo) => { - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0400start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - }) - - /* - * @tc.number : ACTS_ExtensionStartAbility_0500 - * @tc.name : start new ability - * @tc.desc : Starting mainability2 with startability succeeded.(promise) - */ - it('ACTS_ExtensionStartAbility_0500', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 5 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack(err, data) { - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0500 Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent") { - startresult = true - } - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo) => { - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0500start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(true); - setTimeout(() => { - done() - }, 1000) - } - - function timeout() { - console.debug('in ACTS_ExtensionStartAbility_0500 timeout'); - if (flag == true) { - expect().assertFail(); - console.debug('ACTS_ExtensionStartAbility_0500 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) - } - } - - setTimeout(timeout, START_ABILITY_TIMEOUT); - }) - - /* - * @tc.number : ACTS_ExtensionStartAbility_0600 - * @tc.name : start new ability - * @tc.desc : Starting mainability2 with startability failed.(promise) - */ - it('ACTS_ExtensionStartAbility_0600', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 6 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack(err, data) { - expect().assertFail(); - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0600 Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent") { - startresult = true - } - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - setTimeout(() => { - done(); - }, 1000) - } - function onConnectCallback(element, remote) { - console.log(' onConnectCallback====> element=' + JSON.stringify(element)); - console.log(' onConnectCallback====> remote=' + JSON.stringify(remote)); - setTimeout(() => { - console.log('====>in timeout'); - console.debug("====>flag is====>" + JSON.stringify(flag)); - if (flag == true) { - console.debug('ACTS_ExtensionStartAbility_0600 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - }, 1000); - } - function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); - } - - function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo) => { - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0600start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - }) - - /* - * @tc.number : ACTS_ExtensionStartAbility_0700 - * @tc.name : start new ability - * @tc.desc : Starting mainability2 with startability succeeded.(callback) - */ - it('ACTS_ExtensionStartAbility_0700', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 7 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack(err, data) { - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0700 Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent") { - startresult = true - } - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo) => { - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0700start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(true); - setTimeout(() => { - done() - }, 1000) - } - - function timeout() { - console.debug('in ACTS_ExtensionStartAbility_0700 timeout'); - if (flag == true) { - expect().assertFail(); - console.debug('ACTS_ExtensionStartAbility_0700 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) - } - } - - setTimeout(timeout, START_ABILITY_TIMEOUT); - - }) - - /* - * @tc.number : ACTS_ExtensionStartAbility_0800 - * @tc.name : start new ability - * @tc.desc : Starting mainability2 with startability failed.(callback) - */ - it('ACTS_ExtensionStartAbility_0800', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 8 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack(err, data) { - expect().assertFail(); - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0800 Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent") { - startresult = true - } - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - setTimeout(() => { - done(); - }, 1000) - } - function onConnectCallback(element, remote) { - console.log(' onConnectCallback====> element=' + JSON.stringify(element)); - console.log(' onConnectCallback====> remote=' + JSON.stringify(remote)); - setTimeout(() => { - console.log('====>in timeout'); - console.debug("====>flag is====>" + JSON.stringify(flag)); - if (flag == true) { - console.debug('ACTS_ExtensionStartAbility_0800 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - }, 1000); - } - function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); - } - - function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo) => { - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0800start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - }) - - /* - * @tc.number : ACTS_ExtensionStartAbility_0900 - * @tc.name : start new ability - * @tc.desc : Starting mainability2 with startability succeeded.(callback) - */ - it('ACTS_ExtensionStartAbility_0900', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 13 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack(err, data) { - expect(data.event == "ACTS_InterfaceMultiUsers_0100_Start_CommonEvent").assertTrue(); - console.debug("====>0900 Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_InterfaceMultiUsers_0100_Start_CommonEvent") { - startresult = true - } - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - commonEvent.createSubscriber(subscriberInfo_MainAbility3).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo) => { - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0900start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(true); - setTimeout(() => { - done() - }, 1000) - } - - function timeout() { - console.debug('in ACTS_ExtensionStartAbility_0900 timeout'); - if (flag == true) { - expect().assertFail(); - console.debug('ACTS_ExtensionStartAbility_0900 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) - } - } - - setTimeout(timeout, START_ABILITY_TIMEOUT); - - }) - - /* - * @tc.number : ACTS_ExtensionStartAbility_1000 - * @tc.name : start new ability - * @tc.desc : Starting mainability2 with startability succeeded.(callback) - */ - it('ACTS_ExtensionStartAbility_1000', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 14 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack(err, data) { - expect(data.event == "ACTS_InterfaceMultiUsers_0100_Start_CommonEvent").assertTrue(); - console.debug("====>1000 Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_InterfaceMultiUsers_0100_Start_CommonEvent") { - startresult = true - } - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - commonEvent.createSubscriber(subscriberInfo_MainAbility3).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo) => { - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>1000start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(true); - setTimeout(() => { - done() - }, 1000) - } - - function timeout() { - console.debug('in ACTS_ExtensionStartAbility_1000 timeout'); - if (flag == true) { - expect().assertFail(); - console.debug('ACTS_ExtensionStartAbility_1000 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) - } - } - - setTimeout(timeout, START_ABILITY_TIMEOUT); - - }) - - /* - * @tc.number : ACTS_ExtensionTerminateSelf_0100 - * @tc.name : Use terminateself to terminate ability - * @tc.desc : Starting mainability2 with startAbility then terminateself ability succeeded.(promise) - */ - it('ACTS_ExtensionTerminateSelf_0100', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 9 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack(err, data) { - expect(data.event == "ACTS_TerminateSelf_CommonEvent").assertTrue(); - console.debug("====>0100 Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_TerminateSelf_CommonEvent") { - startresult = true - } - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - function onConnectCallback(element, remote) { - console.log('onConnectCallback====> element=' + JSON.stringify(element)); - } - function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); - } - function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) - } - commonEvent.createSubscriber(subscriberInfo_MainAbility2).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo) => { - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0100start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(true); - setTimeout(() => { - done() - }, 1000) - } - - function timeout() { - console.debug('in ACTS_ExtensionTerminateSelf_0100 timeout'); - if (flag == true) { - expect().assertFail(); - console.debug('ACTS_ExtensionTerminateSelf_0100 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) - } - } - - setTimeout(timeout, START_ABILITY_TIMEOUT); - }) - - /* - * @tc.number : - * @tc.name : Use terminateself to terminate ability - * @tc.desc : Starting mainability2 with startAbility then terminateself ability failed.(promise) - */ - it('ACTS_ExtensionTerminateSelf_0200', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 10 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack(err, data) { - expect().assertFail(); - expect(data.event == "ACTS_TerminateSelf_CommonEvent").assertTrue(); - console.debug("====>0200 Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_TerminateSelf_CommonEvent") { - startresult = true - } - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - setTimeout(() => { - done(); - }, 1000) - } - function onConnectCallback(element, remote) { - console.log(' onConnectCallback====> element=' + JSON.stringify(element)); - console.log(' onConnectCallback====> remote=' + JSON.stringify(remote)); - setTimeout(() => { - console.log('====>in timeout'); - console.debug("====>flag is====>" + JSON.stringify(flag)); - if (flag == true) { - console.debug(' - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - }, 1000); - } - function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); - } - - function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) - } - commonEvent.createSubscriber(subscriberInfo_MainAbility2).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo) => { - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0200start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - }) - - /* - * @tc.number : ACTS_ExtensionTerminateSelf_0300 - * @tc.name : Use terminateself to terminate ability - * @tc.desc : Starting mainability2 with startAbility then terminateself ability succeeded.(callback) - */ - it('ACTS_ExtensionTerminateSelf_0300', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 11 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack(err, data) { - expect(data.event == "ACTS_TerminateSelf_CommonEvent").assertTrue(); - console.debug("====>0300 Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_TerminateSelf_CommonEvent") { - startresult = true - } - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - commonEvent.createSubscriber(subscriberInfo_MainAbility2).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo) => { - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0300start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(true); - setTimeout(() => { - done() - }, 1000) - } - - function timeout() { - console.debug('in ACTS_ExtensionTerminateSelf_0300 timeout'); - if (flag == true) { - expect().assertFail(); - console.debug('ACTS_ExtensionTerminateSelf_0300 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) - } - } - - setTimeout(timeout, START_ABILITY_TIMEOUT); - - }) - - /* - * @tc.number : ACTS_ExtensionTerminateSelf_0400 - * @tc.name : Use terminateself to terminate ability - * @tc.desc : Starting mainability2 with startAbility then terminateself ability failed.(callback) - */ - it('ACTS_ExtensionTerminateSelf_0400', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 12 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack(err, data) { - expect().assertFail(); - expect(data.event == "ACTS_TerminateSelf_CommonEvent").assertTrue(); - console.debug("====>0400 Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_TerminateSelf_CommonEvent") { - startresult = true - } - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data) => { - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - setTimeout(() => { - done(); - }, 1000) - } - function onConnectCallback(element, remote) { - console.log('ACTS_ExtensionTerminateSelf_0400 onConnectCallback====> element=' + JSON.stringify(element)); - console.log('ACTS_ExtensionTerminateSelf_0400 onConnectCallback====> remote=' + JSON.stringify(remote)); - setTimeout(() => { - console.log('====>in timeout'); - console.debug("====>flag is====>" + JSON.stringify(flag)); - if (flag == true) { - console.debug('ACTS_ExtensionTerminateSelf_0400 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - }, 1000); - } - function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); - } - - function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) - } - commonEvent.createSubscriber(subscriberInfo_MainAbility2).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo) => { - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0400start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensiontest', - abilityName: 'com.acts.actsinterfacemultiusersextensiontest.ServiceAbility' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - }) - }) -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/test/List.test.ets b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/test/List.test.ets deleted file mode 100644 index 87a37045f..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/test/List.test.ets +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2021 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 abilityTest from './Ability.test.ets' - -export default function testsuite() { - console.debug("====>in list.test====>"); - abilityTest() -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/module.json b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/module.json deleted file mode 100644 index c72433e35..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/module.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.acts.actsinterfacemultiusersextensiontest.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ] - }, - { - "name": "com.acts.actsinterfacemultiusersextensiontest.MainAbility2", - "srcEntrance": "./ets/MainAbility2/MainAbility2.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait" - } - ], - "extensionAbilities": [ - { - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "name": "com.acts.actsinterfacemultiusersextensiontest.ServiceAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - }, - { - "srcEntrance": "./ets/ServiceAbility2/ServiceAbility2.ts", - "name": "com.acts.actsinterfacemultiusersextensiontest.ServiceAbility2", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - } - ], - "defPermissions": [ - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.MANAGE_LOCAL_ACCOUNTS" - }, - { - "availableScope": [], - "grantMode": "system_grant", - "name": "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION" - } - ], - "requestPermissions": [ - { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name": "ohos.permission.GET_BUNDLE_INFO", - "reason": "need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason": "need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name": "ohos.permission.REMOVE_CACHE_FILES", - "reason": "need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name": "ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason": "need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name": "ohos.permission.INSTALL_BUNDLE", - "reason": "need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name": "ohos.permission.GET_RUNNING_INFO", - "reason": "need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name": "ohos.permission.MANAGE_LOCAL_ACCOUNTS", - "reason": "need use ohos.permission.MANAGE_LOCAL_ACCOUNTS" - }, - { - "name": "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION", - "reason": "need use ohos.permission.MANAGE_LOCAL_ACCOUNTS" - }, - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", - "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" - }, - { - "name":"ohos.permission.START_INVISIBLE_ABILITY", - "reason":"need use ohos.permission.START_INVISIBLE_ABILITY" - } - ] - } -} diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/resources/base/element/string.json deleted file mode 100644 index d75325f3c..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/resources/base/element/string.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "string": [ - { - "name": "phone_entry_dsc", - "value": "i am an entry for phone" - }, - { - "name": "phone_entry_main", - "value": "the phone entry ability" - }, - { - "name": "entry_label", - "value": "ActsContextTest" - }, - { - "name": "form_description", - "value": "my form" - }, - { - "name": "serviceability_description", - "value": "my whether" - }, - { - "name": "description_application", - "value": "demo for test" - }, - { - "name": "app_name", - "value": "Demo" - } - ] -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6790 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 { - router.back() - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/MainAbility2/MainAbility2.ts deleted file mode 100644 index e190aecbe..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/MainAbility2/MainAbility2.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 Ability from '@ohos.app.ability.UIAbility' -import commonEvent from "@ohos.commonEvent" - -export default class MainAbility2 extends Ability { - - onCreate(want, launchParam) { - console.log("MainAbility2 onCreate"); - globalThis.abilityContext2 = this.context - } - - onDestroy() { - console.log("MainAbility2 onDestroy"); - } - - onWindowStageCreate(windowStage) { - console.log("MainAbility2 onWindowStageCreate"); - windowStage.setUIContent(this.context, "MainAbility/pages/index/second", null); - commonEvent.publish("ACTS_InterfaceMultiUsersExtension_CommonEvent", () => { - console.log("publish Publish ACTS_InterfaceMultiUsersExtension_CommonEvent callback") - globalThis.abilityContext2.terminateSelf().then(() => { - commonEvent.publish("ACTS_TerminateSelf_CommonEvent", ()=>{ - console.log('terminateSelf promise'); - }); - }); - }) - } - - onWindowStageDestroy() { - console.log("MainAbility2 onWindowStageDestroy"); - } - - onForeground() { - console.log("MainAbility2 onForeground"); - } - - onBackground() { - console.log("MainAbility2 onBackground"); - } -}; diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts deleted file mode 100644 index f363a918d..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts +++ /dev/null @@ -1,206 +0,0 @@ -/* - * 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 ServiceExtensionAbility from '@ohos.application.ServiceExtensionAbility' -import Want from '@ohos.application.Want'; -import rpc from '@ohos.rpc'; -class Stub extends rpc.RemoteObject { - constructor(des) { - super(des); - } - onRemoteRequest(code, data, reply, option) { - reply.writeNoException(); - reply.writeString("success"); - return true; - } -} -export default class ServiceAbility extends ServiceExtensionAbility { - onCreate(want:Want) { - console.log('ServiceAbility onCreate'); - } - onDestory(){ - console.log('ServiceAbility onDestory'); - } - onRequest(want,startId) { - console.log('ServiceAbility onRequest'); - } - - onConnect(want) { - console.log('ServiceAbility onConnect'); - console.log('globalThis.startnum is' + globalThis.startnum); - switch (globalThis.startnum) { - case 1: - this.context.startAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.MainAbility2' - },{ - windowMode:0 - } - ).then((data) => { - console.debug("====>startAbility end====>"); - console.debug("====>data is====>" + JSON.stringify(data)); - }) - break; - case 2: - this.context.startAbility( - { - bundleName: 'com.acts.error', - abilityName: 'com.acts.error.MainAbility2' - },{ - windowMode:0 - }).then(()=>{ - console.debug("====>startAbility end====>"); - }) - console.debug("====>case 2 end====>"); - var myStub1 = new Stub("com.acts.actsinterfacemultiusersextensionthirdtest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub1; - break; - case 3: - this.context.startAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.MainAbility2' - },{ - windowMode:0 - },(err,data) => { - console.debug("====>err is====>" + JSON.stringify(err)); - console.debug("====>startAbility end====>" ); - }) - var myStub7 = new Stub("com.acts.actsinterfacemultiusersextensionthirdtest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub7; - break; - case 4: - this.context.startAbility( - { - bundleName: 'com.acts.error', - abilityName: 'com.acts.error.MainAbility2' - },{ - windowMode:0 - },(err,data) => { - console.debug("====>err is====>" + JSON.stringify(err)); - console.debug("====>startAbility end====>" ); - }) - var myStub2 = new Stub("com.acts.actsinterfacemultiusersextensionthirdtest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub2; - break; - case 5: - this.context.startAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility2' - }).then((data)=>{ - console.debug("====>startAbility end====>"); - console.debug("====>data is====>" + JSON.stringify(data)); - }) - break; - case 6: - this.context.startAbility( - { - bundleName: 'com.acts.error', - abilityName: 'com.acts.error.ServiceAbility2' - }).then(()=>{ - console.debug("====>startAbility end====>"); - }) - var myStub3 = new Stub("com.acts.actsinterfacemultiusersextensionthirdtest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub3; - break; - case 7: - this.context.startAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility2' - },(err,data) => { - console.debug("====>err is====>" + JSON.stringify(err)); - console.debug("====>startAbility end====>" ); - }) - var myStub8 = new Stub("com.acts.actsinterfacemultiusersextensionthirdtest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub8; - break; - case 8: - this.context.startAbility( - { - bundleName: 'com.acts.error', - abilityName: 'com.acts.error.ServiceAbility2' - },(err,data) => { - console.debug("====>err is====>" + JSON.stringify(err)); - console.debug("====>startAbility end====>" ); - }) - var myStub4 = new Stub("com.acts.actsinterfacemultiusersextensionthirdtest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub4; - break; - case 9: - this.context.startAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility2' - }).then(()=>{ - console.debug("====>startAbility end====>"); - }) - break; - case 10: - this.context.startAbility( - { - bundleName: 'com.acts.error', - abilityName: 'com.acts.error.ServiceAbility2' - }).then(()=>{ - console.debug("====>startAbility end====>"); - }) - var myStub5 = new Stub("com.acts.actsinterfacemultiusersextensionthirdtest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub5; - break; - case 11: - this.context.startAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility2' - }).then(()=>{ - console.debug("====>startAbility end====>"); - }) - break; - case 12: - this.context.startAbility( - { - bundleName: 'com.acts.error', - abilityName: 'com.acts.error.ServiceAbility2' - },(err,data) => { - console.debug("====>err is====>" + JSON.stringify(err)); - console.debug("====>startAbility end====>" ); - }) - var myStub6 = new Stub("com.acts.actsinterfacemultiusersextensionthirdtest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub6; - break; - default: - break; - } - return new rpc.RemoteObject('connect'); - } - - onDisconnect(want) { - console.log('ServiceAbility onDisconnect'); - } - - onDestroy() { - console.log('ServiceAbility onDestroy'); - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts deleted file mode 100644 index d871d5edf..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 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 ServiceExtensionAbility from '@ohos.application.ServiceExtensionAbility' -import commonEvent from "@ohos.commonEvent" -import Want from '@ohos.application.Want'; -import rpc from "@ohos.rpc"; - -export default class ServiceAbility2 extends ServiceExtensionAbility { - onCreate(want:Want) { - console.log('ServiceAbility2 onCreate'); - } - - onDestory(){ - console.log('ServiceAbility2 onDestory'); - } - - onRequest(want,startId) { - console.log('ServiceAbility2 onRequest'); - commonEvent.publish("ACTS_InterfaceMultiUsersExtension_CommonEvent", () => { - console.log("publish Publish ACTS_InterfaceMultiUsersExtension_CommonEvent callback") - this.context.terminateSelf().then(() => { - commonEvent.publish("ACTS_TerminateSelf_CommonEvent", ()=>{ - console.log('terminateSelf promise'); - }); - }); - }) - } - - onConnect(want) { - console.log('ServiceAbility2 onConnect'); - return new rpc.RemoteObject('connect'); - } - - onDisconnect(want) { - console.log('ServiceAbility2 onDisconnect, want:' + want.abilityName); - } - - onDestroy() { - console.log('ServiceAbility2 onDestroy'); - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestAbility/TestAbility.ts deleted file mode 100644 index 4f101c99c..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestAbility/TestAbility.ts +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 Ability from '@ohos.app.ability.UIAbility' - -export default class TestAbility extends Ability { - onCreate(want, launchParam) { - console.log('TestAbility onCreate') - } - - onDestroy() { - console.log('TestAbility onDestroy') - } - - onWindowStageCreate(windowStage) { - console.log('TestAbility onWindowStageCreate') - windowStage.loadContent("TestAbility/pages/index", (err, data) => { - if (err.code) { - console.error('Failed to load the content. Cause:' + JSON.stringify(err)); - return; - } - console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) - }); - - globalThis.abilityContext = this.context; - } - - onWindowStageDestroy() { - console.log('TestAbility onWindowStageDestroy') - } - - onForeground() { - console.log('TestAbility onForeground') - } - - onBackground() { - console.log('TestAbility onBackground') - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestAbility/pages/index.ets b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestAbility/pages/index.ets deleted file mode 100644 index fae969f98..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestAbility/pages/index.ets +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2021 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 router from '@ohos.router'; - -@Entry -@Component -struct Index { - aboutToAppear() { - console.info('TestAbility index aboutToAppear') - } - @State message: string = 'Hello World' - build() { - Row() { - Column() { - Text(this.message) - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('next page') - .fontSize(20) - .fontWeight(FontWeight.Bold) - }.type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .width('35%') - .height('5%') - .onClick(()=>{ - }) - } - .width('100%') - } - .height('100%') - } - } \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts deleted file mode 100644 index 8b106a82e..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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 TestRunner from '@ohos.application.testRunner' -import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' - -var abilityDelegator = undefined -var abilityDelegatorArguments = undefined - -function translateParamsToString(parameters) { - const keySet = new Set([ - '-s class', '-s notClass', '-s suite', '-s it', - '-s level', '-s testType', '-s size', '-s timeout', - '-s dryRun' - ]) - let targetParams = ''; - for (const key in parameters) { - if (keySet.has(key)) { - targetParams = `${targetParams} ${key} ${parameters[key]}` - } - } - return targetParams.trim() -} - -async function onAbilityCreateCallback() { - console.log("onAbilityCreateCallback"); -} - -async function addAbilityMonitorCallback(err: any) { - console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) -} - -export default class OpenHarmonyTestRunner implements TestRunner { - constructor() { - } - - onPrepare() { - console.info("OpenHarmonyTestRunner OnPrepare ") - } - - async onRun() { - console.log('OpenHarmonyTestRunner onRun run') - abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' - let lMonitor = { - abilityName: testAbilityName, - onAbilityCreate: onAbilityCreateCallback, - }; - abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) - var cmd = 'aa start -d 0 -a com.acts.actsinterfacemultiusersextensionthirdtest.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName - cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) - var debug = abilityDelegatorArguments.parameters["-D"] - if (debug == 'true') - { - cmd += ' -D' - } - console.info('cmd : '+cmd) - abilityDelegator.executeShellCommand(cmd, - (err: any, d: any) => { - console.info('executeShellCommand : err : ' + JSON.stringify(err)); - console.info('executeShellCommand : data : ' + d.stdResult); - console.info('executeShellCommand : data : ' + d.exitCode); - }) - console.info('OpenHarmonyTestRunner onRun end') - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/test/Ability.test.ets deleted file mode 100644 index 8d2b2242e..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/test/Ability.test.ets +++ /dev/null @@ -1,828 +0,0 @@ -/* - * 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 {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "@ohos/hypium" -import commonEvent from '@ohos.commonEvent' -import osaccount from '@ohos.account.osAccount' - -var subscriberInfo_MainAbility = { - events: ["ACTS_InterfaceMultiUsersExtension_CommonEvent"] -}; -var subscriberInfo_MainAbility2 = { - events: ["ACTS_TerminateSelf_CommonEvent"] -}; -var osAccountManager -const START_ABILITY_TIMEOUT = 6000; -globalThis.number = 0; -console.debug("====>in Ability.test====>"); -export default function abilityTest() { - console.debug("====>in function abilityTest====>"); - describe('ActsInterfaceMultiUsersExtensionThirdTest', function () { - console.debug("====>in ACTS_InterfaceMultiUsers====>"); - - /* - * @tc.number : ACTS_ThirdPartyExtensionStartAbility_0100 - * @tc.name : start new ability - * @tc.desc : Start an ability with the parameter startability with options succeeded.(promise) - */ - it('ACTS_ThirdPartyExtensionStartAbility_0100', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 1 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack (err, data) { - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0100 Subscribe CallBack data:====>" + JSON.stringify(data)); - if(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent"){ - startresult = true - } - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo)=>{ - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0100start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(true); - setTimeout(()=>{ - done() - },1000) - } - - function timeout() { - console.debug('in ACTS_ThirdPartyExtensionStartAbility_0100 timeout'); - if(flag == true) { - expect().assertFail(); - console.debug('ACTS_ThirdPartyExtensionStartAbility_0100 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) - } - } - - setTimeout(timeout, START_ABILITY_TIMEOUT); - }) - - /* - * @tc.number : ACTS_ThirdPartyExtensionStartAbility_0200 - * @tc.name : start new ability - * @tc.desc : Start an ability with the parameter startability with options failed.(promise) - */ - it('ACTS_ThirdPartyExtensionStartAbility_0200', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 2 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack (err, data) { - expect().assertFail(); - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0200 Subscribe CallBack data:====>" + JSON.stringify(data)); - if(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent"){ - startresult = true - } - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - setTimeout(()=>{ - done(); - },1000) - } - function onConnectCallback(element, remote) { - console.log(' onConnectCallback====> element=' + JSON.stringify(element)); - console.log(' onConnectCallback====> remote=' + JSON.stringify(remote)); - setTimeout(()=> { - console.log('====>in timeout'); - console.debug("====>flag is====>" + JSON.stringify(flag)); - if(flag == true) { - console.debug('ACTS_ThirdPartyExtensionStartAbility_0200 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - }, 1000); - } - function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); - } - - function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo)=>{ - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0200start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' - },{ - onConnect:onConnectCallback, - onDisconnect:onDisconnectCallback, - onFailed: onFailedCallback - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - }) - - /* - * @tc.number : ACTS_ThirdPartyExtensionStartAbility_0300 - * @tc.name : start new ability - * @tc.desc : Start an ability with the parameter startability with options succeeded.(callback) - */ - it('ACTS_ThirdPartyExtensionStartAbility_0300', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum=3 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack (err, data) { - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0300 Subscribe CallBack data:====>" + JSON.stringify(data)); - if(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent"){ - startresult = true - } - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo)=>{ - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0300start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(true); - setTimeout(()=>{ - done() - },1000) - } - - function timeout() { - console.debug('in ACTS_ThirdPartyExtensionStartAbility_0300 timeout'); - if(flag == true) { - expect().assertFail(); - console.debug('ACTS_ThirdPartyExtensionStartAbility_0300 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) - } - } - - setTimeout(timeout, START_ABILITY_TIMEOUT); - }) - - /* - * @tc.number : ACTS_ThirdPartyExtensionStartAbility_0400 - * @tc.name : start new ability - * @tc.desc : Start an ability with the parameter startability with options failed.(callback) - */ - it('ACTS_ThirdPartyExtensionStartAbility_0400', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 4 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack (err, data) { - expect().assertFail(); - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0400 Subscribe CallBack data:====>" + JSON.stringify(data)); - if(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent"){ - startresult = true - } - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - setTimeout(()=>{ - done(); - },1000) - } - function onConnectCallback(element, remote) { - console.log(' onConnectCallback====> element=' + JSON.stringify(element)); - console.log(' onConnectCallback====> remote=' + JSON.stringify(remote)); - setTimeout(()=> { - console.log('====>in timeout'); - console.debug("====>flag is====>" + JSON.stringify(flag)); - if(flag == true) { - console.debug('ACTS_ThirdPartyExtensionStartAbility_0400 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - }, 1000); - } - function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); - } - - function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo)=>{ - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0400start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' - },{ - onConnect:onConnectCallback, - onDisconnect:onDisconnectCallback, - onFailed: onFailedCallback - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - }) - - /* - * @tc.number : ACTS_ThirdPartyExtensionStartAbility_0500 - * @tc.name : start new ability - * @tc.desc : Starting mainability2 with startability succeeded.(promise) - */ - it('ACTS_ThirdPartyExtensionStartAbility_0500', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 5 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack (err, data) { - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0500 Subscribe CallBack data:====>" + JSON.stringify(data)); - if(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent"){ - startresult = true - } - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo)=>{ - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0500start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(true); - setTimeout(()=>{ - done() - },1000) - } - - function timeout() { - console.debug('in ACTS_ThirdPartyExtensionStartAbility_0500 timeout'); - if(flag == true) { - expect().assertFail(); - console.debug('ACTS_ThirdPartyExtensionStartAbility_0500 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) - } - } - - setTimeout(timeout, START_ABILITY_TIMEOUT); - }) - - /* - * @tc.number : ACTS_ThirdPartyExtensionStartAbility_0600 - * @tc.name : start new ability - * @tc.desc : Starting mainability2 with startability failed.(promise) - */ - it('ACTS_ThirdPartyExtensionStartAbility_0600', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 6 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack (err, data) { - expect().assertFail(); - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0600 Subscribe CallBack data:====>" + JSON.stringify(data)); - if(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent"){ - startresult = true - } - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - setTimeout(()=>{ - done(); - },1000) - } - function onConnectCallback(element, remote) { - console.log(' onConnectCallback====> element=' + JSON.stringify(element)); - console.log(' onConnectCallback====> remote=' + JSON.stringify(remote)); - setTimeout(()=> { - console.log('====>in timeout'); - console.debug("====>flag is====>" + JSON.stringify(flag)); - if(flag == true) { - console.debug('ACTS_ThirdPartyExtensionStartAbility_0600 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - }, 1000); - } - function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); - } - - function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo)=>{ - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0600start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' - },{ - onConnect:onConnectCallback, - onDisconnect:onDisconnectCallback, - onFailed: onFailedCallback - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - }) - - /* - * @tc.number : ACTS_ThirdPartyExtensionStartAbility_0700 - * @tc.name : start new ability - * @tc.desc : Starting mainability2 with startability succeeded.(callback) - */ - it('ACTS_ThirdPartyExtensionStartAbility_0700', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum=7 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack (err, data) { - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0700 Subscribe CallBack data:====>" + JSON.stringify(data)); - if(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent"){ - startresult = true - } - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo)=>{ - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0700start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(true); - setTimeout(()=>{ - done() - },1000) - } - - function timeout() { - console.debug('in ACTS_ThirdPartyExtensionStartAbility_0700 timeout'); - if(flag == true) { - expect().assertFail(); - console.debug('ACTS_ThirdPartyExtensionStartAbility_0700 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) - } - } - - setTimeout(timeout, START_ABILITY_TIMEOUT); - - }) - - /* - * @tc.number : ACTS_ThirdPartyExtensionStartAbility_0800 - * @tc.name : start new ability - * @tc.desc : Starting mainability2 with startability failed.(callback) - */ - it('ACTS_ThirdPartyExtensionStartAbility_0800', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 8 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack (err, data) { - expect().assertFail(); - expect(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent").assertTrue(); - console.debug("====>0800 Subscribe CallBack data:====>" + JSON.stringify(data)); - if(data.event == "ACTS_InterfaceMultiUsersExtension_CommonEvent"){ - startresult = true - } - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - setTimeout(()=>{ - done(); - },1000) - } - function onConnectCallback(element, remote) { - console.log(' onConnectCallback====> element=' + JSON.stringify(element)); - console.log(' onConnectCallback====> remote=' + JSON.stringify(remote)); - setTimeout(()=> { - console.log('====>in timeout'); - console.debug("====>flag is====>" + JSON.stringify(flag)); - if(flag == true) { - console.debug('ACTS_ThirdPartyExtensionStartAbility_0800 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - }, 1000); - } - function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); - } - - function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) - } - commonEvent.createSubscriber(subscriberInfo_MainAbility).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo)=>{ - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0800start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' - },{ - onConnect:onConnectCallback, - onDisconnect:onDisconnectCallback, - onFailed: onFailedCallback - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - }) - /* - * @tc.number : ACTS_ThirdPartyExtensionTerminateSelf_0100 - * @tc.name : Use terminateself to terminate ability - * @tc.desc : Starting mainability2 with startAbility then terminateself ability succeeded.(promise) - */ - it('ACTS_ThirdPartyExtensionTerminateSelf_0100', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 9 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack (err, data) { - expect(data.event == "ACTS_TerminateSelf_CommonEvent").assertTrue(); - console.debug("====>0100 Subscribe CallBack data:====>" + JSON.stringify(data)); - if(data.event == "ACTS_TerminateSelf_CommonEvent"){ - startresult = true - } - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - commonEvent.createSubscriber(subscriberInfo_MainAbility2).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo)=>{ - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0100start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(true); - setTimeout(()=>{ - done() - },1000) - } - - function timeout() { - console.debug('in ACTS_ThirdPartyExtensionTerminateSelf_0100 timeout'); - if(flag == true) { - expect().assertFail(); - console.debug('ACTS_ThirdPartyExtensionTerminateSelf_0100 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) - } - } - - setTimeout(timeout, START_ABILITY_TIMEOUT); - }) - /* - * @tc.number : ACTS_ThirdPartyExtensionTerminateSelf_0200 - * @tc.name : Use terminateself to terminate ability - * @tc.desc : Starting mainability2 with startAbility then terminateself ability failed.(promise) - */ - it('ACTS_ThirdPartyExtensionTerminateSelf_0200', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 10 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack (err, data) { - expect().assertFail(); - expect(data.event == "ACTS_TerminateSelf_CommonEvent").assertTrue(); - console.debug("====>0200 Subscribe CallBack data:====>" + JSON.stringify(data)); - if(data.event == "ACTS_TerminateSelf_CommonEvent"){ - startresult = true - } - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - setTimeout(()=>{ - done(); - },1000) - } - function onConnectCallback(element, remote) { - console.log(' onConnectCallback====> element=' + JSON.stringify(element)); - console.log(' onConnectCallback====> remote=' + JSON.stringify(remote)); - setTimeout(()=> { - console.log('====>in timeout'); - console.debug("====>flag is====>" + JSON.stringify(flag)); - if(flag == true) { - console.debug(' - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - }, 1000); - } - function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); - } - - function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) - } - commonEvent.createSubscriber(subscriberInfo_MainAbility2).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo)=>{ - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0200start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' - },{ - onConnect:onConnectCallback, - onDisconnect:onDisconnectCallback, - onFailed: onFailedCallback - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - }) - /* - * @tc.number : ACTS_ThirdPartyExtensionTerminateSelf_0300 - * @tc.name : Use terminateself to terminate ability - * @tc.desc : Starting mainability2 with startAbility then terminateself ability succeeded.(callback) - */ - it('ACTS_ThirdPartyExtensionTerminateSelf_0300', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 11 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack (err, data) { - expect(data.event == "ACTS_TerminateSelf_CommonEvent").assertTrue(); - console.debug("====>0300 Subscribe CallBack data:====>" + JSON.stringify(data)); - if(data.event == "ACTS_TerminateSelf_CommonEvent"){ - startresult = true - } - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - commonEvent.createSubscriber(subscriberInfo_MainAbility2).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo)=>{ - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0300start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(true); - setTimeout(()=>{ - done() - },1000) - } - - function timeout() { - console.debug('in ACTS_ThirdPartyExtensionTerminateSelf_0300 timeout'); - if(flag == true) { - expect().assertFail(); - console.debug('ACTS_ThirdPartyExtensionTerminateSelf_0300 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback) - } - } - - setTimeout(timeout, START_ABILITY_TIMEOUT); - - }) - /* - * @tc.number : ACTS_ThirdPartyExtensionTerminateSelf_0400 - * @tc.name : Use terminateself to terminate ability - * @tc.desc : Starting mainability2 with startAbility then terminateself ability failed.(callback) - */ - it('ACTS_ThirdPartyExtensionTerminateSelf_0400', 0, async function (done) { - let Subscriber - var flag = true - var startresult = false - globalThis.startnum = 12 - console.log('====>globalThis.startnum is====>' + globalThis.startnum); - function SubscribeCallBack (err, data) { - expect().assertFail(); - expect(data.event == "ACTS_TerminateSelf_CommonEvent").assertTrue(); - console.debug("====>0400 Subscribe CallBack data:====>" + JSON.stringify(data)); - if(data.event == "ACTS_TerminateSelf_CommonEvent"){ - startresult = true - } - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - function UnSubscribeCallback() { - console.debug("====>UnSubscribeCallback====>"); - flag = false - expect(startresult).assertEqual(false); - globalThis.abilityContext.disconnectServiceExtensionAbility(globalThis.number).then((data)=>{ - console.debug("====>data is====>" + JSON.stringify(data)); - }) - console.log('====>disconnectAbility finish'); - setTimeout(()=>{ - done(); - },1000) - } - function onConnectCallback(element, remote) { - console.log('ACTS_ThirdPartyExtensionTerminateSelf_0400 onConnectCallback====> element=' - + JSON.stringify(element)); - console.log('ACTS_ThirdPartyExtensionTerminateSelf_0400 onConnectCallback====> remote=' - + JSON.stringify(remote)); - setTimeout(()=> { - console.log('====>in timeout'); - console.debug("====>flag is====>" + JSON.stringify(flag)); - if(flag == true) { - console.debug('ACTS_ThirdPartyExtensionTerminateSelf_0400 - timeout'); - commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - } - }, 1000); - } - function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); - } - - function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) - } - commonEvent.createSubscriber(subscriberInfo_MainAbility2).then(async (data) => { - console.debug("====>Create Subscriber====>"); - data.getSubscribeInfo().then(async (SubscribeInfo)=>{ - console.debug("====>SubscribeInfo is====>" + JSON.stringify(SubscribeInfo)); - Subscriber = data; - commonEvent.subscribe(Subscriber, SubscribeCallBack); - console.debug("====>0400start connectAbility====>"); - globalThis.number = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: 'com.acts.actsinterfacemultiusersextensionthirdtest', - abilityName: 'com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility' - },{ - onConnect:onConnectCallback, - onDisconnect:onDisconnectCallback, - onFailed: onFailedCallback - }) - console.debug("====>number is====>" + JSON.stringify(globalThis.number)); - }) - }) - }) - }) -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/test/List.test.ets b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/test/List.test.ets deleted file mode 100644 index 3a84309ab..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/ets/test/List.test.ets +++ /dev/null @@ -1,20 +0,0 @@ -/* - * 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 abilityTest from './Ability.test.ets' - -export default function testsuite() { - console.debug("====>in list.test====>"); - abilityTest() -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/module.json b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/module.json deleted file mode 100644 index 90713d43e..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/module.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.acts.actsinterfacemultiusersextensionthirdtest.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ] - }, - { - "name": "com.acts.actsinterfacemultiusersextensionthirdtest.MainAbility2", - "srcEntrance": "./ets/MainAbility2/MainAbility2.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait" - } - ], - "extensionAbilities": [ - { - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "name": "com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - }, - { - "srcEntrance": "./ets/ServiceAbility2/ServiceAbility2.ts", - "name": "com.acts.actsinterfacemultiusersextensionthirdtest.ServiceAbility2", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - } - ], - "requestPermissions": [ - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", - "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" - }, - { - "name":"ohos.permission.START_INVISIBLE_ABILITY", - "reason":"need use ohos.permission.START_INVISIBLE_ABILITY" - } - ] - } -} diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/resources/base/element/string.json deleted file mode 100644 index f03b06594..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/resources/base/element/string.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "string": [ - { - "name": "phone_entry_dsc", - "value": "i am an entry for phone" - }, - { - "name": "phone_entry_main", - "value": "the phone entry ability" - }, - { - "name": "entry_label", - "value": "ActsContextTest" - }, - { - "name": "form_description", - "value": "my form" - }, - { - "name": "serviceability_description", - "value": "my whether" - }, - { - "name": "description_application", - "value": "demo for test" - }, - { - "name": "app_name", - "value": "Demo" - } - ] -} diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionThirdTest/entry/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6790 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 diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/module.json b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/module.json index 548836f3a..4c0f769d9 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/module.json +++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/entry/src/main/module.json @@ -6,8 +6,8 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "tablet" + "default", + "tablet" ], "deliveryWithInstall": true, "installationFree": false, diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/signature/openharmony_sx.p7b b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/signature/openharmony_sx.p7b index f06e218defa7f707e22a3890903c574e1c498217..c6cd54a6a35b45cb5fb1e0edb1522bab4d228dcd 100644 GIT binary patch delta 553 zcmaDPwMQnypo!0djZ>@5qwPB{BRkWACO%D|kSY@+qam*WHydX{n+IbmGYb==K@;mO zghIvzO{}L`nplrlE0v`d6=&w>>E%+n@GZ?L z$qay42ebwv3|3efP?VWplvz?4SejatnVNzo>spbVQ<{?MR+OLXn^_Fnpf|!Yi!+mQQvLEvGSe!RVmE8Der4lwFlb`50fwzX_T)sa z)XBX(>^#U}Jb4k1UcHf_k)eTsiGjI^QIvr`Jjgj&43$_ER5KhkEM9-|%?h-ddH-kR zxwLzyZm)e=a8hw^*1bRfcL^DAv2g$+^PDXUGZTxOfeVv@)zlZS+IPgIi5yXB-Y0tN zm9$sn?R1lEzRd5mnUuQb-C$A>U0bq6u&!zSisw>BmTW?YS2C6S;)@8{d~btK!>71C GZ3X}zN5LEb delta 346 zcmdlZ^GK@Rpouq*jZ>@5qwPB{BRkWACSHG_kT(+}qanWmFB@kA;1P^HYGrhB``#1qHe( znZ+eVnMtK3APpsz8*2?&MEna<^E?uZa`W>l^?+*hN>YnUCSPSyo-E4hw3&_VD;uk` zK@+3>B;G{xoh!-mz~0UDj$l>wl|)^wf-9Goleu) H%uBNYG(dG^ diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/signature/openharmony_sx.p7b b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/signature/openharmony_sx.p7b index f06e218defa7f707e22a3890903c574e1c498217..43c8c615b835cdf974817cb7eb11fbb7d195385b 100644 GIT binary patch delta 554 zcmaDPwO1y?po!0tjZ>@5qwPB{BRkWACO$2okQx&sqam*WHydX{n+IbmGYb==K@;n3 zghIvzO{`~FnpjU%E0v`d6=&w>>EChJ;}oKu>T>Qzi2&@?tSuML~f< zXmKh~Kg4p^ijvekkP4UrH=sAdGK({la#H>BOES|cm0~w*vVLXbaxiFOv;hXLLH6WC zuGGoBJnTHkfjoH;k6yizp^>41fr){IfmxJ+K0M4hSqzm}6zVcA__@}4nfl*hXPWr@ z7-Ou%iP+z3?!H^^^eS`roOfOZTx=Y`*gR*;!py|tX5hl4AgDKc#z{jtqyK-!LQV&* zc(t(3PdP-mwPM*>)x9xXJDHgj;?7(>a_Pk6vuAx4&GxJla+thXb%7 delta 347 zcmdlh^GK@Rpouq*jZ>@5qwPB{BRkWACSHG_kT(+}qanWmFB@kA;1P^HYGrhB``#1qHe( znZ+eVnMtK3APpsz8*2?&MEna<^E?uZa`W>l^?+*hN>YnUCSPMwo-D@dw3(glD;uk` zK@+3>WJcaXK2#@7uH)6KHv|GR10xe-Q==#YeYgubSqzm}6pC$Z9VT=*F!}yD#`F2w ztgTnK%nMKtO30bi=3VSHqx`V}7aIrA_vdU`n3-7I4P2QN#Q*R9e|3FIYRz7GJMM^r zs}nBDc^{H)UF8$IXM#(GOF5Gw!`olqTD30jez|M$g_oVednzA_%(ge4!L|Mx>zz*1 I+009`0dOsKYXATM diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts deleted file mode 100644 index c12571f07..000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2021 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 ServiceExtensionAbility from '@ohos.application.ServiceExtensionAbility' -import commonEvent from "@ohos.commonEvent" -import rpc from '@ohos.rpc'; - -export default class ServiceAbility extends ServiceExtensionAbility { - onCreate(want) { - console.log('ServiceAbility onCreate'); - } - onDestory(){ - console.log('ServiceAbility onDestory'); - } - onRequest(want,startId) { - console.log('ServiceAbility onRequest'); - commonEvent.publish("ACTS_InterfaceMultiUsers_0100_Start_CommonEvent", () => { - console.log(" Publish ACTS_InterfaceMultiUsersExtension_CommonEvent callback") - this.context.terminateSelf().then(()=>{ - console.log(" terminateSelf callback") - }) - }) - } - - onConnect(want) { - console.log('ServiceAbility onConnect'); - return new rpc.RemoteObject('connect'); - } - - onDisconnect(want) { - console.log('ServiceAbility onDisconnect'); - } - - onDestroy() { - console.log('ServiceAbility onDestroy'); - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/module.json b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/module.json index 5f645cbbf..a2aab2056 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/module.json +++ b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/entry/src/main/module.json @@ -52,17 +52,6 @@ "orientation": "portrait" } ], - "extensionAbilities": [ - { - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "name": "com.acts.actsinterfacemultiuserstest.ServiceAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - } - ], "defPermissions": [ { "availableScope": [], @@ -76,54 +65,22 @@ } ], "requestPermissions": [ - { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name": "ohos.permission.GET_BUNDLE_INFO", - "reason": "need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason": "need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name": "ohos.permission.REMOVE_CACHE_FILES", - "reason": "need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name": "ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason": "need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name": "ohos.permission.INSTALL_BUNDLE", - "reason": "need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name": "ohos.permission.GET_RUNNING_INFO", - "reason": "need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name": "ohos.permission.MANAGE_LOCAL_ACCOUNTS", - "reason": "need use ohos.permission.MANAGE_LOCAL_ACCOUNTS" - }, - { - "name": "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION", - "reason": "need use ohos.permission.MANAGE_LOCAL_ACCOUNTS" - }, - { - "name":"ohos.permission.START_ABILITIES_FROM_BACKGROUND", - "reason":"need use ohos.permission.START_ABILITIES_FROM_BACKGROUND" - }, - { - "name":"ohos.permission.START_INVISIBLE_ABILITY", - "reason":"need use ohos.permission.START_INVISIBLE_ABILITY" - } + { + "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES", + "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO", + "reason": "need use ohos.permission.GET_BUNDLE_INFO" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.GET_RUNNING_INFO", + "reason": "need use ohos.permission.GET_RUNNING_INFO" + } ] } } diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/signature/openharmony_sx.p7b b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/signature/openharmony_sx.p7b index dcec6c9615032c1b48bf185e839d9720dd68aab0..b181c98738527ac0d1676a50ebfb0e318f024c3d 100644 GIT binary patch delta 858 zcmZ8fO=uHA7-iFRwUrjs7K$1Ta}i25-NdG*r3EYbX`rUH+8~w^H`z%$y4hK0W@FQ$ zfq=n_*ct>8ghG2LD2Nmfih2ETl6x+ym{aI-uq@gdFDJN zwcLDNZfLIzRK7P!J6!YS<|_bAyCf;lr0$X%&Q%5^T<3O4YFX~sCQ9>V+3POL2WC(K zGft?fm|7mA9u)Meeiiw);4IYv4*HO0S&B}$U?gJ;r$7`fybmfUPZLw%38pzPl-f4Y zQP14N!zEPE45AZJL_IUeq(aHy9A%&v2z7UcyF$TG*jK}~oWKm=u5fqf(IWs~_8~_f z^mJUn2DLC#oOWo)!sdX+^3*H>x8}5ZOKM%dC&lYZo3(#K zW@+B9Wd*M-j(L{TvN&%Wg4i79AutypqFDwAo0R1>qjt2E9M**GBtVmpd*dn%qd{O; z%NpDXeP9GmlMh2tlL^3v%9v(@g5`)orGy+{H z2>(wW8BHb=$#{*8#-Y`=Sgj)izl>xBH2vph%;7@Q7TcLFvM!L?Q!&%YQ{69ny2eny ztO!NvxhAqKqOFe8+~eiCE|)}i#GjJmffM>z&Yff#rKN2dffosgRn zF_>P8aFQ`_k_wV5qVeTN@>jY3m|B*4s}Gv)mjc0ns)p60fzVlX`;Rub1IX=-y<2!X z;+`E}=$)%uUHeh#c=deG^n6NRPkmX>M3Q^eMtLXv{?$Hroy#3lBQCGpX0N>UwDc~W z`gQ*O?`MUTk85x4R;N7mfhRw|$;Jnlcjob(GgtloR=)iDpt8VrFMhtcbgi-P#jH5g KcDwz?;>$lpz$*Lz delta 953 zcmZ8gK}Zx)7v`EhGytRk3GsBxVTU*%H z1VWgHZ4cqW5Tav5c<2}=gct+`5_-ufC?W`w@Y;K`v$os2%<%u;|NYV0%|ctEAjBi^s2rM}PYI}55(VhV_x}Nf6;Hk?d2-=aSYZbg z5OJ_&Mole`K%WBQF&KlOvoV>qbe@a{Va>LqT{?Cs!5NqGYFf1YYRkEbO^RlS#=|ul z*Tp(3FE5=e1-zPpbxeyaSe4;RF)bR+pqxegUWsIn+MDP~sMV$i2rWku;bMB#WY4*7 z2JkuO0&O)V1Q|$kP)$O{HFX0;Rcz+0#;!UlAj7f|iTWbJB^#M3jpQw}7!>o?m85W7 zP*x{|;pVCbUr)eVn_bq*$Lh*sY)&zX99qW%G}~bPfm3uS%3sZLvvmgfWOGQPu0I2C zjmA}W z80#@-`jm7d1FLrZI|24A_7{Mdn!$X9D$fqJCzUi9;K~MUd(<^39wSy3IS%Mlf_MfS zY#GJ~wg~%-ySyqcE($l(F#3H@yO;cVru zj4H1pgC(eT#i7~_6NxME?7<5NNpT=4-s1Aba%y3_?aBW8k$YPY@TuII+p@QQ`^(qI zB4A&JFd&g^i_!55K`**jgO$ diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/signature/openharmony_sx_thirdparty.p7b b/ability/ability_runtime/actsusers/ActsAmsUsersThirdTest/signature/openharmony_sx_thirdparty.p7b index f06e218defa7f707e22a3890903c574e1c498217..7f7133cc6530e75d25ea3c10651c2acec9fbe99f 100644 GIT binary patch delta 566 zcmaDPby6n7po!0wjZ>@5qwPB{BRkWACO$KukP#Cjqam*WHydX{n+IbmGYb==K@;n9 zghIvzO{_Oqnpm$?E0v`d6=&w>>El>Lw=^Bqn9%WR_&60<}de zIfAq~78Lk`YzrvLPfjf^23i9V1}m%#D9X$)$}Fi2EKM!SOie+Pb*)IwDNRXrE6UIH z%`66a7ooqPz#z0Z6{sI#xobs9Y92@h%m_E2H^MTDGm~;s{qjpP(<+r>H*2zfW#e)% zXkxSh2DCx;+_C@w+*=1IDj#G&X$FliN(#pg-L;>bbj2P zV_~<#Up|OGbl_Xl8Ie~htG8XKkvita7WGY}o=G7+V#f6fbLK8DQQhjBT|%=;XVqUc R@@4pVZF`T+$`sZ6(*S}W$l?G1 delta 347 zcmX>p^GK@Rpouq*jZ>@5qwPB{BRkWACSHG_kT(+}qanWmFB@kA;1P^HYGrhB``#1qHe( znZ+eVnMtK3APpsz8*2?&MEna<^E?uZa`W>l^?+*hN>YnUCO=|Po~*>`v{{(#D;uk` zK@+3>WM1AvK2#@7?&8&}Hv|GR10xe-Q==#YeYgubSqzm}6pC$Z9VT=*F!}yD#`F2w ztgTnK%nMKtO30bi=3VSHqx`V}7aIrA_vdU`n3-7I4P2QN#Q*R9e|3FIYRz7GJMM^r zs}nBDc^{H)UF8$IXM#(GOF5Gw!`olqTD30jez|M$g_oVednzA_%(ge4!L|Mx>zz*1 I+009`0jYs?vj6}9 diff --git a/ability/ability_runtime/actsusers/BUILD.gn b/ability/ability_runtime/actsusers/BUILD.gn index 48b6afef0..05fab2101 100644 --- a/ability/ability_runtime/actsusers/BUILD.gn +++ b/ability/ability_runtime/actsusers/BUILD.gn @@ -18,15 +18,11 @@ group("actsusers") { if (is_standard_system) { deps = [ "ActsAmsUsersApi7AppA:ActsAmsUsersApi7AppA", - "ActsAmsUsersExtensionSystemTest:ActsAmsUsersExtensionSystemTest", - "ActsAmsUsersExtensionThirdTest:ActsAmsUsersExtensionThirdTest", "ActsAmsUsersKillProcessAppA:ActsAmsUsersKillProcessAppA", "ActsAmsUsersKillProcessAppB:ActsAmsUsersKillProcessAppB", "ActsAmsUsersKillProcessAppC:ActsAmsUsersKillProcessAppC", "ActsAmsUsersSystemTest:ActsAmsUsersSystemTest", "ActsAmsUsersThirdTest:ActsAmsUsersThirdTest", - "actsconnectabilitysystemabilitytest:ActsConnectAbilitySystemAbilityTest", - "actsmanyuserthirdabilitytest:ActsManyUsersAbilityTest", ] } } diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/AppScope/app.json b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/AppScope/app.json deleted file mode 100644 index 1a44bb9e6..000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/AppScope/app.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "app": { - "bundleName": "com.example.actsconnectabilitysystemabilitytest", - "vendor": "huawei", - "versionCode": 1000000, - "versionName": "1.0.0", - "debug": false, - "icon" : "$media:icon", - "label" : "$string:app_name", - "description" : "$string:description_application", - "distributedNotificationEnabled": true, - "keepAlive" : true, - "singleUser": true, - "minAPIVersion": 8, - "targetAPIVersion": 8, - "car": { - "apiCompatibleVersion": 8, - "singleUser": false - } - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/AppScope/resources/base/element/string.json b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/AppScope/resources/base/element/string.json deleted file mode 100644 index 0d3507c0d..000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/AppScope/resources/base/element/string.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "ohosProject" - } - ] -} diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/AppScope/resources/base/media/app_icon.png b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/AppScope/resources/base/media/app_icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6790 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 { - router.back() - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts deleted file mode 100644 index b6d7515c0..000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts +++ /dev/null @@ -1,205 +0,0 @@ -/* - * 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 commonEvent from '@ohos.commonEvent' -import ServiceExtension from '@ohos.application.ServiceExtensionAbility' -import rpc from '@ohos.rpc'; -var conn = -1; -function publishCallBackOne() { - console.log("========Publish CallBack AMS_ConnectAbility_0100_commonEvent========"); -} -function publishCallBackTwo() { - console.log("========Publish CallBack AMS_ConnectAbility_0200_commonEvent========"); -} -function publishCallBackThree() { - console.log("========Publish CallBack AMS_ConnectAbility_0300_commonEvent========"); -} -function publishCallBackFour() { - console.log("========Publish CallBack AMS_ConnectAbility_0400_commonEvent========"); -} -function publishCallBackFive() { - console.log("========Publish CallBack AMS_ConnectAbility_0500_commonEvent========"); -} -function publishCallBackSix() { - console.log("========Publish CallBack AMS_ConnectAbility_0600_commonEvent========"); -} -function publishCallBackzero() { - console.log("========Publish CallBack AMSc_disonnectAbility_0100_commonEvent========"); -} -function publishCallBackttwo() { - console.log("========Publish CallBack AMSc_disonnectAbility_0200_commonEvent========"); -} - -function onConnectCallback(element, remote) { - console.log('onConnectCallback====> element=' + JSON.stringify(element)); - console.log('onConnectCallback====> remote=' + JSON.stringify(remote)); -} - -function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); -} - -function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) -} - -export default class ServiceAbility extends ServiceExtension { - onCreate(want) { - console.log('ServiceAbility onCreate, want: ' + want.abilityName); - } - - onRequest(want, startId) { - console.log('ServiceAbility onRequest, want: ' + want.abilityName + ', startId: ' + startId); - - console.log('ServiceAbility registerApplicationStateObserver begin'); - console.log('ServiceAbility registerApplicationStateObserver end, conn: ' + conn); - } - - onConnect(want) { - console.log('ServiceAbility onConnect, want:' + want.abilityName); - let extensionContext = this.context - if (want.action == "one") { - commonEvent.publish("AMS_ConnectAbility_0100_commonEvent", publishCallBackOne); - } - ; - if (want.action == "two") { - commonEvent.publish("AMS_ConnectAbility_0200_commonEvent", publishCallBackTwo); - } - ; - if (want.action == "Three") { - commonEvent.publish("AMS_ConnectAbility_0300_commonEvent", publishCallBackThree); - } - ; - if (want.action == "Four") { - commonEvent.publish("AMS_ConnectAbility_0400_commonEvent", publishCallBackFour); - } - ; - if (want.action == "Five") { - commonEvent.publish("AMS_ConnectAbility_0500_commonEvent", publishCallBackFive); - } - ; - if (want.action == "Six") { - commonEvent.publish("AMS_ConnectAbility_0600_commonEvent", publishCallBackSix); - } - ; - if (want.action == "Seven") { - extensionContext.connectAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility2", - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - } - ); - }; - if (want.action == "Eight") { - extensionContext.connectAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility3", - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - } - ); - }; - if (want.action == "Nine") { - console.log('connectAbility 111'); - let num = extensionContext.connectAbility( - { - bundleName: 'com.example.actsconnectabilitysystemabilitytest', - abilityName: 'com.example.actsconnectabilitysystemabilitytest.ServiceAbility2' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - setTimeout(() => { - extensionContext.disconnectAbility(num).then(() => { - console.log('in disconnectAbility'); - }) - }, 1000) - - }; - if (want.action == "Ten") { - console.log('connectAbility 222'); - let num = extensionContext.connectAbility( - { - bundleName: 'com.example.actsconnectabilitysystemabilitytest', - abilityName: 'com.example.actsconnectabilitysystemabilitytest.ServiceAbility2' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - setTimeout(() => { - extensionContext.disconnectAbility(num).then(() => { - console.log('in disconnectAbility2'); - }) - }, 1000) - - }; - if (want.action == "Ten one") { - console.log('connectAbility 333'); - let num = extensionContext.connectAbility( - { - bundleName: 'com.example.actsconnectabilitysystemabilitytest', - abilityName: 'com.example.actsconnectabilitysystemabilitytest.ServiceAbility2' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - setTimeout(() => { - extensionContext.disconnectAbility(2222).then(() => { - console.log('in disconnectAbility3'); - }) - }, 1000) - - }; - if (want.action == "Ten two") { - console.log('connectAbility 444'); - let num = extensionContext.connectAbility( - { - bundleName: 'com.example.actsconnectabilitysystemabilitytest', - abilityName: 'com.example.actsconnectabilitysystemabilitytest.ServiceAbility2' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - setTimeout(() => { - extensionContext.disconnectAbility(2222).then(() => { - console.log('in disconnectAbility4'); - }) - }, 1000) - - }; - return new rpc.RemoteObject('connect'); - } - - onDisconnect(want) { - console.log('ServiceAbility onDisconnect, want:' + want.abilityName); - commonEvent.publish("AMSc_disonnectAbility_0100_commonEvent", publishCallBackzero); - commonEvent.publish("AMSc_disonnectAbility_0200_commonEvent", publishCallBackttwo); - } - - onDestroy() { - console.log('ServiceAbility onDestroy'); - } -} - diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility/service.ts deleted file mode 100644 index b49731a41..000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility/service.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* -* 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. -*/ -export default { - onStart() { - console.info('ServiceAbility onStart'); - }, - onStop() { - console.info('ServiceAbility onStop'); - }, - onCommand(want, startId) { - console.info('ServiceAbility onCommand'); - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts deleted file mode 100644 index be37720dc..000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2021 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 ServiceExtension from '@ohos.application.ServiceExtensionAbility' -import commonEvent from "@ohos.commonEvent" -import rpc from '@ohos.rpc'; -export default class ServiceAbility2 extends ServiceExtension { - onCreate(want) { - console.log('ServiceAbility2 onCreate'); - globalThis.abilityWant = want; - } - - onDestory(){ - console.log('ServiceAbility2 onDestory'); - } - - onRequest(want,startId) { - console.log('ServiceAbility2 onRequest'); - } - - onConnect(want) { - console.log('ServiceAbility2 onConnect'); - commonEvent.publish("AMS_ConnectAbility_0700_commonEvent", () => { - console.log("publish Publish AMS_ConnectAbility_0700_commonEvent callback"); - }) - commonEvent.publish("AMS_ConnectAbility_0900_commonEvent", () => { - console.log("publish Publish AMS_ConnectAbility_0900_commonEvent callback"); - }) - commonEvent.publish("AMS_ConnectAbility_1000_commonEvent", () => { - console.log("publish Publish AMS_ConnectAbility_1000_commonEvent callback"); - }) - commonEvent.publish("AMS_ConnectAbility_1100_commonEvent", () => { - console.log("publish Publish AMS_ConnectAbility_1100_commonEvent callback"); - }) - commonEvent.publish("AMS_ConnectAbility_1200_commonEvent", () => { - console.log("publish Publish AMS_ConnectAbility_1200_commonEvent callback"); - }) - return new rpc.RemoteObject('connect'); - } - - - onDisconnect(want) { - console.log('ServiceAbility2 onDisconnect, want:' + want.abilityName); - } - - onDestroy() { - console.log('ServiceAbility2 onDestroy'); - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility2/service.ts b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility2/service.ts deleted file mode 100644 index 340a610cb..000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility2/service.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -export default { - onStart() { - console.info('ServiceAbility2 onStart'); - }, - onStop() { - console.info('ServiceAbility2 onStop'); - }, - onCommand(want, startId) { - console.info('ServiceAbility2 onCommand'); - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestAbility/TestAbility.ts deleted file mode 100644 index 4f101c99c..000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestAbility/TestAbility.ts +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 Ability from '@ohos.app.ability.UIAbility' - -export default class TestAbility extends Ability { - onCreate(want, launchParam) { - console.log('TestAbility onCreate') - } - - onDestroy() { - console.log('TestAbility onDestroy') - } - - onWindowStageCreate(windowStage) { - console.log('TestAbility onWindowStageCreate') - windowStage.loadContent("TestAbility/pages/index", (err, data) => { - if (err.code) { - console.error('Failed to load the content. Cause:' + JSON.stringify(err)); - return; - } - console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) - }); - - globalThis.abilityContext = this.context; - } - - onWindowStageDestroy() { - console.log('TestAbility onWindowStageDestroy') - } - - onForeground() { - console.log('TestAbility onForeground') - } - - onBackground() { - console.log('TestAbility onBackground') - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestAbility/pages/index.ets b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestAbility/pages/index.ets deleted file mode 100644 index fae969f98..000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestAbility/pages/index.ets +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2021 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 router from '@ohos.router'; - -@Entry -@Component -struct Index { - aboutToAppear() { - console.info('TestAbility index aboutToAppear') - } - @State message: string = 'Hello World' - build() { - Row() { - Column() { - Text(this.message) - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('next page') - .fontSize(20) - .fontWeight(FontWeight.Bold) - }.type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .width('35%') - .height('5%') - .onClick(()=>{ - }) - } - .width('100%') - } - .height('100%') - } - } \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts deleted file mode 100644 index 764da81c4..000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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 TestRunner from '@ohos.application.testRunner' -import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' - -var abilityDelegator = undefined -var abilityDelegatorArguments = undefined - -function translateParamsToString(parameters) { - const keySet = new Set([ - '-s class', '-s notClass', '-s suite', '-s it', - '-s level', '-s testType', '-s size', '-s timeout', - '-s dryRun' - ]) - let targetParams = ''; - for (const key in parameters) { - if (keySet.has(key)) { - targetParams = `${targetParams} ${key} ${parameters[key]}` - } - } - return targetParams.trim() -} - -async function onAbilityCreateCallback() { - console.log("onAbilityCreateCallback"); -} - -async function addAbilityMonitorCallback(err: any) { - console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) -} - -export default class OpenHarmonyTestRunner implements TestRunner { - constructor() { - } - - onPrepare() { - console.info("OpenHarmonyTestRunner OnPrepare ") - } - - async onRun() { - console.log('OpenHarmonyTestRunner onRun run') - abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' - let lMonitor = { - abilityName: testAbilityName, - onAbilityCreate: onAbilityCreateCallback, - }; - abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) - var cmd = 'aa start -d 0 -a com.example.actsconnectabilitysystemabilitytest.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName - cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) - var debug = abilityDelegatorArguments.parameters["-D"] - if (debug == 'true') - { - cmd += ' -D' - } - console.info('cmd : '+cmd) - abilityDelegator.executeShellCommand(cmd, - (err: any, d: any) => { - console.info('executeShellCommand : err : ' + JSON.stringify(err)); - console.info('executeShellCommand : data : ' + d.stdResult); - console.info('executeShellCommand : data : ' + d.exitCode); - }) - console.info('OpenHarmonyTestRunner onRun end') - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/test/List.test.ets b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/test/List.test.ets deleted file mode 100644 index 28df98361..000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/test/List.test.ets +++ /dev/null @@ -1,18 +0,0 @@ -/* - * 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 abilityTest from './manyusersabilitytest.test.ets' -export default function testsuite() { - abilityTest() -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets deleted file mode 100644 index 7a2c4a0a5..000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets +++ /dev/null @@ -1,838 +0,0 @@ -/* - * 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 { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" -import commonEvent from '@ohos.commonEvent' - - -var subscriberInfoStartAbility_0100 = { - events: ["AMS_ConnectAbility_0100_commonEvent"], -}; -var subscriberInfoStartAbility_0200 = { - events: ["AMS_ConnectAbility_0200_commonEvent"], -}; -var subscriberInfoStartAbility_0300 = { - events: ["AMS_ConnectAbility_0300_commonEvent"], -}; -var subscriberInfoStartAbility_0400 = { - events: ["AMS_ConnectAbility_0400_commonEvent"], -}; -var subscriberInfoStartAbility_0500 = { - events: ["AMS_ConnectAbility_0500_commonEvent"], -}; -var subscriberInfoStartAbility_0600 = { - events: ["AMS_ConnectAbility_0600_commonEvent"], -}; -var subscriberInfoStartAbility_0700 = { - events: ["AMS_ConnectAbility_0700_commonEvent"], -}; -var subscriberInfoStartAbility_0800 = { - events: ["AMS_ConnectAbility_0800_commonEvent"], -}; -var subscriberInfoStartAbility_0900 = { - events: ["AMS_ConnectAbility_0900_commonEvent"], -}; - -var subscriberInfoStartAbility_1000 = { - events: ["AMS_ConnectAbility_1000_commonEvent"], -}; - -var subscriberInfoStartAbility_1100 = { - events: ["AMS_ConnectAbility_1100_commonEvent"], -}; - -var subscriberInfoStartAbility_1200 = { - events: ["AMS_ConnectAbility_1200_commonEvent"], -}; -var unsubscriberInfoStartAbility_0100 = { - events: ["AMSc_disonnectAbility_0100_commonEvent"], -}; -var unsubscriberInfoStartAbility_0200 = { - events: ["AMSc_disonnectAbility_0200_commonEvent"], -}; - - -const START_ABILITY_TIMEOUT = 1000; -globalThis.number = 0; - -export default function abilityTest() { - describe('ActssystemabilityTest', function () { - - /* - * @tc.number: ACTS_ConnectAbility_0100 - * @tc.name: Connects a service ability - * @tc.desc: Connects a service ability - */ - it('ACTS_ConnectAbility_0100', 0, async function (done) { - console.log('ACTS_ConnectAbility_0100====ACTS_ConnectAbility_0100 7 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_0100_commonEvent"); - console.debug("====>ACTS_ConnectAbility_0100 5 "); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ConnectAbility_0100 6 "); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - - } - - commonEvent.createSubscriber(subscriberInfoStartAbility_0100).then(async (data) => { - console.debug("====>ACTS_ConnectAbility_0100 2 Subscriber1====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack1====>"); - done(); - } - - function timeout() { - expect().assertFail(); - console.debug('AMS_ConnectAbility_0100 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - function onConnectCallback(element, remote) { - console.debug('ACTS_ConnectAbility_0100 _onConnectCallback ====> element=' - + JSON.stringify(element) + " , " + element); - console.debug('ACTS_ConnectAbility_0100 _onConnectCallback ====> remote=' - + JSON.stringify(remote) + " , " + remote); - } - - function onDisconnectCallback(element) { - console.debug('ACTS_ConnectAbility_0100 _onDisconnectCallback ====> element=' - + JSON.stringify(element) + " , " + element); - } - - function onFailedCallback(code) { - console.debug('ACTS_ConnectAbility_0100 _onFailedCallback ====> code=' - + JSON.stringify(code) + " , " + code) - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ConnectAbility_0100 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "one", - }, - { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback, - } - ); - console.debug("====>ACTS_ConnectAbility_0100 4 "); - }) - - /* - * @tc.number: ACTS_ConnectAbility_0200 - * @tc.name: Connects a service ability - * @tc.desc: Connects a service ability - */ - it('ACTS_ConnectAbility_0200', 0, async function (done) { - console.log('ACTS_ConnectAbility_0200====Subscribe CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_0200_commonEvent"); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - } - commonEvent.createSubscriber(subscriberInfoStartAbility_0200).then(async (data) => { - console.debug("====>Create Subscriber====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack====>"); - done(); - } - function timeout() { - console.debug('AMS_ConnectAbility_0200 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - } - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbilityone", - action: "two", - }, - { - onFailed: onFailedCallback, - }, - ); - }) - - /* - * @tc.number: ACTS_DisconnectAbility_0100 - * @tc.name: DisConnects a service ability - * @tc.desc: DisConnects a service ability - */ - it('ACTS_DisconnectAbility_0100', 0, async function (done) { - console.log('ACTS_DisconnectAbility_0100====ACTS_DisconnectAbility_0100 5 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - console.debug("====>ACTS_DisconnectAbility_0100 6====>"); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_DisconnectAbility_0100 6====>"); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - } - commonEvent.createSubscriber(subscriberInfoStartAbility_0300).then(async (data) => { - console.debug("====>ACTS_DisconnectAbility_0100 2 Subscriber====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack====>"); - setTimeout(() => { - done() - }, 1000) - }; - function timeout() { - expect().assertFail(); - console.debug('AMS_DonnectAbility_0300 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_DisconnectAbility_0100 3====>"); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "Three", - }, - ); - console.debug("====>ACTS_DisconnectAbility_0100 4====>"); - }) - - /* - * @tc.number: ACTS_DisconnectAbility_0200 - * @tc.name: DisConnects a service ability - * @tc.desc: DisConnects a service ability - */ - it('ACTS_DisconnectAbility_0200', 0, async function (done) { - console.log('ACTS_DisconnectAbility_0200 1====ACTS_DisconnectAbility_0200 3 CallBack1 data:====>" + JSON.stringify(data)); - commonEvent.createSubscriber(unsubscriberInfoStartAbility_0100).then(async (data) => { - console.debug("====>ACTS_DisconnectAbility_0200 6 Subscriber====>"); - subscriberdisconnect = data; - await commonEvent.subscribe(subscriberdisconnect, subscribedisconnectback); - console.debug("====>ACTS_DisconnectAbility_0200 1111 connectAbility1====>"); - - console.debug("====>ACTS_DisconnectAbility_0200 1111 connectAbility2====>"); - console.debug("====>ACTS_DisconnectAbility_0200 66 Subscriber====>"); - globalThis.abilityContext.disconnectServiceExtensionAbility( - 999, - (error, data) => { - console.log('ACTS_DisconnectAbility_0200 5 DisconnectAbility result errCode : ' - + error.code + " data: " + data) - }); - }) - } - function subscribedisconnectback(err, data) { - console.debug("====>ACTS_DisconnectAbility_0200 7 CallBack2 data:====>" + JSON.stringify(data)); - commonEvent.unsubscribe(subscriberdisconnect, () => { - console.debug('unsubscribe subscriberdisconnect'); - commonEvent.unsubscribe(subscriber, () => { - console.debug('unsubscribe subscriber') - clearTimeout(id); - expect().assertFail(); - done(); - }) - }) - } - function timeout() { - console.debug('ACTS_DisconnectAbility_0200 8 timeout'); - commonEvent.unsubscribe(subscriberdisconnect, () => { - console.debug('unsubscribe subscriberdisconnect'); - commonEvent.unsubscribe(subscriber, () => { - console.debug('unsubscribe subscriber') - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('ACTS_DisconnectAbility_0200 9 DisconnectAbility result errCode : ' - + error.code + " data: " + data) - console.debug("====>ACTS_DisconnectAbility_0200 99 Subscriber====>"); - setTimeout(() => { - done(); - }, 1000) - }); - }) - }) - } - commonEvent.createSubscriber(subscriberInfoStartAbility_0400).then(async (data) => { - console.debug("====>ACTS_DisconnectAbility_0200 10 Subscriber====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack) - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "Four", - }, - ); - console.debug("====>connId is:====>" + JSON.stringify(connId)); - console.debug("====>ACTS_DisconnectAbility_0200 1010 Subscriber====>"); - }) - function unSubscribeCallback() { - console.debug("====>ACTS_DisconnectAbility_0200 1111 UnSubscribe CallBack====>"); - done(); - } - }) - - /* - * @tc.number: ACTS_DisconnectAbility_0300 - * @tc.name: DisConnects a service ability - * @tc.desc: DisConnects a service ability - */ - it('ACTS_DisconnectAbility_0300', 0, async function (done) { - console.log('ACTS_DisconnectAbility_0300====ACTS_DisconnectAbility_0300 4 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_0500_commonEvent"); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('ACTS_DisconnectAbility_0300 5 DisconnectAbility result errCode : ' - + error.code + " data: " + data) - } - ); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - } - commonEvent.createSubscriber(subscriberInfoStartAbility_0500).then(async (data) => { - console.debug("====>ACTS_DisconnectAbility_0300 1 Subscriber====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - function unSubscribeCallback() { - console.debug("====>ACTS_DisconnectAbility_0300 6 CallBack====>"); - setTimeout(() => { - done(); - }, 1000) - } - function timeout() { - expect().assertFail(); - console.debug('AMS_ConnectAbility_0500 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('ACTS_DisconnectAbility_0300 7 DisconnectAbility result errCode : ' - + error.code + " data: " + data) - }); - } - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_DisconnectAbility_0300 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "Five", - }, - ); - console.debug("====>ACTS_DisconnectAbility_0300 4 "); - }) - - /* - * @tc.number: ACTS_DisconnectAbility_0400 - * @tc.name: DisConnects a service ability - * @tc.desc: DisConnects a service ability - */ - it('ACTS_DisconnectAbility_0400', 0, async function (done) { - console.log('ACTS_DisconnectAbility_0400 1====ACTS_DisconnectAbility_0400 3 CallBack1 data:====>" + JSON.stringify(data)); - commonEvent.createSubscriber(unsubscriberInfoStartAbility_0200).then(async (data) => { - console.debug("====>ACTS_DisconnectAbility_0400 6 Subscriber====>"); - subscriberdisconnect = data; - await commonEvent.subscribe(subscriberdisconnect, subscribedisconnectback); - console.debug("====>ACTS_DisconnectAbility_0400 1111 connectAbility1====>"); - - console.debug("====>ACTS_DisconnectAbility_0400 1111 connectAbility2====>"); - console.debug("====>ACTS_DisconnectAbility_0400 66 Subscriber====>"); - globalThis.abilityContext.disconnectServiceExtensionAbility( - 999, - (error, data) => { - console.log('ACTS_DisconnectAbility_0400 5 DisconnectAbility result errCode : ' - + error.code + " data: " + data) - }); - }) - } - function subscribedisconnectback(err, data) { - console.debug("====>ACTS_DisconnectAbility_0400 7 CallBack2 data:====>" + JSON.stringify(data)); - commonEvent.unsubscribe(subscriberdisconnect, () => { - console.debug('unsubscribe subscriberdisconnect'); - commonEvent.unsubscribe(subscriber, () => { - console.debug('unsubscribe subscriber') - clearTimeout(id); - expect().assertFail(); - done(); - }) - }) - } - function timeout() { - console.debug('ACTS_DisconnectAbility_0400 8 timeout'); - commonEvent.unsubscribe(subscriberdisconnect, () => { - console.debug('unsubscribe subscriberdisconnect'); - commonEvent.unsubscribe(subscriber, () => { - console.debug('unsubscribe subscriber') - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('ACTS_DisconnectAbility_0400 9 DisconnectAbility result errCode : ' - + error.code + " data: " + data) - console.debug("====>ACTS_DisconnectAbility_0400 99 Subscriber====>"); - setTimeout(() => { - done(); - }, 1000) - }); - }) - }) - } - commonEvent.createSubscriber(subscriberInfoStartAbility_0600).then(async (data) => { - console.debug("====>ACTS_DisconnectAbility_0400 10 Subscriber====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack) - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "Six", - }, - ); - console.debug("====>connId is:====>" + JSON.stringify(connId)); - console.debug("====>ACTS_DisconnectAbility_0400 1010 Subscriber====>"); - }) - function unSubscribeCallback() { - console.debug("====>ACTS_DisconnectAbility_0400 1111 UnSubscribe CallBack====>"); - done(); - } - }) - - /* - * @tc.number: ACTS_ExtensionConnectAbility_0100 - * @tc.name: Service connect a service ability - * @tc.desc: Service connect a service ability - */ - it('ACTS_ExtensionConnectAbility_0100', 0, async function (done) { - console.log('ACTS_ExtensionConnectAbility_0100====ACTS_ExtensionConnectAbility_0100 7 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_0700_commonEvent"); - console.debug("====>ACTS_ExtensionConnectAbility_0100 5 "); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ExtensionConnectAbility_0100 6 "); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - } - commonEvent.createSubscriber(subscriberInfoStartAbility_0700).then(async (data) => { - console.debug("====>ACTS_ExtensionConnectAbility_0100 2 Subscriber1====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack1====>"); - setTimeout(() => { - done(); - }, 1000) - } - function timeout() { - expect().assertFail(); - console.debug('ACTS_ExtensionConnectAbility_0100 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ExtensionConnectAbility_0100 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "Seven", - }, - ); - console.debug("====>ACTS_ExtensionConnectAbility_0100 4 "); - }) - - /* - * @tc.number: ACTS_ExtensionConnectAbility_0200 - * @tc.name: Service connect a service ability - * @tc.desc: Service connect a service ability - */ - it('ACTS_ExtensionConnectAbility_0200', 0, async function (done) { - console.log('ACTS_ExtensionConnectAbility_0200====ACTS_ExtensionConnectAbility_0200 7 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_0800_commonEvent"); - console.debug("====>ACTS_ExtensionConnectAbility_0200 5 "); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ExtensionConnectAbility_0200 6 "); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - } - commonEvent.createSubscriber(subscriberInfoStartAbility_0800).then(async (data) => { - console.debug("====>ACTS_ExtensionConnectAbility_0200 2 Subscriber1====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack1====>"); - setTimeout(() => { - done(); - }, 1000) - } - function timeout() { - console.debug('ACTS_ExtensionConnectAbility_0200 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ExtensionConnectAbility_0200 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "Eight", - }, - ); - console.debug("====>ACTS_ExtensionConnectAbility_0200 4 "); - }) - - /* - * @tc.number: ACTS_ExtensionDisconnectAbility_0100 - * @tc.name: Service disConnects a service ability - * @tc.desc: Service disConnects a service ability - */ - it('ACTS_ExtensionDisconnectAbility_0100', 0, async function (done) { - console.log('ACTS_ExtensionDisconnectAbility_0100====ACTS_ExtensionDisconnectAbility_0100 7 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_0900_commonEvent"); - console.debug("====>ACTS_ExtensionDisconnectAbility_0100 5 "); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ExtensionDisconnectAbility_0100 6 "); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - } - commonEvent.createSubscriber(subscriberInfoStartAbility_0900).then(async (data) => { - console.debug("====>ACTS_ExtensionDisconnectAbility_0100 2 Subscriber1====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack1====>"); - setTimeout(() => { - done(); - }, 1000) - } - function timeout() { - expect().assertFail(); - console.debug('ACTS_ExtensionDisconnectAbility_0100 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ExtensionDisconnectAbility_0100 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "Nine", - }, - ); - console.debug("====>ACTS_ExtensionDisconnectAbility_0100 4 "); - }) - - /* - * @tc.number: ACTS_ExtensionDisconnectAbility_0200 - * @tc.name: Service disConnects a service ability - * @tc.desc: Service disConnects a service ability - */ - it('ACTS_ExtensionDisconnectAbility_0200', 0, async function (done) { - console.log('ACTS_ExtensionDisconnectAbility_0200====ACTS_ExtensionDisconnectAbility_0200 7 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_1000_commonEvent"); - console.debug("====>ACTS_ExtensionDisconnectAbility_0200 5 "); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ExtensionDisconnectAbility_0200 6 "); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - } - commonEvent.createSubscriber(subscriberInfoStartAbility_1000).then(async (data) => { - console.debug("====>ACTS_ExtensionDisconnectAbility_0200 2 Subscriber1====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack1====>"); - setTimeout(() => { - done(); - }, 1000) - } - function timeout() { - expect().assertFail(); - console.debug('ACTS_ExtensionDisconnectAbility_0200 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ExtensionDisconnectAbility_0200 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "Ten", - }, - ); - console.debug("====>ACTS_ExtensionDisconnectAbility_0200 4 "); - }) - - /* - * @tc.number: ACTS_ExtensionDisconnectAbility_0300 - * @tc.name: Service disConnects a service ability - * @tc.desc: Service disConnects a service ability - */ - it('ACTS_ExtensionDisconnectAbility_0300', 0, async function (done) { - console.log('ACTS_ExtensionDisconnectAbility_0300====ACTS_ExtensionDisconnectAbility_0300 7 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_1100_commonEvent"); - console.debug("====>ACTS_ExtensionDisconnectAbility_0300 5 "); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ExtensionDisconnectAbility_0300 6 "); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - } - commonEvent.createSubscriber(subscriberInfoStartAbility_1100).then(async (data) => { - console.debug("====>ACTS_ExtensionDisconnectAbility_0300 2 Subscriber1====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack1====>"); - setTimeout(() => { - done(); - }, 1000) - } - function timeout() { - console.debug('ACTS_ExtensionDisconnectAbility_0300 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ExtensionDisconnectAbility_0300 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "Ten one", - }, - ); - console.debug("====>ACTS_ExtensionDisconnectAbility_0300 4 "); - }) - - /* - * @tc.number: ACTS_ExtensionDisconnectAbility_0400 - * @tc.name: Service disConnects a service ability - * @tc.desc: Service disConnects a service ability - */ - it('ACTS_ExtensionDisconnectAbility_0400', 0, async function (done) { - console.log('ACTS_ExtensionDisconnectAbility_0400====ACTS_ThirdPartyExtensionDisconnectAbility_0400 7 CallBack data:====>" - + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_1200_commonEvent"); - console.debug("====>ACTS_ExtensionDisconnectAbility_0400 5 "); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ExtensionDisconnectAbility_0400 6 "); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - } - commonEvent.createSubscriber(subscriberInfoStartAbility_1200).then(async (data) => { - console.debug("====>ACTS_ExtensionDisconnectAbility_0400 2 Subscriber1====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack1====>"); - setTimeout(() => { - done(); - }, 1000) - } - function timeout() { - console.debug('ACTS_ExtensionDisconnectAbility_0400 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ExtensionDisconnectAbility_0400 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "Ten two", - }, - ); - console.debug("====>ACTS_ExtensionDisconnectAbility_0400 4 "); - }) - }) -} - - diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/module.json b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/module.json deleted file mode 100644 index 6b6a01d7d..000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/module.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.actsconnectabilitysystemabilitytest.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ] - } - ], - "extensionAbilities": [ - { - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "name": "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - }, - { - "srcEntrance": "./ets/ServiceAbility2/ServiceAbility2.ts", - "name": "com.example.actsconnectabilitysystemabilitytest.ServiceAbility2", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - } - ], - - "requestPermissions": [ - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name": "ohos.permission.MANAGE_LOCAL_ACCOUNTS", - "reason": "ceshi" - }, - { - "name": "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION", - "reason": "ceshi" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.GET_RUNNING_INFO", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name":"ohos.permission.CLEAN_APPLICATION_DATA", - "reason":"need use ohos.permission.CLEAN_APPLICATION_DATA" - } - ] - } -} diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/resources/base/element/string.json deleted file mode 100644 index 376647878..000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/resources/base/element/string.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "string": [ - { - "name": "phone_entry_dsc", - "value": "i am an entry for phone" - }, - { - "name": "phone_entry_main", - "value": "the phone entry ability" - }, - { - "name": "entry_label", - "value": "ActsContextTest" - }, - { - "name": "form_description", - "value": "my form" - }, - { - "name": "serviceability_description", - "value": "my whether" - }, - { - "name": "description_application", - "value": "demo for test" - }, - { - "name": "app_name", - "value": "Demo" - } - ] -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6790 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 { - router.back() - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts deleted file mode 100644 index 360b453d4..000000000 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts +++ /dev/null @@ -1,206 +0,0 @@ -/* -* 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 ServiceExtension from '@ohos.application.ServiceExtensionAbility' -import commonEvent from '@ohos.commonEvent' -import Want from '@ohos.application.Want'; -import rpc from "@ohos.rpc"; - -var conn = -1; -function publishCallBackOne () { - console.log("========Publish CallBack AMS_ConnectAbility_0100_commonEvent========"); -} -function publishCallBackTwo () { - console.log("========Publish CallBack AMS_ConnectAbility_0200_commonEvent========"); -} -function publishCallBackThree () { - console.log("========Publish CallBack AMS_ConnectAbility_0300_commonEvent========"); -} -function publishCallBackFour () { - console.log("========Publish CallBack AMS_ConnectAbility_0400_commonEvent========"); -} -function publishCallBackFive () { - console.log("========Publish CallBack AMS_ConnectAbility_0500_commonEvent========"); -} -function publishCallBackSix () { - console.log("========Publish CallBack AMS_ConnectAbility_0600_commonEvent========"); -} -function publishCallBackzero () { - console.log("========Publish CallBack AMSc_disonnectAbility_0100_commonEvent========"); -} -function publishCallBackttwo () { - console.log("========Publish CallBack AMSc_disonnectAbility_0200_commonEvent========"); -} - -function onConnectCallback(element, remote) { - console.log('onConnectCallback====> element=' + JSON.stringify(element)); - console.log('onConnectCallback====> remote=' + JSON.stringify(remote)); - } - - function onDisconnectCallback(element) { - console.log('onDisconnectCallback====> element=' + JSON.stringify(element)); - } - - function onFailedCallback(code) { - console.log('onFailedCallback====> code=' + JSON.stringify(code)) - } -export default class ServiceAbility extends ServiceExtension { - onCreate(want:Want) { - console.log('ServiceAbility onCreate, want: ' + want.abilityName); - } - - onRequest(want, startId) { - console.log('ServiceAbility onRequest, want: ' + want.abilityName + ', startId: ' + startId); - - console.log('ServiceAbility registerApplicationStateObserver begin'); - console.log('ServiceAbility registerApplicationStateObserver end, conn: ' + conn); - } - - onConnect(want) { - console.log('ServiceAbility onConnect, want:' + want.abilityName); - let extensionContext = this.context - if (want.action == "one") { - commonEvent.publish("AMS_ConnectAbility_0100_commonEvent", publishCallBackOne); - } - ; - if (want.action == "two") { - commonEvent.publish("AMS_ConnectAbility_0200_commonEvent", publishCallBackTwo); - } - ; - if (want.action == "Three") { - commonEvent.publish("AMS_ConnectAbility_0300_commonEvent", publishCallBackThree); - } - ; - if (want.action == "Four") { - commonEvent.publish("AMS_ConnectAbility_0400_commonEvent", publishCallBackFour); - } - ; - if (want.action == "Five") { - commonEvent.publish("AMS_ConnectAbility_0500_commonEvent", publishCallBackFive); - } - ; - if (want.action == "Six") { - commonEvent.publish("AMS_ConnectAbility_0600_commonEvent", publishCallBackSix); - } - ; - if (want.action == "Seven") { - extensionContext.connectAbility( - { - bundleName: "com.example.actsmanyusersabilitytest", - abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility2", - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - } - ); - }; - if (want.action == "Eight") { - extensionContext.connectAbility( - { - bundleName: "com.example.actsmanyusersabilitytesta", - abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility3", - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - } - ); - }; - if (want.action == "Nine") { - console.log('connectAbility 111'); - let num = this.context.connectAbility( - { - bundleName: 'com.example.actsmanyusersabilitytest', - abilityName: 'com.example.actsmanyusersabilitytest.ServiceAbility2' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - setTimeout(()=>{ - this.context.disconnectAbility(num).then(()=>{ - console.log('in disconnectAbility'); - }) - },1000) - - }; - if (want.action == "Ten") { - console.log('connectAbility 222'); - let num = this.context.connectAbility( - { - bundleName: 'com.example.actsmanyusersabilitytest', - abilityName: 'com.example.actsmanyusersabilitytest.ServiceAbility2' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - setTimeout(()=>{ - this.context.disconnectAbility(num).then(()=>{ - console.log('in disconnectAbility2'); - }) - },1000) - - }; - if (want.action == "Ten one") { - console.log('connectAbility 333'); - let num = this.context.connectAbility( - { - bundleName: 'com.example.actsmanyusersabilitytest', - abilityName: 'com.example.actsmanyusersabilitytest.ServiceAbility2' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - setTimeout(()=>{ - this.context.disconnectAbility(2222).then(()=>{ - console.log('in disconnectAbility3'); - }) - },1000) - - }; - if (want.action == "Ten two") { - console.log('connectAbility 444'); - let num = this.context.connectAbility( - { - bundleName: 'com.example.actsmanyusersabilitytest', - abilityName: 'com.example.actsmanyusersabilitytest.ServiceAbility2' - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - }) - setTimeout(()=>{ - this.context.disconnectAbility(2222).then(()=>{ - console.log('in disconnectAbility4'); - }) - },1000) - - }; - return new rpc.RemoteObject('connect'); - } - - onDisconnect(want) { - console.log('ServiceAbility onDisconnect, want:' + want.abilityName); - commonEvent.publish("AMSc_disonnectAbility_0100_commonEvent",publishCallBackzero); - commonEvent.publish("AMSc_disonnectAbility_0200_commonEvent",publishCallBackttwo); - } - - onDestroy() { - console.log('ServiceAbility onDestroy'); - } -} - diff --git a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility/service.ts deleted file mode 100644 index b49731a41..000000000 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility/service.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* -* 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. -*/ -export default { - onStart() { - console.info('ServiceAbility onStart'); - }, - onStop() { - console.info('ServiceAbility onStop'); - }, - onCommand(want, startId) { - console.info('ServiceAbility onCommand'); - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts deleted file mode 100644 index 737e70468..000000000 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2021 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 ServiceExtension from '@ohos.application.ServiceExtensionAbility' -import commonEvent from "@ohos.commonEvent" -import Want from '@ohos.application.Want'; -import rpc from "@ohos.rpc"; - -export default class ServiceAbility2 extends ServiceExtension { - onCreate(want:Want) { - console.log('ServiceAbility2 onCreate'); - globalThis.abilityWant = want; - } - - onDestory(){ - console.log('ServiceAbility2 onDestory'); - } - - onRequest(want,startId) { - console.log('ServiceAbility2 onRequest'); - } - - onConnect(want) { - console.log('ServiceAbility2 onConnect'); - commonEvent.publish("AMS_ConnectAbility_0700_commonEvent", () => { - console.log("publish Publish AMS_ConnectAbility_0700_commonEvent callback"); - }) - commonEvent.publish("AMS_ConnectAbility_0900_commonEvent", () => { - console.log("publish Publish AMS_ConnectAbility_0900_commonEvent callback"); - }) - commonEvent.publish("AMS_ConnectAbility_1000_commonEvent", () => { - console.log("publish Publish AMS_ConnectAbility_1000_commonEvent callback"); - }) - commonEvent.publish("AMS_ConnectAbility_1100_commonEvent", () => { - console.log("publish Publish AMS_ConnectAbility_1100_commonEvent callback"); - }) - commonEvent.publish("AMS_ConnectAbility_1200_commonEvent", () => { - console.log("publish Publish AMS_ConnectAbility_1200_commonEvent callback"); - }) - return new rpc.RemoteObject('connect'); - } - - - onDisconnect(want) { - console.log('ServiceAbility2 onDisconnect, want:' + want.abilityName); - } - - onDestroy() { - console.log('ServiceAbility2 onDestroy'); - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility2/service.ts b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility2/service.ts deleted file mode 100644 index 340a610cb..000000000 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/ServiceAbility2/service.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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. - */ -export default { - onStart() { - console.info('ServiceAbility2 onStart'); - }, - onStop() { - console.info('ServiceAbility2 onStop'); - }, - onCommand(want, startId) { - console.info('ServiceAbility2 onCommand'); - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/TestAbility/TestAbility.ts deleted file mode 100644 index 4f101c99c..000000000 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/TestAbility/TestAbility.ts +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 Ability from '@ohos.app.ability.UIAbility' - -export default class TestAbility extends Ability { - onCreate(want, launchParam) { - console.log('TestAbility onCreate') - } - - onDestroy() { - console.log('TestAbility onDestroy') - } - - onWindowStageCreate(windowStage) { - console.log('TestAbility onWindowStageCreate') - windowStage.loadContent("TestAbility/pages/index", (err, data) => { - if (err.code) { - console.error('Failed to load the content. Cause:' + JSON.stringify(err)); - return; - } - console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) - }); - - globalThis.abilityContext = this.context; - } - - onWindowStageDestroy() { - console.log('TestAbility onWindowStageDestroy') - } - - onForeground() { - console.log('TestAbility onForeground') - } - - onBackground() { - console.log('TestAbility onBackground') - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/TestAbility/pages/index.ets b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/TestAbility/pages/index.ets deleted file mode 100644 index fae969f98..000000000 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/TestAbility/pages/index.ets +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2021 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 router from '@ohos.router'; - -@Entry -@Component -struct Index { - aboutToAppear() { - console.info('TestAbility index aboutToAppear') - } - @State message: string = 'Hello World' - build() { - Row() { - Column() { - Text(this.message) - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('next page') - .fontSize(20) - .fontWeight(FontWeight.Bold) - }.type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .width('35%') - .height('5%') - .onClick(()=>{ - }) - } - .width('100%') - } - .height('100%') - } - } \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts deleted file mode 100644 index 4eaf1e887..000000000 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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 TestRunner from '@ohos.application.testRunner' -import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' - -var abilityDelegator = undefined -var abilityDelegatorArguments = undefined - -function translateParamsToString(parameters) { - const keySet = new Set([ - '-s class', '-s notClass', '-s suite', '-s it', - '-s level', '-s testType', '-s size', '-s timeout', - '-s dryRun' - ]) - let targetParams = ''; - for (const key in parameters) { - if (keySet.has(key)) { - targetParams = `${targetParams} ${key} ${parameters[key]}` - } - } - return targetParams.trim() -} - -async function onAbilityCreateCallback() { - console.log("onAbilityCreateCallback"); -} - -async function addAbilityMonitorCallback(err: any) { - console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) -} - -export default class OpenHarmonyTestRunner implements TestRunner { - constructor() { - } - - onPrepare() { - console.info("OpenHarmonyTestRunner OnPrepare ") - } - - async onRun() { - console.log('OpenHarmonyTestRunner onRun run') - abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' - let lMonitor = { - abilityName: testAbilityName, - onAbilityCreate: onAbilityCreateCallback, - }; - abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) - var cmd = 'aa start -d 0 -a com.example.actsmanyusersabilitytest.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName - cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) - var debug = abilityDelegatorArguments.parameters["-D"] - if (debug == 'true') - { - cmd += ' -D' - } - console.info('cmd : '+cmd) - abilityDelegator.executeShellCommand(cmd, - (err: any, d: any) => { - console.info('executeShellCommand : err : ' + JSON.stringify(err)); - console.info('executeShellCommand : data : ' + d.stdResult); - console.info('executeShellCommand : data : ' + d.exitCode); - }) - console.info('OpenHarmonyTestRunner onRun end') - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/test/List.test.ets b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/test/List.test.ets deleted file mode 100644 index 71eb7f381..000000000 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/test/List.test.ets +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 abilityTest from './manyusersabilitytest.test.ets' -export default function testsuite() { - - abilityTest() -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets deleted file mode 100644 index 7614ed74e..000000000 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets +++ /dev/null @@ -1,912 +0,0 @@ -/* - * 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 { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" -import commonEvent from '@ohos.commonEvent' - - -var subscriberInfoStartAbility_0100 = { - events: ["AMS_ConnectAbility_0100_commonEvent"], -}; -var subscriberInfoStartAbility_0200 = { - events: ["AMS_ConnectAbility_0200_commonEvent"], -}; -var subscriberInfoStartAbility_0300 = { - events: ["AMS_ConnectAbility_0300_commonEvent"], -}; -var subscriberInfoStartAbility_0400 = { - events: ["AMS_ConnectAbility_0400_commonEvent"], -}; -var subscriberInfoStartAbility_0500 = { - events: ["AMS_ConnectAbility_0500_commonEvent"], -}; -var subscriberInfoStartAbility_0600 = { - events: ["AMS_ConnectAbility_0600_commonEvent"], -}; -var subscriberInfoStartAbility_0700 = { - events: ["AMS_ConnectAbility_0700_commonEvent"], -}; -var subscriberInfoStartAbility_0800 = { - events: ["AMS_ConnectAbility_0800_commonEvent"], -}; -var subscriberInfoStartAbility_0900 = { - events: ["AMS_ConnectAbility_0900_commonEvent"], -}; - -var subscriberInfoStartAbility_1000 = { - events: ["AMS_ConnectAbility_1000_commonEvent"], -}; - -var subscriberInfoStartAbility_1100 = { - events: ["AMS_ConnectAbility_1100_commonEvent"], -}; - -var subscriberInfoStartAbility_1200 = { - events: ["AMS_ConnectAbility_1200_commonEvent"], -}; -var unsubscriberInfoStartAbility_0100 = { - events: ["AMSc_disonnectAbility_0100_commonEvent"], -}; -var unsubscriberInfoStartAbility_0200 = { - events: ["AMSc_disonnectAbility_0200_commonEvent"], -}; - - -const START_ABILITY_TIMEOUT = 1000; -globalThis.number = 0; - -function onConnectCallback(element, remote) { - console.log(' ACTS_ConnectAbility onConnectCallback====> element=' + JSON.stringify(element)); - console.log(' ACTS_ConnectAbility onConnectCallback====> remote=' + JSON.stringify(remote)); - // setTimeout(()=> { - // console.log('====>in timeout'); - // console.debug("====>flag is====>" + JSON.stringify(flag)); - // if(flag == true) { - // console.debug('ACTS_ThirdPartyExtensionStartAbility_0600 - timeout'); - // commonEvent.unsubscribe(Subscriber, UnSubscribeCallback); - // } - // }, 1000); -} -function onDisconnectCallback(element) { - console.log('ACTS_ConnectAbility onDisconnectCallback====> element=' + JSON.stringify(element)); -} - -function onFailedCallback(code) { - console.log('ACTS_ConnectAbility onFailedCallback====> code=' + JSON.stringify(code)) -} - -export default function abilityTest() { - describe('manyuserability', function () { - - function onFailedCallBack(code) { - console.log('ACTS_ConnectAbility_0200 Connectability errcode:' + code); - } - - /* - * @tc.number : ACTS_ThirdPartyConnectAbility_0100 - * @tc.name : connect ability - * @tc.desc : Start an ability with the parameter startability with options failed.(callback) - */ - it('ACTS_ThirdPartyConnectAbility_0100', 0, async function (done) { - console.log('ACTS_ThirdPartyConnectAbility_0100====ACTS_ThirdPartyConnectAbility_0100 7 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_0100_commonEvent"); - console.debug("====>ACTS_ThirdPartyConnectAbility_0100 5 "); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ThirdPartyConnectAbility_0100 6 "); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - } - - commonEvent.createSubscriber(subscriberInfoStartAbility_0100).then(async (data) => { - console.debug("====>ACTS_ThirdPartyConnectAbility_0100 2 Subscriber1====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack1====>"); - done(); - } - - function timeout() { - expect().assertFail(); - console.debug('ACTS_ThirdPartyConnectAbility_0100 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ThirdPartyConnectAbility_0100 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsmanyusersabilitytest", - abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", - action: "one", - },{ - onConnect:onConnectCallback, - onDisconnect:onDisconnectCallback, - onFailed: onFailedCallback - } - ); - - console.debug("====>ACTS_ThirdPartyConnectAbility_0100 4 "); - - }) - - - - it('ACTS_ThirdPartyConnectAbility_0200', 0, async function (done) { - console.log('ACTS_ThirdPartyConnectAbility_0200====ACTS_ThirdPartyConnectAbility_0200 Subscribe CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_0200_commonEvent"); - - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - } - - commonEvent.createSubscriber(subscriberInfoStartAbility_0200).then(async (data) => { - console.debug("====>ACTS_ThirdPartyConnectAbility_0200 Create Subscriber====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - - function unSubscribeCallback() { - console.debug("====>ACTS_ThirdPartyConnectAbility_0200 UnSubscribe CallBack====>"); - done(); - } - - function timeout() { - console.debug('ACTS_ThirdPartyConnectAbility_0200 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - done(); - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsmanyusersabilitytest", - abilityName: "com.example.actsmanyusersabilitytest.ServiceAbilityone", - action: "two", - }, - { - onFailed: onFailedCallBack, - }, - ); - }) - - it('ACTS_ThirdPartyDisconnectAbility_0100', 0, async function (done) { - console.log('ACTS_ThirdPartyDisconnectAbility_0100====ACTS_ThirdPartyDisconnectAbility_0100 5 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0100 6====>"); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0100 6====>"); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - - } - - - commonEvent.createSubscriber(subscriberInfoStartAbility_0300).then(async (data) => { - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0100 2 Subscriber====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack====>"); - setTimeout(() => { - done() - }, 1000) - }; - - function timeout() { - expect().assertFail(); - console.debug('AMS_DonnectAbility_0300 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0100 3====>"); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsmanyusersabilitytest", - abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", - action: "Three", - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - } - ); - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0100 4====>"); - }) - - it('ACTS_ThirdPartyDisconnectAbility_0200', 0, async function (done) { - console.log('ACTS_ThirdPartyDisconnectAbility_0200 1====ACTS_ThirdPartyDisconnectAbility_0200 3 CallBack1 data:====>" + JSON.stringify(data)); - commonEvent.createSubscriber(unsubscriberInfoStartAbility_0100).then(async (data) => { - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0200 6 Subscriber====>"); - subscriberdisconnect = data; - await commonEvent.subscribe(subscriberdisconnect, subscribedisconnectback); - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0200 1111 connectAbility1====>"); - - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0200 1111 connectAbility2====>"); - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0200 66 Subscriber====>"); - globalThis.abilityContext.disconnectServiceExtensionAbility( - 999, - (error, data) => { - console.log('ACTS_ThirdPartyDisconnectAbility_0200 5 DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - }) - } - - function subscribedisconnectback(err, data) { - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0200 7 CallBack2 data:====>" + JSON.stringify(data)); - commonEvent.unsubscribe(subscriberdisconnect, () => { - console.debug('unsubscribe subscriberdisconnect'); - - commonEvent.unsubscribe(subscriber, () => { - console.debug('unsubscribe subscriber') - clearTimeout(id); - expect().assertFail(); - done(); - }) - }) - } - - function timeout() { - console.debug('ACTS_ThirdPartyDisconnectAbility_0200 8 timeout'); - commonEvent.unsubscribe(subscriberdisconnect, () => { - console.debug('unsubscribe subscriberdisconnect'); - commonEvent.unsubscribe(subscriber, () => { - console.debug('unsubscribe subscriber') - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('ACTS_ThirdPartyDisconnectAbility_0200 9 DisconnectAbility result errCode : ' + error.code + " data: " + data) - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0200 99 Subscriber====>"); - setTimeout(() => { - done(); - }, 1000) - }); - }) - }) - - - } - - commonEvent.createSubscriber(subscriberInfoStartAbility_0400).then(async (data) => { - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0200 10 Subscriber====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack) - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsmanyusersabilitytest", - abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", - action: "Four", - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - } - ); - console.debug("====>connId is:====>" + JSON.stringify(connId)); - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0200 1010 Subscriber====>"); - }) - - - function unSubscribeCallback() { - console.debug("====>ACTS_DisconnectAbility_0200 1111 UnSubscribe CallBack====>"); - done(); - } - - }) - - it('ACTS_ThirdPartyDisconnectAbility_0300', 0, async function (done) { - console.log('ACTS_ThirdPartyDisconnectAbility_0300====ACTS_ThirdPartyDisconnectAbility_0300 4 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_0500_commonEvent"); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('ACTS_ThirdPartyDisconnectAbility_0300 5 DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - - } - - - commonEvent.createSubscriber(subscriberInfoStartAbility_0500).then(async (data) => { - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0300 1 Subscriber====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - - function unSubscribeCallback() { - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0300 6 CallBack====>"); - setTimeout(() => { - done(); - }, 1000) - } - - function timeout() { - expect().assertFail(); - console.debug('ACTS_ThirdPartyDisconnectAbility_0300 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('ACTS_ThirdPartyDisconnectAbility_0300 7 DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0300 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsmanyusersabilitytest", - abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", - action: "Five", - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - } - ); - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0300 4 "); - }) - it('ACTS_ThirdPartyDisconnectAbility_0400', 0, async function (done) { - console.log('ACTS_ThirdPartyDisconnectAbility_0400 1====ACTS_ThirdPartyDisconnectAbility_0400 3 CallBack1 data:====>" + JSON.stringify(data)); - commonEvent.createSubscriber(unsubscriberInfoStartAbility_0200).then(async (data) => { - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0400 6 Subscriber====>"); - subscriberdisconnect = data; - await commonEvent.subscribe(subscriberdisconnect, subscribedisconnectback); - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0400 1111 connectAbility1====>"); - - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0400 1111 connectAbility2====>"); - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0400 66 Subscriber====>"); - globalThis.abilityContext.disconnectServiceExtensionAbility( - 999, - (error, data) => { - console.log('ACTS_ThirdPartyDisconnectAbility_0400 5 DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - }) - } - - function subscribedisconnectback(err, data) { - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0400 7 CallBack2 data:====>" + JSON.stringify(data)); - commonEvent.unsubscribe(subscriberdisconnect, () => { - console.debug('unsubscribe subscriberdisconnect'); - - commonEvent.unsubscribe(subscriber, () => { - console.debug('unsubscribe subscriber') - clearTimeout(id); - expect().assertFail(); - done(); - }) - }) - } - - function timeout() { - console.debug('ACTS_ThirdPartyDisconnectAbility_0400 8 timeout'); - commonEvent.unsubscribe(subscriberdisconnect, () => { - console.debug('unsubscribe subscriberdisconnect'); - commonEvent.unsubscribe(subscriber, () => { - console.debug('unsubscribe subscriber') - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('ACTS_ThirdPartyDisconnectAbility_0400 9 DisconnectAbility result errCode : ' + error.code + " data: " + data) - console.debug("====>ACTS_DisconnectAbility_0200 99 Subscriber====>"); - setTimeout(() => { - done(); - }, 1000) - }); - }) - }) - - - } - - commonEvent.createSubscriber(subscriberInfoStartAbility_0600).then(async (data) => { - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0400 10 Subscriber====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack) - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsmanyusersabilitytest", - abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", - action: "Six", - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - } - ); - console.debug("====>connId is:====>" + JSON.stringify(connId)); - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0400 1010 Subscriber====>"); - }) - - - function unSubscribeCallback() { - console.debug("====>ACTS_ThirdPartyDisconnectAbility_0400 1111 UnSubscribe CallBack====>"); - done(); - } - - }) - it('ACTS_ThirdPartyExtensionConnectAbility_0100', 0, async function (done) { - console.log('ACTS_ThirdPartyExtensionConnectAbility_0100====ACTS_ThirdPartyExtensionConnectAbility_0100 7 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_0700_commonEvent"); - console.debug("====>ACTS_ThirdPartyExtensionConnectAbility_0100 5 "); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ThirdPartyExtensionConnectAbility_0100 6 "); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - - } - - - commonEvent.createSubscriber(subscriberInfoStartAbility_0700).then(async (data) => { - console.debug("====>ACTS_ThirdPartyExtensionConnectAbility_0100 2 Subscriber1====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack1====>"); - setTimeout(() => { - done(); - }, 1000) - } - - function timeout() { - expect().assertFail(); - console.debug('ACTS_ExtensionConnectAbility_0100 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ThirdPartyExtensionConnectAbility_0100 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsmanyusersabilitytest", - abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", - action: "Seven", - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - } - ); - console.debug("====>ACTS_ThirdPartyExtensionConnectAbility_0100 4 "); - - }) - - it('ACTS_ThirdPartyExtensionConnectAbility_0200', 0, async function (done) { - console.log('ACTS_ThirdPartyExtensionConnectAbility_0200====ACTS_ThirdPartyExtensionConnectAbility_0200 7 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_0800_commonEvent"); - console.debug("====>ACTS_ThirdPartyExtensionConnectAbility_0200 5 "); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ThirdPartyExtensionConnectAbility_0200 6 "); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - - } - - - commonEvent.createSubscriber(subscriberInfoStartAbility_0800).then(async (data) => { - console.debug("====>ACTS_ThirdPartyExtensionConnectAbility_0200 2 Subscriber1====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack1====>"); - setTimeout(() => { - done(); - }, 1000) - } - - function timeout() { - console.debug('ACTS_ThirdPartyExtensionConnectAbility_0200 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ThirdPartyExtensionConnectAbility_0200 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsmanyusersabilitytest", - abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", - action: "Eight", - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - } - ); - console.debug("====>ACTS_ThirdPartyExtensionConnectAbility_0200 4 "); - - }) - it('ACTS_ThirdPartyExtensionDisconnectAbility_0100', 0, async function (done) { - console.log('ACTS_ThirdPartyExtensionDisconnectAbility_0100====ACTS_ThirdPartyExtensionDisconnectAbility_0100 7 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_0900_commonEvent"); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0100 5 "); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0100 6 "); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - - } - - - commonEvent.createSubscriber(subscriberInfoStartAbility_0900).then(async (data) => { - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0100 2 Subscriber1====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack1====>"); - setTimeout(() => { - done(); - }, 1000) - } - - function timeout() { - expect().assertFail(); - console.debug('ACTS_ThirdPartyExtensionDisconnectAbility_0100 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0100 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsmanyusersabilitytest", - abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", - action: "Nine", - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - } - ); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0100 4 "); - - }) - - it('ACTS_ThirdPartyExtensionDisconnectAbility_0200', 0, async function (done) { - console.log('ACTS_ThirdPartyExtensionDisconnectAbility_0200====ACTS_ThirdPartyExtensionDisconnectAbility_0200 7 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_1000_commonEvent"); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0200 5 "); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0200 6 "); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - - } - - - commonEvent.createSubscriber(subscriberInfoStartAbility_1000).then(async (data) => { - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0200 2 Subscriber1====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack1====>"); - setTimeout(() => { - done(); - }, 1000) - } - - function timeout() { - expect().assertFail(); - console.debug('ACTS_ThirdPartyExtensionDisconnectAbility_0200 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0200 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsmanyusersabilitytest", - abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", - action: "Ten", - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - } - ); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0200 4 "); - - }) - - it('ACTS_ThirdPartyExtensionDisconnectAbility_0300', 0, async function (done) { - console.log('ACTS_ThirdPartyExtensionDisconnectAbility_0300====ACTS_ThirdPartyExtensionDisconnectAbility_0300 7 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_1100_commonEvent"); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0200 5 "); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0300 6 "); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - - } - - - commonEvent.createSubscriber(subscriberInfoStartAbility_1100).then(async (data) => { - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0300 2 Subscriber1====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack1====>"); - setTimeout(() => { - done(); - }, 1000) - } - - function timeout() { - console.debug('ACTS_ThirdPartyExtensionDisconnectAbility_0300 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0300 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsmanyusersabilitytest", - abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", - action: "Ten one", - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - } - ); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0300 4 "); - - }) - - it('ACTS_ThirdPartyExtensionDisconnectAbility_0400', 0, async function (done) { - console.log('ACTS_ThirdPartyExtensionDisconnectAbility_0400====ACTS_ThirdPartyExtensionDisconnectAbility_0400 7 CallBack data:====>" + JSON.stringify(data)); - clearTimeout(id); - expect(data.event).assertEqual("AMS_ConnectAbility_1200_commonEvent"); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0400 5 "); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - } - ); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0400 6 "); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - - } - - - commonEvent.createSubscriber(subscriberInfoStartAbility_1200).then(async (data) => { - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0400 2 Subscriber1====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - }) - - function unSubscribeCallback() { - console.debug("====>UnSubscribe CallBack1====>"); - setTimeout(() => { - done(); - }, 1000) - } - - function timeout() { - console.debug('ACTS_ThirdPartyExtensionDisconnectAbility_0400 timeout'); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0400 3 "); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.actsmanyusersabilitytest", - abilityName: "com.example.actsmanyusersabilitytest.ServiceAbility", - action: "Ten two", - }, { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback - } - ); - console.debug("====>ACTS_ThirdPartyExtensionDisconnectAbility_0400 4 "); - - }) - - - - }) -} - - diff --git a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/module.json b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/module.json deleted file mode 100644 index 5dcab6729..000000000 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/module.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.actsmanyusersabilitytest.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ] - } - ], - "extensionAbilities": [ - { - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "name": "com.example.actsmanyusersabilitytest.ServiceAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - }, - { - "srcEntrance": "./ets/ServiceAbility2/ServiceAbility2.ts", - "name": "com.example.actsmanyusersabilitytest.ServiceAbility2", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - } - ] - } -} diff --git a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/resources/base/element/string.json deleted file mode 100644 index d75325f3c..000000000 --- a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/resources/base/element/string.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "string": [ - { - "name": "phone_entry_dsc", - "value": "i am an entry for phone" - }, - { - "name": "phone_entry_main", - "value": "the phone entry ability" - }, - { - "name": "entry_label", - "value": "ActsContextTest" - }, - { - "name": "form_description", - "value": "my form" - }, - { - "name": "serviceability_description", - "value": "my whether" - }, - { - "name": "description_application", - "value": "demo for test" - }, - { - "name": "app_name", - "value": "Demo" - } - ] -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/actsusers/actsmanyuserthirdabilitytest/entry/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6790 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 { - console.log("mxh startServiceExtAbility begin"); - var want = { - "bundleName": "com.example.ohosproject.hmservice", - "abilityName": "ServiceExtAbility", - } - context.startAbility(want).then((data) => { - console.info("mxh startAbility success:" + JSON.stringify(data)); - }).catch((error) => { - console.error("mxh startAbility failed:" + JSON.stringify(error)); - }) - console.log("mxh startServiceExtAbility end"); - }) - - globalThis.connectServiceExtAbility = (() => { - console.log("mxh connectServiceExtAbility begin"); - var want = { - "bundleName": "com.example.ohosproject.hmservice", - "abilityName": "ServiceExtAbility", - } - connection = context.connectServiceExtensionAbility(want, options); - console.log("mxh connectServiceExtAbility end, connection:" + connection); - }) - - globalThis.disconnectServiceExtAbility = (() => { - console.log("mxh disconnectServiceExtAbility begin"); - context.disconnectServiceExtensionAbility(connection).then((data) => { - console.info("mxh startAbility success:" + JSON.stringify(data)); - }).catch((error) => { - console.error("mxh startAbility failed:" + JSON.stringify(error)); - }); - console.log("mxh disconnectServiceExtAbility end, connection:" + connection); - }) - - windowStage.setUIContent(this.context, 'pages/index/index', null); - } - - onWindowStageDestroy() { - console.log('mxh MainAbility onWindowStageDestroy is called'); - } - - onForeground() { - console.log('mxh MainAbility onForeground is called'); - } - - onBackground() { - console.log('mxh MainAbility onBackground is called'); - } -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/ServiceAbility/ServiceAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/ServiceAbility/ServiceAbility.ts deleted file mode 100644 index f766470d8..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/ServiceAbility/ServiceAbility.ts +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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 Extension from '@ohos.application.ServiceExtensionAbility' -import commonEvent from '@ohos.commonEvent' -import Want from '@ohos.application.Want'; -import rpc from '@ohos.rpc'; - -export default class ServiceExtAbility extends Extension { - onCreate(want) { - console.info('mxh ServiceAbility onCreate**'); - - } - - onRequest(want, startId) { - console.info('mxh ServiceAbility onRequest**'); - } - - onConnect(want:Want) { - console.info('mxh ServiceAbility onConnect**'); - commonEvent.publish("ACTS_ConnectAbility_0100_CommonEvent", { - parameters: { - extensionAbilityInfo : JSON.stringify(this.context.extensionAbilityInfo), - } - } ,(err) => { - console.log("Demo Publish CallBack MainAbility_Start_CommonEvent") - }); - console.log('Demo SerivceAbilityServer OnConnect start 1'); - return new rpc.RemoteObject('connect'); - } - - onDisconnect(want) { - console.info('mxh ServiceAbility onDisConnect**'); - } - - onDestroy() { - console.info('mxh ServiceAbility onDestroy**'); - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/ServiceAbility/service.ts deleted file mode 100644 index b49731a41..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/ServiceAbility/service.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* -* 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. -*/ -export default { - onStart() { - console.info('ServiceAbility onStart'); - }, - onStop() { - console.info('ServiceAbility onStop'); - }, - onCommand(want, startId) { - console.info('ServiceAbility onCommand'); - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/pages/index/index.ets b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/pages/index/index.ets deleted file mode 100644 index 64c878fd5..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/pages/index/index.ets +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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 file from '@system.file'; - -@Entry -@Component -struct Index { - - aboutToAppear() { - console.info("start run testcase!!!!") - } - - build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text('pmsystemappa') - .fontSize(50) - .fontWeight(FontWeight.Bold) - .margin({ - top: 20 - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/pages/second/second.ets b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/pages/second/second.ets deleted file mode 100644 index 33d9ae452..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/ets/pages/second/second.ets +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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 router from '@system.router'; - -@Entry -@Component -struct Second { - private content: string = "Second Page" - - build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text(`${this.content}`) - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('back to index') - .fontSize(20) - .fontWeight(FontWeight.Bold) - }.type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .onClick(() => { - router.back() - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/module.json deleted file mode 100644 index 65c096086..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/module.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.acts.pmvendorappservice.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ] - } - ], - "extensionAbilities": [ - { - "name": "ServiceExtAbility", - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "permissions": [ - "ohos.permission.USE_BLUETOOTH" - ], - "metadata": [ - { - "name": "ohos.extension.form", - "value": "MainAbility", - "resource": "@profile:form_config" - } - ], - "visible": true, - "type": "service" - } - ], - "requestPermissions": [ - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.GET_RUNNING_INFO", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name":"ohos.permission.CLEAN_APPLICATION_DATA", - "reason":"need use ohos.permission.CLEAN_APPLICATION_DATA" - } - ] - } -} diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/resources/base/element/string.json deleted file mode 100644 index d75325f3c..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/resources/base/element/string.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "string": [ - { - "name": "phone_entry_dsc", - "value": "i am an entry for phone" - }, - { - "name": "phone_entry_main", - "value": "the phone entry ability" - }, - { - "name": "entry_label", - "value": "ActsContextTest" - }, - { - "name": "form_description", - "value": "my form" - }, - { - "name": "serviceability_description", - "value": "my whether" - }, - { - "name": "description_application", - "value": "demo for test" - }, - { - "name": "app_name", - "value": "Demo" - } - ] -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/entry/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6790 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 delta 358 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 { - console.log("MainAbility Publish CallBack MainAbility_Start_CommonEvent") - }); - console.log('stub SerivceAbilityServer OnConnect start 2'); - - } - return new rpc.RemoteObject('connect'); - } - - onDisconnect(want) { - console.log('ServiceAbility onDisconnect, want:' + want.abilityName); - } - - onDestroy() { - console.log('ServiceAbility onDestroy'); - } -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/ServiceAbility/service.ts deleted file mode 100644 index b49731a41..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/ServiceAbility/service.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* -* 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. -*/ -export default { - onStart() { - console.info('ServiceAbility onStart'); - }, - onStop() { - console.info('ServiceAbility onStop'); - }, - onCommand(want, startId) { - console.info('ServiceAbility onCommand'); - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/pages/index/index.ets b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/pages/index/index.ets deleted file mode 100644 index 64c878fd5..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/pages/index/index.ets +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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 file from '@system.file'; - -@Entry -@Component -struct Index { - - aboutToAppear() { - console.info("start run testcase!!!!") - } - - build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text('pmsystemappa') - .fontSize(50) - .fontWeight(FontWeight.Bold) - .margin({ - top: 20 - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/pages/second/second.ets b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/pages/second/second.ets deleted file mode 100644 index 33d9ae452..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/ets/pages/second/second.ets +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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 router from '@system.router'; - -@Entry -@Component -struct Second { - private content: string = "Second Page" - - build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text(`${this.content}`) - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('back to index') - .fontSize(20) - .fontWeight(FontWeight.Bold) - }.type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .onClick(() => { - router.back() - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/module.json deleted file mode 100644 index 5cd9d7a37..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/module.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "com.example.staticextensioninfotest.MainAbility", - "deviceTypes": [ - "default", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.staticextensioninfotest.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ] - } - ], - "extensionAbilities": [ - { - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "name": "com.example.staticextensioninfotest.ServiceAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - } - ], - "requestPermissions": [ - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS", - "reason":"need use ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS" - }, - { - "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name":"ohos.permission.GET_RUNNING_INFO", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - } - ] - } -} diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/resources/base/element/string.json deleted file mode 100644 index d75325f3c..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/resources/base/element/string.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "string": [ - { - "name": "phone_entry_dsc", - "value": "i am an entry for phone" - }, - { - "name": "phone_entry_main", - "value": "the phone entry ability" - }, - { - "name": "entry_label", - "value": "ActsContextTest" - }, - { - "name": "form_description", - "value": "my form" - }, - { - "name": "serviceability_description", - "value": "my whether" - }, - { - "name": "description_application", - "value": "demo for test" - }, - { - "name": "app_name", - "value": "Demo" - } - ] -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/entry/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6790 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 Y0jIQKqpXab7ytkO07*qoM6N<$f;yQ2zW@LL diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn deleted file mode 100644 index b395e853b..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn +++ /dev/null @@ -1,43 +0,0 @@ -# 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("//test/xts/tools/build/suite.gni") - -ohos_js_hap_suite("ActsAmsStaticExtensionInfoTest") { - hap_profile = "entry/src/main/module.json" - js_build_mode = "debug" - deps = [ - ":actsamsstaticextensiontnfotest_js_assets", - ":actsamsstaticextensiontnfotest_resources", - ] - ets2abc = true - certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAmsStaticExtensionInfoTest" - subsystem_name = "ability" - part_name = "ability_runtime" -} - -ohos_app_scope("actsamsstaticextensiontnfotest_app_profile") { - app_profile = "AppScope/app.json" - sources = [ "AppScope/resources" ] -} - -ohos_js_assets("actsamsstaticextensiontnfotest_js_assets") { - source_dir = "entry/src/main/ets" -} - -ohos_resources("actsamsstaticextensiontnfotest_resources") { - sources = [ "entry/src/main/resources" ] - deps = [ ":actsamsstaticextensiontnfotest_app_profile" ] - hap_profile = "entry/src/main/module.json" -} diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/Test.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/Test.json deleted file mode 100644 index 24a9b376c..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/Test.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "OHJSUnitTest", - "test-timeout": "180000", - "bundle-name": "com.example.staticextensioninfo", - "module-name": "phone", - "shell-timeout": "600000", - "testcase-timeout": 70000 - }, - "kits": [ - { - "test-file-name": [ - "ActsAmsStaticExtensionInfoTest.hap", - "ActsAmsStaticExtensionInfoRelyHap.hap", - "ActsAmsExtensionModuleRelyHap.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - }, - { - "type": "ShellKit", - "run-command": [ - "remount", - "mkdir /data/test" - ] - }, - { - "type": "PushKit", - "push": [ - "ActsAmsStaticExtensionInfoTest.hap->/data/ActsAmsStaticExtensionInfoTest.hap", - "ActsAmsStaticExtensionInfoRelyHap.hap->/data/ActsAmsStaticExtensionInfoRelyHap.hap", - "ActsAmsExtensionModuleRelyHap.hap->/data/ActsAmsExtensionModuleRelyHap.hap" - ] - }, - { - "type": "ShellKit", - "run-command": [ - "chmod 644 /data/test/*.hap" - ] - } - ] -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/Application/AbilityStage.ts deleted file mode 100644 index 41515e203..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/Application/AbilityStage.ts +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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 AbilityStage from "@ohos.app.ability.AbilityStage" - -export default class MyAbilityStage extends AbilityStage { - onCreate() { - console.log("MyAbilityStage onCreate") - globalThis.stageContext = this.context; - } -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/MainAbility.ts deleted file mode 100644 index 5e7a70c58..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/MainAbility.ts +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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 Ability from '@ohos.app.ability.UIAbility' - -export default class MainAbility extends Ability { - onCreate(want,launchParam){ - // Ability is creating, initialize resources for this ability - console.log("MainAbility onCreate") - globalThis.abilityWant = want; - } - - onDestroy() { - // Ability is destroying, release resources for this ability - console.log("MainAbility onDestroy") - } - - onWindowStageCreate(windowStage) { - // Main window is created, set main page for this ability - console.log("MainAbility onWindowStageCreate") - globalThis.abilityContext = this.context - windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null) - } - - onWindowStageDestroy() { - //Main window is destroyed, release UI related resources - console.log("MainAbility onWindowStageDestroy") - } - - onForeground() { - // Ability has brought to foreground - console.log("MainAbility onForeground") - } - - onBackground() { - // Ability has back to background - console.log("MainAbility onBackground") - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/pages/index/index.ets b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/pages/index/index.ets deleted file mode 100644 index bebda07c2..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/pages/index/index.ets +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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 router from '@ohos.router'; -import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' -import { Hypium } from '@ohos/hypium' -import testsuite from '../../../test/List.test' - - -@Entry -@Component -struct Index { - - aboutToAppear(){ - console.info("start run testcase!!!!") - var abilityDelegator: any - abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - var abilityDelegatorArguments: any - abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - console.info('start run testcase!!!') - Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) - } - - build() { - Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text('Hello World') - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('next page') - .fontSize(25) - .fontWeight(FontWeight.Bold) - }.type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .onClick(() => { - - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/pages/second/second.ets b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/pages/second/second.ets deleted file mode 100644 index f9009a3e8..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/MainAbility/pages/second/second.ets +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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 router from '@system.router'; - -@Entry -@Component -struct Second { - private content: string = "Second Page" - - build() { - Flex({ direction: FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text(`${this.content}`) - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('back to index') - .fontSize(20) - .fontWeight(FontWeight.Bold) - }.type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .onClick(() => { - router.back() - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts deleted file mode 100644 index 8f19229ef..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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 ServiceExtension from '@ohos.application.ServiceExtensionAbility' -import commonEvent from "@ohos.commonEvent"; -import Want from '@ohos.application.Want'; -import rpc from '@ohos.rpc'; - -export default class ServiceAbility extends ServiceExtension { - onCreate(want:Want) { - globalThis.abilityWant = want; - console.log('ServiceAbility onCreate, want: ' + want.abilityName); - } - - onRequest(want, startId) { - console.log('ServiceAbility onRequest, want: ' + want.abilityName + ', startId: ' + startId); - console.log('ServiceAbility registerApplicationStateObserver begin'); - } - - onConnect(want) { - console.log('ServiceAbility onConnect, want:' + want.abilityName); - globalThis.extensionContext = this.context - if (want.action == 'getExtensionInfo') { - commonEvent.publish("ACTS_ConnectAbility_0100_CommonEvent", { - parameters: { - hapModuleInfo: JSON.stringify(this.context.currentHapModuleInfo), - applicationInfo: JSON.stringify(this.context.applicationInfo), - } - } ,(err) => { - console.log("MainAbility Publish CallBack MainAbility_Start_CommonEvent") - }); - console.log('stub SerivceAbilityServer OnConnect start 1'); - } - return new rpc.RemoteObject('connect'); - } - - onDisconnect(want) { - console.log('ServiceAbility onDisconnect, want:' + want.abilityName); - } - - onDestroy() { - console.log('ServiceAbility onDestroy'); - } -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/ServiceAbility/service.ts deleted file mode 100644 index b49731a41..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/ServiceAbility/service.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* -* 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. -*/ -export default { - onStart() { - console.info('ServiceAbility onStart'); - }, - onStop() { - console.info('ServiceAbility onStop'); - }, - onCommand(want, startId) { - console.info('ServiceAbility onCommand'); - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/TestAbility/TestAbility.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/TestAbility/TestAbility.ts deleted file mode 100644 index 8028a70f8..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/TestAbility/TestAbility.ts +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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 Ability from '@ohos.app.ability.UIAbility' - -export default class TestAbility extends Ability { - onCreate(want, launchParam) { - console.log('TestAbility onCreate') - } - - onDestroy() { - console.log('TestAbility onDestroy') - } - - onWindowStageCreate(windowStage) { - console.log('TestAbility onWindowStageCreate') - windowStage.loadContent("TestAbility/pages/index", (err, data) => { - if (err.code) { - console.error('Failed to load the content. Cause:' + JSON.stringify(err)); - return; - } - console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data)) - }); - - globalThis.abilityContext = this.context; - } - - onWindowStageDestroy() { - console.log('TestAbility onWindowStageDestroy') - } - - onForeground() { - console.log('TestAbility onForeground') - } - - onBackground() { - console.log('TestAbility onBackground') - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/TestAbility/pages/index.ets b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/TestAbility/pages/index.ets deleted file mode 100644 index b93567f96..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/TestAbility/pages/index.ets +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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 router from '@ohos.router'; - -@Entry -@Component -struct Index { - aboutToAppear() { - console.info('TestAbility index aboutToAppear') - } - @State message: string = 'Hello World' - build() { - Row() { - Column() { - Text(this.message) - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('next page') - .fontSize(20) - .fontWeight(FontWeight.Bold) - }.type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .width('35%') - .height('5%') - .onClick(()=>{ - }) - } - .width('100%') - } - .height('100%') - } - } \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts deleted file mode 100644 index f98a3a5cf..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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 TestRunner from '@ohos.application.testRunner' -import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' - -var abilityDelegator = undefined -var abilityDelegatorArguments = undefined - -function translateParamsToString(parameters) { - const keySet = new Set([ - '-s class', '-s notClass', '-s suite', '-s it', - '-s level', '-s testType', '-s size', '-s timeout', - '-s dryRun' - ]) - let targetParams = ''; - for (const key in parameters) { - if (keySet.has(key)) { - targetParams = `${targetParams} ${key} ${parameters[key]}` - } - } - return targetParams.trim() -} - -async function onAbilityCreateCallback() { - console.log("onAbilityCreateCallback"); -} - -async function addAbilityMonitorCallback(err: any) { - console.info("addAbilityMonitorCallback : " + JSON.stringify(err)) -} - -export default class OpenHarmonyTestRunner implements TestRunner { - constructor() { - } - - onPrepare() { - console.info("OpenHarmonyTestRunner OnPrepare ") - } - - async onRun() { - console.log('OpenHarmonyTestRunner onRun run') - abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() - abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() - var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility' - let lMonitor = { - abilityName: testAbilityName, - onAbilityCreate: onAbilityCreateCallback, - }; - abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback) - var cmd = 'aa start -d 0 -a com.example.staticextensioninfo.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName - cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters) - var debug = abilityDelegatorArguments.parameters["-D"] - if (debug == 'true') - { - cmd += ' -D' - } - console.info('cmd : '+cmd) - abilityDelegator.executeShellCommand(cmd, - (err: any, d: any) => { - console.info('executeShellCommand : err : ' + JSON.stringify(err)); - console.info('executeShellCommand : data : ' + d.stdResult); - console.info('executeShellCommand : data : ' + d.exitCode); - }) - console.info('OpenHarmonyTestRunner onRun end') - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets deleted file mode 100644 index b76402d04..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets +++ /dev/null @@ -1,473 +0,0 @@ -/* - * 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 commonEvent from "@ohos.commonEvent" -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" - -const START_ABILITY_TIMEOUT = 5000; -var subscriberInfoStartAbility_0100 = { - events: ["ACTS_ConnectAbility_0100_CommonEvent"], -}; -var subscriberInfoStartAbility_0200 = { - events: ["ACTS_ConnectAbility_0200_CommonEvent"], -}; - -export default function abilityTest() { - - describe('ActsExtensionAbilityTest', function () { - - /* - * @tc.number: ACTS_getExtensionInfo_0100 - * @tc.name: Start the system permission application to query static information about Extension - * @tc.desc: Enable application ras to query the Extension static information. Verify the query information. - Enable application ras to connect to serviceAbility - */ - it('ACTS_getExtensionInfo_0100', 0, async function (done) { - console.log('ACTS_getExtensionInfo_0100 gyq ====ACTS_getExtensionInfo_0100_Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_ConnectAbility_0100_CommonEvent") { - clearTimeout(id); - checkHapModuleInfo(JSON.parse(data.parameters['hapModuleInfo'])) - checkApplicationInfo(JSON.parse(data.parameters['applicationInfo'])) - expect(data.event).assertEqual("ACTS_ConnectAbility_0100_CommonEvent"); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - done(); - } - } - commonEvent.createSubscriber(subscriberInfoStartAbility_0100).then(async (data) => { - console.debug("====>ACTS_getExtensionInfo_0100_Create Subscriber====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.staticextensioninfo", - abilityName: "com.example.staticextensioninfo.ServiceAbility", - action: "getExtensionInfo" - } - ); - console.log('ACTS_getExtensionInfo_0100 ConnectAbility connId : ' + connId); - }) - - function unSubscribeCallback() { - console.debug("====>ACTS_getExtensionInfo_0100_UnSubscribe CallBack====>"); - done(); - } - - function timeout() { - expect().assertFail(); - console.debug('ACTS_ConnectAbility_0100 timeout'); - done(); - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - - - function checkHapModuleInfo(data) { - console.log("checkHapModuleInfo start " + data); - console.log("checkHapModuleInfo name : " + data.name); - console.log("checkHapModuleInfo description : " + data.description); - console.log("checkHapModuleInfo descriptionId : " + data.descriptionId); - console.log("checkHapModuleInfo icon : " + data.icon); - console.log("checkHapModuleInfo label : " + data.label); - console.log("checkHapModuleInfo labelId : " + data.labelId); - console.log("checkHapModuleInfo iconId : " + data.iconId); - console.log("checkHapModuleInfo backgroundImg : " + data.backgroundImg); - console.log("checkHapModuleInfo supportedModes : " + data.supportedModes); - console.log("checkHapModuleInfo reqCapabilities length : " + data.reqCapabilities.length); - for (var j = 0; j < data.reqCapabilities.length; j++) { - console.log("checkHapModuleInfo data.reqCapabilities[" + j + "] : " + data.reqCapabilities[j]); - } - console.log("checkHapModuleInfo deviceTypes length : " + data.deviceTypes.length); - for (var j = 0; j < data.deviceTypes.length; j++) { - console.log("checkHapModuleInfo data.deviceTypes[" + j + "] : " + data.deviceTypes[j]); - } - console.log("checkHapModuleInfo moduleName : " + data.moduleName); - console.log("checkHapModuleInfo mainAbilityName : " + data.mainAbilityName); - console.log("checkHapModuleInfo installationFree : " + data.installationFree); - - expect(typeof (data)).assertEqual("object"); - expect(typeof (data.name)).assertEqual("string"); - expect(typeof (data.description)).assertEqual("string"); - expect(typeof (data.icon)).assertEqual("string"); - expect(typeof (data.label)).assertEqual("string"); - expect(typeof (data.backgroundImg)).assertEqual("string"); - expect(typeof (data.supportedModes)).assertEqual("number"); - expect(Array.isArray(data.reqCapabilities)).assertEqual(true); - expect(Array.isArray(data.deviceTypes)).assertEqual(true); - expect(Array.isArray(data.abilityInfo)).assertEqual(true); - expect(typeof (data.moduleName)).assertEqual("string"); - expect(typeof (data.mainAbilityName)).assertEqual("string"); - console.log("checkHapModuleInfo_expect_typeof_end") - expect(data.name).assertEqual("phone"); - expect(data.description).assertEqual("$string:phone_entry_dsc"); - expect(data.descriptionId).assertEqual(16777221); - expect(data.icon).assertEqual("$media:icon"); - expect(data.label).assertEqual("$string:entry_label"); - expect(data.labelId).assertEqual(16777219); - expect(data.iconId).assertEqual(16777224); - expect(data.backgroundImg).assertEqual(""); - expect(data.supportedModes).assertEqual(0); - expect(data.reqCapabilities.length).assertEqual(0); - expect(data.deviceTypes.length).assertEqual(2); - expect(data.deviceTypes[0]).assertEqual("default"); - expect(data.moduleName).assertEqual("phone") - expect(data.mainAbilityName).assertEqual("com.example.staticextensioninfo.MainAbility"); - expect(data.installationFree).assertEqual(false); - expect(data.mainElementName).assertEqual('com.example.staticextensioninfo.MainAbility'); - expect(data.hashValue).assertEqual(''); - console.log("checkHapModuleInfo end " + data); - } - function checkApplicationInfo(data) { - console.log("checkApplicationInfo start " + data); - console.log("checkApplicationInfo name : " + data.name); - console.log("checkApplicationInfo description : " + data.description); - console.log("checkApplicationInfo descriptionId : " + data.descriptionId); - console.log("checkApplicationInfo systemApp : " + data.systemApp); - console.log("checkApplicationInfo enabled : " + data.enabled); - console.log("checkApplicationInfo label : " + data.label) - console.log("checkApplicationInfo labelId : " + data.labelId); - console.log("checkApplicationInfo icon : " + data.icon); - console.log("checkApplicationInfo iconId : " + data.iconId); - console.log("checkApplicationInfo process : " + data.process); - console.log("checkApplicationInfo supportedModes : " + data.supportedModes); - console.log("checkApplicationInfo moduleSourceDirs length : " + data.moduleSourceDirs.length); - for (var j = 0; j < data.moduleSourceDirs.length; j++) { - console.log("checkApplicationInfo data.moduleSourceDirs[" + j + "] : " + data.moduleSourceDirs[j]); - } - console.log("checkApplicationInfo permissions length : " + data.permissions.length); - for (var j = 0; j < data.permissions.length; j++) { - console.log("checkApplicationInfo data.permissions[" + j + "] : " + data.permissions[j]); - } - console.log("checkApplicationInfo moduleInfos length : " + data.moduleInfos.length); - for (var j = 0; j < data.moduleInfos.length; j++) { - console.log("checkApplicationInfo data.moduleInfos[" + j + "].moduleName : " + data.moduleInfos[j].moduleName); - console.log("checkApplicationInfo data.moduleInfos[" + j + "].moduleSourceDir:" + - data.moduleInfos[j].moduleSourceDir); - } - console.log("checkApplicationInfo entryDir : " + data.entryDir); - console.log("checkApplicationInfo codePath : " + data.codePath); - console.log("checkApplicationInfo removable: " + data.removable); - - expect(typeof (data)).assertEqual("object"); - expect(typeof (data.name)).assertEqual("string"); - expect(typeof (data.description)).assertEqual("string"); - expect(typeof (data.descriptionId)).assertEqual("number"); - expect(typeof (data.systemApp)).assertEqual("boolean"); - expect(typeof (data.enabled)).assertEqual("boolean"); - expect(typeof (data.label)).assertEqual("string"); - expect(typeof (data.labelId)).assertEqual("string"); - expect(typeof (data.icon)).assertEqual("string"); - expect(typeof (data.iconId)).assertEqual("string"); - expect(typeof (data.process)).assertEqual("string"); - expect(typeof (data.supportedModes)).assertEqual("number"); - expect(Array.isArray(data.moduleSourceDirs)).assertEqual(true); - expect(Array.isArray(data.permissions)).assertEqual(true); - expect(Array.isArray(data.moduleInfos)).assertEqual(true); - expect(typeof (data.entryDir)).assertEqual("string"); - expect(typeof (data.codePath)).assertEqual("string"); - expect(typeof (data.removable)).assertEqual("boolean"); - console.log("checkApplicationInfo_expect_typeof_end") - expect(data.name).assertEqual("com.example.staticextensioninfo"); - expect(data.description).assertEqual("$string:description_application"); - expect(data.descriptionId).assertLarger(0); - expect(data.systemApp).assertEqual(true); - expect(data.enabled).assertEqual(true); - expect(data.label).assertEqual("$string:app_name"); - expect(data.labelId).assertEqual("16777216"); - expect(data.icon).assertEqual("$media:icon"); - expect(data.iconId).assertEqual("16777224"); - expect(data.process).assertEqual("com.example.staticextensioninfo"); - expect(data.supportedModes).assertEqual(0); - expect(data.moduleSourceDirs.length).assertEqual(1); - expect(data.moduleSourceDirs[0]).assertEqual("/data/app/el1/bundle/public/" + - "com.example.staticextensioninfo/phone"); - expect(data.moduleInfos.length).assertEqual(1); - expect(data.moduleInfos[0].moduleName).assertEqual("phone"); - expect(data.moduleInfos[0].moduleSourceDir).assertEqual("/data/app/el1/bundle/public/" + - "com.example.staticextensioninfo/phone"); - expect(data.entryDir).assertEqual("/data/app/el1/bundle/public/com.example.staticextensioninfo" + - "/phone"); - expect(data.codePath).assertEqual("/data/app/el1/bundle/public/com.example.staticextensioninfo"); - expect(data.removable).assertEqual(true); - console.log("checkApplicationInfo end " + data); - } - }) - - /* - * @tc.number: ACTS_getExtensionInfo_0200 - * @tc.name: Apply StaticExtensionInfo. Connect to StaticExtensionInfoTest to query static information - about an Extension - * @tc.desc: Enabling an application to connect to StaticExtensionInfo. Connecting to StaticExtensionInfoTest - To query static information about an Extension. Verifying the query information - */ - it('ACTS_getExtensionInfo_0200', 0, async function (done) { - console.log('ACTS_getExtensionInfo_0200====ACTS_getExtensionInfo_0200_Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_ConnectAbility_0200_CommonEvent") { - clearTimeout(id); - checkHapModuleInfo_0200(JSON.parse(data.parameters['hapModuleInfo2'])) - checkApplicationInfo_0200(JSON.parse(data.parameters['applicationInfo2'])) - expect(data.event).assertEqual("ACTS_ConnectAbility_0200_CommonEvent"); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - } - } - commonEvent.createSubscriber(subscriberInfoStartAbility_0200).then(async (data) => { - console.debug("====>ACTS_getExtensionInfo_0200_Create Subscriber====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.staticextensioninfotest", - abilityName: "com.example.staticextensioninfotest.ServiceAbility", - action: "getExtensionInfoTest" - } - ); - console.log('ACTS_getExtensionInfo_0200 ConnectAbility connId : ' + connId); - }) - - function unSubscribeCallback() { - console.debug("====>ACTS_getExtensionInfo_0200_UnSubscribe CallBack====>"); - done(); - } - - function timeout() { - expect().assertFail(); - console.debug('ACTS_ConnectAbility_0200 timeout'); - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - - - function checkHapModuleInfo_0200(data) { - console.log("checkHapModuleInfo2 start " + data); - console.log("checkHapModuleInfo2 name : " + data.name); - console.log("checkHapModuleInfo2 description : " + data.description); - console.log("checkHapModuleInfo2 descriptionId : " + data.descriptionId); - console.log("checkHapModuleInfo2 icon : " + data.icon); - console.log("checkHapModuleInfo2 label : " + data.label); - console.log("checkHapModuleInfo2 labelId : " + data.labelId); - console.log("checkHapModuleInfo2 iconId : " + data.iconId); - console.log("checkHapModuleInfo2 backgroundImg : " + data.backgroundImg); - console.log("checkHapModuleInfo2 supportedModes : " + data.supportedModes); - console.log("checkHapModuleInfo2 reqCapabilities length : " + data.reqCapabilities.length); - for (var j = 0; j < data.reqCapabilities.length; j++) { - console.log("checkHapModuleInfo2 data.reqCapabilities[" + j + "] : " + data.reqCapabilities[j]); - } - console.log("checkHapModuleInfo2 deviceTypes length : " + data.deviceTypes.length); - for (var j = 0; j < data.deviceTypes.length; j++) { - console.log("checkHapModuleInfo2 data.deviceTypes[" + j + "] : " + data.deviceTypes[j]); - } - console.log("checkHapModuleInfo2 moduleName : " + data.moduleName); - console.log("checkHapModuleInfo2 mainAbilityName : " + data.mainAbilityName); - console.log("checkHapModuleInfo2 installationFree : " + data.installationFree); - - expect(typeof (data)).assertEqual("object"); - expect(typeof (data.name)).assertEqual("string"); - expect(typeof (data.description)).assertEqual("string"); - expect(typeof (data.icon)).assertEqual("string"); - expect(typeof (data.label)).assertEqual("string"); - expect(typeof (data.backgroundImg)).assertEqual("string"); - expect(typeof (data.supportedModes)).assertEqual("number"); - expect(Array.isArray(data.reqCapabilities)).assertEqual(true); - expect(Array.isArray(data.deviceTypes)).assertEqual(true); - expect(Array.isArray(data.abilityInfo)).assertEqual(true); - expect(typeof (data.moduleName)).assertEqual("string"); - expect(typeof (data.mainAbilityName)).assertEqual("string"); - console.log("checkHapModuleInfo_expect_typeof_end") - expect(data.name).assertEqual("phone"); - expect(data.description).assertEqual("$string:phone_entry_dsc"); - expect(data.descriptionId).assertEqual(16777221); - expect(data.icon).assertEqual("$media:icon"); - expect(data.label).assertEqual("$string:entry_label"); - expect(data.labelId).assertEqual(16777219); - expect(data.iconId).assertEqual(16777224); - expect(data.backgroundImg).assertEqual(""); - expect(data.supportedModes).assertEqual(0); - expect(data.reqCapabilities.length).assertEqual(0); - expect(data.deviceTypes.length).assertEqual(2); - expect(data.deviceTypes[0]).assertEqual("default"); - expect(data.moduleName).assertEqual("phone") - expect(data.mainAbilityName).assertEqual("com.example.staticextensioninfotest.MainAbility"); - expect(data.installationFree).assertEqual(false); - expect(data.mainElementName).assertEqual('com.example.staticextensioninfotest.MainAbility'); - expect(data.hashValue).assertEqual(''); - console.log("checkHapModuleInfo end " + data); - } - function checkApplicationInfo_0200(data) { - console.log("checkApplicationInfo2 start " + data); - console.log("checkApplicationInfo2 name : " + data.name); - console.log("checkApplicationInfo2 description : " + data.description); - console.log("checkApplicationInfo2 descriptionId : " + data.descriptionId); - console.log("checkApplicationInfo2 systemApp : " + data.systemApp); - console.log("checkApplicationInfo2 enabled : " + data.enabled); - console.log("checkApplicationInfo2 label : " + data.label) - console.log("checkApplicationInfo2 labelId : " + data.labelId); - console.log("checkApplicationInfo2 icon : " + data.icon); - console.log("checkApplicationInfo2 iconId : " + data.iconId); - console.log("checkApplicationInfo2 process : " + data.process); - console.log("checkApplicationInfo2 supportedModes : " + data.supportedModes); - console.log("checkApplicationInfo2 moduleSourceDirs length : " + data.moduleSourceDirs.length); - for (var j = 0; j < data.moduleSourceDirs.length; j++) { - console.log("checkApplicationInfo2 data.moduleSourceDirs[" + j + "] : " + data.moduleSourceDirs[j]); - } - console.log("checkApplicationInfo2 permissions length : " + data.permissions.length); - for (var j = 0; j < data.permissions.length; j++) { - console.log("checkApplicationInfo2 data.permissions[" + j + "] : " + data.permissions[j]); - } - console.log("checkApplicationInfo2 moduleInfos length : " + data.moduleInfos.length); - for (var j = 0; j < data.moduleInfos.length; j++) { - console.log("checkApplicationInfo2 data.moduleInfos[" + j + "].moduleName : " + data.moduleInfos[j].moduleName); - console.log("checkApplicationInfo2 data.moduleInfos[" + j + "].moduleSourceDir:" + - data.moduleInfos[j].moduleSourceDir); - } - console.log("checkApplicationInfo2 entryDir : " + data.entryDir); - console.log("checkApplicationInfo2 codePath : " + data.codePath); - console.log("checkApplicationInfo2 removable: " + data.removable); - - expect(typeof (data)).assertEqual("object"); - expect(typeof (data.name)).assertEqual("string"); - expect(typeof (data.description)).assertEqual("string"); - expect(typeof (data.descriptionId)).assertEqual("number"); - expect(typeof (data.systemApp)).assertEqual("boolean"); - expect(typeof (data.enabled)).assertEqual("boolean"); - expect(typeof (data.label)).assertEqual("string"); - expect(typeof (data.labelId)).assertEqual("string"); - expect(typeof (data.icon)).assertEqual("string"); - expect(typeof (data.iconId)).assertEqual("string"); - expect(typeof (data.process)).assertEqual("string"); - expect(typeof (data.supportedModes)).assertEqual("number"); - expect(Array.isArray(data.moduleSourceDirs)).assertEqual(true); - expect(Array.isArray(data.permissions)).assertEqual(true); - expect(Array.isArray(data.moduleInfos)).assertEqual(true); - expect(typeof (data.entryDir)).assertEqual("string"); - expect(typeof (data.codePath)).assertEqual("string"); - expect(typeof (data.removable)).assertEqual("boolean"); - console.log("checkApplicationInfo_expect_typeof_end") - expect(data.name).assertEqual("com.example.staticextensioninfotest"); - expect(data.description).assertEqual("$string:description_application"); - expect(data.descriptionId).assertLarger(0); - expect(data.systemApp).assertEqual(true); - expect(data.enabled).assertEqual(true); - expect(data.label).assertEqual("$string:app_name"); - expect(data.labelId.length).assertLarger(0); - expect(data.icon).assertEqual("$media:icon"); - expect(data.iconId.length).assertLarger(0); - expect(data.process).assertEqual("com.example.staticextensioninfotest"); - expect(data.supportedModes).assertEqual(0); - expect(data.moduleSourceDirs.length).assertEqual(1); - expect(data.moduleSourceDirs[0]).assertEqual("/data/app/el1/bundle/public/" + - "com.example.staticextensioninfotest/phone"); - expect(data.moduleInfos.length).assertEqual(1); - expect(data.moduleInfos[0].moduleName).assertEqual("phone"); - expect(data.moduleInfos[0].moduleSourceDir).assertEqual("/data/app/el1/bundle/public/" + - "com.example.staticextensioninfotest/phone"); - expect(data.entryDir).assertEqual("/data/app/el1/bundle/public/com.example.staticextensioninfotest" + - "/phone"); - expect(data.codePath).assertEqual("/data/app/el1/bundle/public/com.example.staticextensioninfotest"); - expect(data.removable).assertEqual(true); - console.log("checkApplicationInfo end " + data); - } - }) - - /* - * @tc.number: ACTS_getExtensionInfo_0300 - * @tc.name: Apply StaticExtensionInfo. Connect to StaticExtensionInfoTest to query static information - about an Extension - * @tc.desc: Verify configuration module.json connect service application query property information - */ - it('ACTS_getExtensionInfo_0300', 0, async function (done) { - console.log('ACTS_getExtensionInfo_0300====ACTS_getExtensionInfo_0300_Subscribe CallBack data:====>" + JSON.stringify(data)); - if (data.event == "ACTS_ConnectAbility_0100_CommonEvent") { - clearTimeout(id); - checkExtensionAbilityInfo(JSON.parse(data.parameters['extensionAbilityInfo'])) - expect(data.event).assertEqual("ACTS_ConnectAbility_0100_CommonEvent"); - commonEvent.unsubscribe(subscriber, unSubscribeCallback) - done(); - } - } - commonEvent.createSubscriber(subscriberInfoStartAbility_0100).then(async (data) => { - console.debug("====>ACTS_getExtensionInfo_0300_Create Subscriber====>"); - subscriber = data; - await commonEvent.subscribe(subscriber, subscribeCallBack); - connId = await globalThis.abilityContext.connectServiceExtensionAbility( - { - bundleName: "com.example.extensionmodule", - abilityName: "ServiceExtAbility", - } - ); - console.log('ACTS_getExtensionInfo_0300 ConnectAbility connId : ' + connId); - }) - - function unSubscribeCallback() { - console.debug("====>ACTS_getExtensionInfo_0300_UnSubscribe CallBack====>"); - } - - function timeout() { - expect().assertFail(); - globalThis.abilityContext.disconnectServiceExtensionAbility( - connId, - (error, data) => { - console.log('DisconnectAbility_0300 result errCode : ' + error.code + " data: " + data) - done(); - }, - ); - console.debug('ACTS_ConnectAbility_0300 timeout'); - done(); - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - - - function checkExtensionAbilityInfo(data) { - console.log("checkHapModuleInfo_expect_typeof_end3") - console.log("checkAbilityInfo metadata length : " + data.metadata.length); - console.log("checkAbilityInfo metadata length : " + data.metadata[0].name); - expect(data.metadata[0].name).assertEqual("ohos.extension.form"); - expect(data.metadata[0].value).assertEqual("MainAbility"); - expect(data.metadata[0].resource).assertEqual("@profile:form_config"); - expect(data.bundleName).assertEqual("com.example.extensionmodule"); - expect(data.moduleName).assertEqual("phone"); - expect(data.name).assertEqual("ServiceExtAbility"); - expect(data.permissions.length).assertEqual(1); - expect(data.permissions[0]).assertEqual("ohos.permission.USE_BLUETOOTH"); - expect(data.isVisible).assertEqual(true); - expect(data.extensionAbilityType).assertLarger(0); - expect(data.readPermission).assertEqual(""); - expect(data.writePermission).assertEqual(""); - expect(data.enabled).assertEqual(true) - console.log("checkExtensionAbilityInfo3 end " + data); - } - }) - }) -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/List.test.ets b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/List.test.ets deleted file mode 100644 index f6a5bd8d9..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/List.test.ets +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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 abilityTest from './Ability.test.ets' - - -export default function testsuite() { - - abilityTest() - -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/module.json deleted file mode 100644 index de288605b..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/module.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "com.example.staticextensioninfo.MainAbility", - "deviceTypes": [ - "default", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.staticextensioninfo.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities":[ - "entity.system.home" - ] - } - ] - } - ], - "extensionAbilities": [ - { - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "name": "com.example.staticextensioninfo.ServiceAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - } - ], - "requestPermissions": [ - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS", - "reason":"need use ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS" - }, - { - "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name":"ohos.permission.GET_RUNNING_INFO", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.USE_BLUETOOTH", - "reason":"need use ohos.permission.USE_BLUETOOTH" - } - ] - } -} diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/resources/base/element/string.json deleted file mode 100644 index 2977b612e..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/resources/base/element/string.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "string": [ - { - "name": "phone_entry_dsc", - "value": "i am an entry for phone" - }, - { - "name": "phone_entry_main", - "value": "the phone entry ability" - }, - { - "name": "entry_label", - "value": "ActsContextTest" - }, - { - "name": "form_description", - "value": "my form" - }, - { - "name": "serviceability_description", - "value": "my whether" - }, - { - "name": "description_application", - "value": "demo for test" - }, - { - "name": "app_name", - "value": "Demo" - } - ] -} diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/resources/base/media/icon.png deleted file mode 100644 index 474a55588fd7216113dd42073aadf254d4dba023..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15458 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 Y0jIQKqpXab7ytkO07*qoM6N<$f;yQ2zW@LL diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/resources/base/profile/main_pages.json deleted file mode 100644 index 02221db61..000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/resources/base/profile/main_pages.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "src": [ - "MainAbility/pages/index/index", - "MainAbility/pages/second/second" - ] -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/signature/openharmony_sx.p7b b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/signature/openharmony_sx.p7b deleted file mode 100755 index dcec6c9615032c1b48bf185e839d9720dd68aab0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3820 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 diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/module.json index 431571549..17e5e428d 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/module.json +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/entry/src/main/module.json @@ -6,8 +6,8 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "tablet" + "default", + "tablet" ], "deliveryWithInstall": true, "installationFree": false, @@ -36,48 +36,16 @@ ], "requestPermissions": [ { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS", - "reason":"need use ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS" + "name":"ohos.permission.USE_BLUETOOTH", + "reason":"need use ohos.permission.USE_BLUETOOTH" }, { "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" }, { - "name":"ohos.permission.GET_RUNNING_INFO", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.USE_BLUETOOTH", - "reason":"need use ohos.permission.USE_BLUETOOTH" + "name":"ohos.permission.GET_BUNDLE_INFO", + "reason":"need use ohos.permission.GET_BUNDLE_INFO" } ] } diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/signature/openharmony_sx.p7b b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/signature/openharmony_sx.p7b index cc53179a48f88f20acc379c138a001e9a15838f6..b7bac195276833f75df9e88f11526507e6b813af 100644 GIT binary patch delta 623 zcmew)bylX{po!0ujZ>@5qwPB{BRkWACO#{mkQoyrqam*WHydX{n+IbmGYb==K@;mM zghIvzO{}+Bnpm$_E0v`d6=&w>>E!?=jKKD8n-w;(4~uecFR>s8s67v)AP3AX&`nECEGaDlnVOMb z91oF-2kKF(1u9R@DOR$oR!Ypt$uCb$(S`7%m6T$Ek_D+nxtYbqnUfh=t?D5zFDS|^ z%gjklPt{FMEJ#es%*iatOa+<{t>g$Y!Lgvg7v!XXqWt94;$ol!Ai`jUl>tSW`9+x} zm4T(HMVYB7XtJ&q$vLGdscuF2xxOG<^Yak;3knQEi&KI6A(p#Vl%(c?RKSdI1Nt{C zvp6#;C)F>%Br~m2DR#3p>oWFwLnA{217lND1LG(IeR#ZavKT6{D0JSs>S=L7?d3A3 zmwBJJ-MqEx$)u>NS8olNKCnDnxy4A@fQyX-m?F;EvM@8TxEr`KDKgBv6Ta`?F~LnK z$Fvstmr^GPb*pouq+jZ>@5qwPB{BRkWACf<0UP&5-Gqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcI&gu!#9W|&lA)e~p25TkhWsU!1t5M= zYEEimajMe94DE>rZ8q~UE@1ZXFG$VvNG!_D&#Tl+EGW<`Ni8l>(osq*$N_37t}HG| z&5cjaFG>ZA73ij=CYF=}c~(jp`Ni>2d7wU}$x5uQo5k3cvDX_I8CV*anwpuIM;YkD z-Ob5jsKlbsS0JUwB~>lzXREYEyJd#zv%~Mr0)50DE=m7Vko;r+3kDQTwFrwo(|FSO%TK|>^A`3fajZ9$y0tL!e&{?yCPjub@#hLSw(YgI eoVZJ8hmw%B0gL*oCs*WMM49U!v}qmqA^-p^Sa|>d diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/module.json index ae44b834b..9f169ffcf 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/module.json +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/entry/src/main/module.json @@ -35,46 +35,18 @@ } ], "requestPermissions": [ - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.GET_RUNNING_INFO", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name":"ohos.permission.CLEAN_APPLICATION_DATA", - "reason":"need use ohos.permission.CLEAN_APPLICATION_DATA" - } + { + "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", + "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" + }, + { + "name":"ohos.permission.GET_BUNDLE_INFO", + "reason":"need use ohos.permission.GET_BUNDLE_INFO" + }, + { + "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + } ] } } diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/signature/openharmony_sx.p7b b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/signature/openharmony_sx.p7b index cc53179a48f88f20acc379c138a001e9a15838f6..1a5303991111ebd68235f9230dcfac6f5f46da82 100644 GIT binary patch delta 613 zcmew)^+u-NpouSojZ>@5qwPB{BRkWACca3ZP$&~4qam*WHydX{n+IbmGYb==K@%G% zLLuXVCe~jpO|0LlmC90!iZk=`bn_B(Q!pZq5Kw%>trNn{)-IUDY zlA_F{(h`t{lFEYAiTgw*X6a45WWx{Q0ks#U=A9_NG;0EECxAN&)qd7-YL}2#m6;HJa4abBEzK#(3@FM^PAx75ItU^RR#+KO zl$l?YSyCAYbZlm73Yx5IMRHDQN~&8?ey%UXQ3(A71qPwTsX+Y@%Uvr}G4$W$g8aMur9k=B9?GmQe=!@Yv#HF;rqvuxBs!VzJt< zrM+!p|!>hx+#zX`Lne2nvw2;3yJI6+1C@Ardu PqdgmayJC&svNZqze^l1| delta 339 zcmaDO^GPb*pouq+jZ>@5qwPB{BRkWACf<0UP&5-Gqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcI&gu!#9W|&lA)e~p25TkhWsU!1t5M= zYEEimajMe94DE>rZ8q~UE@0O1FG$VvNG!_D&#Tl+EGW<`Ni8l>(osq*$N_37t}HG| z&5cjaFG`(!i$!^|3#-#+Q?_O7^#(=;mIkJ#W+vuQ2KsQfak3aHu_*KvNa=A&Rg3!B zDy`9OnW6gZ@O!gBAF+o^(!UfW|JXmnfQyX-=<9Q~EX+(S?gp+*3Q}f$!K|VdVbNzA zPa1#uDR_9^!X71#^`=s{7DnC=ooC3T$Z#h9Tmi?nz4n$9cj@d<60$a6QD61sioA;` MbNz!htpi^K0JvChc>n+a diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/test/Ability.test.ets index 696af0228..a0f82d4c5 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/ets/test/Ability.test.ets @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +// @ts-nocheck import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import commonEvent from '@ohos.commonEvent'; diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/module.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/module.json index c56357b7d..e03d89278 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/module.json +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/entry/src/main/module.json @@ -6,8 +6,8 @@ "description": "$string:phone_entry_dsc", "mainElement": "MainAbility", "deviceTypes": [ - "default", - "tablet" + "default", + "tablet" ], "deliveryWithInstall": true, "installationFree": false, @@ -36,48 +36,16 @@ ], "requestPermissions": [ { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name": "ohos.permission.GET_BUNDLE_INFO", - "reason": "need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason": "need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name": "ohos.permission.REMOVE_CACHE_FILES", - "reason": "need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name": "ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason": "need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name": "ohos.permission.INSTALL_BUNDLE", - "reason": "need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name": "ohos.permission.MANAGE_MISSIONS", - "reason": "need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name": "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS", - "reason": "need use ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS" + "name": "ohos.permission.USE_BLUETOOTH", + "reason": "need use ohos.permission.USE_BLUETOOTH" }, { "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES", "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" }, { - "name": "ohos.permission.GET_RUNNING_INFO", - "reason": "need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name": "ohos.permission.USE_BLUETOOTH", - "reason": "need use ohos.permission.USE_BLUETOOTH" + "name": "ohos.permission.GET_BUNDLE_INFO", + "reason": "need use ohos.permission.GET_BUNDLE_INFO" } ] } diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/signature/openharmony_sx.p7b b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/signature/openharmony_sx.p7b index cc53179a48f88f20acc379c138a001e9a15838f6..c1dcee7c2bb2bbf69055385392e0c44763a92d0a 100644 GIT binary patch delta 641 zcmew)byTL_po!0sjZ>@5qwPB{BRkWACO#vekRB5wqam*WHydX{n+IbmGYb==K@;m^ zghIvzO{`Z~npiJXE0v`d6=&w>>E!?=jKKD8n-w;(4~uece~!1-faei6x~)AmcLfi{l|u@j&~P zYJtj=bBdL$s+AIRa`MYlQ*me>LD9S9$%t=j8 z)lE(;NKDGi$t=lC1uBYGas(OVSWw^#a#BE1esXGYG0+_lVX(r=fTGO&qRf)Yz|z#B z%+wS#S=Wl>oYIt3x1#)9Uzp`E{RIUEp~a~{{SeDtD@s!HK+c01;Rf_}SY~l%QckL0 zeo1CprBdu>Yu2x9Tn+|Jj5fenG{~Nu$eKENK95tqp^>41fw8HXv2m1vK0GQpSqzm} z6u6mrV%1rB&li8IDRAPSxtIIEyc8t`;WJmuHmq!a`k&o^i;V-ANY2@^Ff*~Z8MrVh z1h2mR`&*3Jrza{qw*PCqAO6!+YW3E#>3&isPqepJRQ50_XzLmq^GPb*pouq+jZ>@5qwPB{BRkWACf<0UP&5-Gqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcI&gu!#9W|&lA)e~p25TkhWsU!1t5M= zYEEimajMe94DE>rZ8q~UE@1ZXFG$VvNG!_D&#Tl+EGW<`Ni8l>(osq*$N_37t}HG| z&5cjaFG>ZA73ij=CYF=}c~(jp`Ni>2d7wU}$@5qwPB{BRkWACO#9OkO31Tqam*WHydX{n+IbmGYb==K@;m^ zghIvzO{`Z~npiJXE0v`d6=&w>>E!?=jKKD8n-w;(4~uec5va_|ZyAu|Ua!)S}$XVvu*hY9@2A8rMTyUQm=-mYI{9 zo~oOiSdf^MnUh(PnF>@Ct>g$Y$g!Zn7v!XXqWt94;$omXAi`jUl>tSW`9+x}m4T(H zMVYB7XtJ&q$vLGdscuF2xxO&VVfqUS3_^=jf%+kqyH=E>=7F3CGr|q%?Xb+^%%q%D zzx`b(EKzjBVk7NZUCL&u^GPb*pouq+jZ>@5qwPB{BRkWACf<0UP&5-Gqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcI&gu!#9W|&lA)e~p25TkhWsU!1t5M= zYEEimajMe94DE>rZ8q~UE@1ZXFG$VvNG!_D&#Tl+EGW<`Ni8l>(osq*$N_37t}HG| z&5cjaFG>ZA73ij=CYF=}c~(jp`Ni>2d7wU}$@5qwPB{BRkWACO%!DkR}r&qam*WHydX{n+IbmGYb==K@;m8 zghIvzO{`~GnpjU(E0v`d6=&w>>E!?=jKKD8n-w;(4~uec|Fi;IEIfe3>YRt6Mh<`-p_ zR0aY)keQl-ChJ;}oKu>T>QkD%OOn*UvL1=L*P(Q?S*NT$VJdi74Mz{feAC_61 znUs_2mtT^ZR;d)b*_w43d%dBNp@D(1skxC^lz~1x-Z)tdl~@%1PQB?nH|t2q3(tKF z46~~ax-6GG##J~$cg^I0n0pour1jZ>@5qwPB{BRkWACf)>~Pz)0zqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcI&gu!#9W|&lA)e~p25TkhWsU!1t5M= zYEEimajMe94DE>rZ8q~UE@1ZXFG$VvNG!_D&#Tl+EGW<`Ni8l>(osq*$N_37t}HG| z&5cjaFG>ZA73ij=CYF=}c~(jp`Ni>2d7wU}$s(+-n>pB)vDX_I8CV#Y8ycAyM;YkD z-Ob5jsKlbsS0JUwB~>lzXREYEyJd#zv%~Mr0)50DE=m7Vko;r+31bEeFTW>VQCN_Ap>xXC+)Yy%gdcqrcmq^2FJhzV8Kwp6 fLjHc9x?cD_>niW9^Q%>sGah{2aCX~6_BDI}LlS=> diff --git a/ability/ability_runtime/fa/facoverapi/signature/openharmony_sx.p7b b/ability/ability_runtime/fa/facoverapi/signature/openharmony_sx.p7b index bf893c5fa3f7c335b731c76c5ad1b45620889f25..94419d985a8f3b1780b446889281ffadc33769bb 100644 GIT binary patch delta 600 zcmew_wN0kppo!0jjZ>@5qwPB{BRkWACO&1LkUSG3qam*WHydX{n+IbmGYb==K@;mG zghIvzO{|AmnppQ&E0v`d6=&w>>E!?=n$Bsm{wdSXE)(7eQg z9H4Yweo<~>4wze@o0ghbQd$Jkm62Z@50Q!oTBB48RGyqutYlTKl$eu~U!Izx3*kpA zDaB4^W_7KHIH#Z}vn(?wH9b`~Ik6xyDKjUtBr_GLEn3MDq|LFQz_&D~Br~8WKRLCy z7-%a*7_6`|peQrHD6^z8ur#$OGc^TG*0mxzr!*zittda&H?tTNKnVQ>1qPwTsX+Y@ z%UvrX%=VnO3P3yV-;FD;t-SK@+1LFlr34CpU1VPF};~ zRBvcxXkcJ$Xkcg(WuOm_A5IoSB^HIOPWM9XY11Xw9$!?L>$3LE{zePC(>!K2Yo6Do zIEtj6H{fF90LJ_|TNY*}77qhACPjwN-x7Q6L*|FFKjs$tn6OXwkkP5{m$q^h_OJzH tX?cCv3{-M!nvzPHrFH3}O@R%6g)6>KN%D7E@5qwPB{BRkWACf*#NPzDntqam*WHydX{n+IbmGYb==K@+PC zLLuXVCRSdSCRWaBrLxqb;>`R!-Q@g~R3$4z9k@VVVlGfX$xzQg&tT#NL;jM=0ua9_ zH77N(I8|w4hW5mRHk=Hw(LCTFK*rj=wAC#UA6D(NUC7UTeR z6;~FQq~^va=NCc53Ut#_6H7{gJS(M){Ni}1d}2X?(qt}H*UkS}zq0W-8Z7JX;-YH)*Y8@ciX}_C;(z zF7Vw|iEmHbNxv|z+?~cu3X<%NuV=5EPx# diff --git a/ability/ability_runtime/fa/faequeryabilitybywant/signature/openharmony_sx.p7b b/ability/ability_runtime/fa/faequeryabilitybywant/signature/openharmony_sx.p7b index bf893c5fa3f7c335b731c76c5ad1b45620889f25..958e3e85275c5e1b6e0877e642a196a0ef665663 100644 GIT binary patch delta 585 zcmew_wOgj%po!0%jZ>@5qwPB{BRkWACO!?IkO~tcqam*WHydX{n+IbmGYb==K@;l@ zghIvzO{^zbnplrkE0v`d6=&w>>E!?>C`GAT1Bv!oKJD={f2 z6=-N;K@Lz&UVc$-Vh)&FpqrMOSW;R9(wdQ991oF-2im1n3sjz*Q>-bX1+Ek=i0JIMAM{epDL3=#J@0~U57vQXEsDt b>wXk+4ZgKv-r=@5qwPB{BRkWACf*#NPzDntqam*WHydX{n+IbmGYb==K@+PC zLLuXVCRSdSCRWaBrLxqb;>`R!-Q@g~R3$4z9k@VVVlGfX$xzQg&tT#NL;jM=0ua9_ zH77N(I8|w4hW5mRHkHhY5AGr_HP9Y-7%8cKxERF8=gXyrE4xXkCJ$o^{aegiHx4q&L9 zvt?msVsSTcWm06g^R@77b+p~2wUWW}m;c!pvHiHfcUL98J#i=f!nksG8Z#+KvNyh- iy>gP5qu|rJa2BEUv&2eg9XxYzosa(u0k3NsYcl}e)O*hW diff --git a/ability/ability_runtime/faapicover/faapicoverhaptest/signature/openharmony_sx.p7b b/ability/ability_runtime/faapicover/faapicoverhaptest/signature/openharmony_sx.p7b index 66b4457a8a81fb8d3356cf46d67226c850944858..2d191e405a480023480ce1c20dd241b40a4a4c56 100644 GIT binary patch delta 624 zcmZ8fO=uHA7pl0ubM4-uN?5=jr%Vu^9GJ84HInPFzKCX^6Z zFz7)v{(zu|(u1Jao>crf2x=`VMZD-ikN$vy2ah_NkP05(``-KB`)1K|{-JD#6$S zK$Nm`*ok%VEC6{uCzoxJtqhgMAfINSP<;|H=U^2wCdorVC8JDM9(EtDd delta 368 zcmdll^I0n0pour1jZ>@5qwPB{BRkWACf)>~Pz)0zqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcI&gu!#9W|&lA)e~p25TkhWsU!1t5M= zYEEimajMe94DE>rZ8q~UE@1ZXFG$VvNG!_D&#Tl+EGW<`Ni8l>(osq*$N_37t}HG| z&5cjaFG>ZA73ij=CYF=}c~(jp`Ni>2d7wU}$-=Czo7vfxvDX_I8CV#Y8ycAyM;YkD z-Ob5jsKlbsS0JUwB~>lzXREYEyJd#zv%~Mr0)50DE=m7Vko;r+31bEeFTW>VQCN_Ap>xXC+)Yy%gdcqrcmq^2FJhzV8Kwp6 fLjHc9x?cD_>niW9^Q%>sGah{2aCX~6_BDI}KyH5? diff --git a/ability/ability_runtime/faapicover/faauxiliary/signature/openharmony_sx.p7b b/ability/ability_runtime/faapicover/faauxiliary/signature/openharmony_sx.p7b index 66b4457a8a81fb8d3356cf46d67226c850944858..7c9960e386098f51bafdd5b8f2fb65ad3f5a918b 100644 GIT binary patch delta 642 zcmew?bx@|>po!0xjZ>@5qwPB{BRkWACO$o&kQNgoqam*WHydX{n+IbmGYb==K@;me zghIvzO|0ixnpjU)E0v`d6=&w>>E!#Iz*K0hPBST8ZT1V|*N zm1pafq!yRxr6neoR%GU6CKgo!?MW=i0cy+3FUn2K0dos<(^3;lN{c|I0ky|Nq~d|r zE7by(C+8F^Syd|~=H%p;r>5va_|ZyAu|Ua!)S}$XVvujZYKkUvvKrMxTwYL=S(cfT znx3kgoLG>U1hl>+GZm;RTFDV)l4C)EZ)r|RW;|Eu)@lKqRjlF%#zB$ z($u2N)D$#X*NWtv(v(!UqWoN6nC&qA1qBA7#i>C35X)UFN>cMc?t>ZO2K0AWW^rax zPO4viNoHE5QtW1H)~{?_js{JPw!m04$ex_YnmTztk5j#&k)eTsv4Od%Wt4$FJSsU^ z43$_E_#e*i^Wmx2bu8X7cYVi+qIAXIyK-Z4W%(19xM{xf5;ovs;{Ya-bG9tZOf2pO zu1pFJn$;irZA5!_d^xh=!kw=^5lR2`W_9nBeX{TS{yJ$LP9{Z$Wmo+)eeNkf_h;su b8QLne?Z%{|<;uoyBYQt(J)QQxBK8UZKmX%! delta 391 zcmX>o^I0n0pour1jZ>@5qwPB{BRkWACf)>~Pz)0zqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcI&gu!#9W|&lA)e~p25TkhWsU!1t5M= zYEEimajMe94DE>rZ8q~U&SCaR&d=5JFG$VvNG!_D&#Tl+EGW<`Ni8l>(osq*$N_39 zt}HG|&5cjaFG>ZA73ij=CYF=}c~(jp`Ni>2d7wU}$zrUoo4MG&vT->XG%?x%ePWP3 z*?=u|avrZ!y@8Q|g@L)Dk%@7Xfj-bXT4g!o!RHNUw>@NE!v_FK CWQ98b diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/signature/openharmony_sx.p7b b/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/signature/openharmony_sx.p7b index 66b4457a8a81fb8d3356cf46d67226c850944858..69bb881419b6d8c5e2ec4f1e5b1a2b54dfb13dc1 100644 GIT binary patch delta 642 zcmZ8fO=uHA6n2wrY+@U+=AyO|_bAi^I0m$pour1jZ>@5qwPB{BRkWACf)>~Pz)0zqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcIujiwCQjDlFR3g5a+Qiwb5awFQUZq}QL4jULYH^8@j#6Sl4p2jJWpPPrZhUfnQ7Txh zKsPNlv7{8pvr@{)FOG-G1NA9QmSlC^%**zbjmOELiO~+|W`k^l?iy3rqvr5 z8CV#Y8ycAyM;YkDozBT(sKlbsS0JUwB~>lzXREYEyJd#zv%~Mr0)50DE=m7Vko;r+ z31bEeFTW>VQCN_Ap>xXC+)Yy%gdcqr rcmq^2FJhzV8Kwp6LjHc9x?cD_>niW9^Q%>sGah{2aCX~6_BDI}kyn3? diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/signature/openharmony_sx.p7b b/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/signature/openharmony_sx.p7b index 66b4457a8a81fb8d3356cf46d67226c850944858..91e9b17f32fb53b735ad13276331bbf79571d17e 100644 GIT binary patch delta 642 zcmZ8fO=uHA6z*pBW+XjnaTJ_Jre)bvkn%O_@tAB;U|CZAqlHS%D`34h{aJxY(_-!Tpk#K)PLPbA!+4PFeG=165e>r9X+M^ zA_u8&nnwx(at+465kqp-ON5hz1!rwR(nS9q&5#|EM=7jA~uFSNwHtMR&b;>o-I;K{G}-WByw%k8=P`j fm(PESE!SH28ee9z-$vR4j}~6*A8xGPz4iGo7|iIA delta 369 zcmca0^I0m$pour1jZ>@5qwPB{BRkWACf)>~Pz)0zqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcIujiwCQjDlFR3g5a+Qiwb5awFQUZq}QL4jULYH^8@j#6Sl4p2jJWpPPrZhUfnQ7Txh zKsPNlv7{8pvr@{)FOG-G1NA9QR%LbFEXnqjjmycPiO~+|W`pd>f!wK+Yk8gO4U7yd z49pFUOpK!p^x+QYWHD4?QRpj>(&Lh<7WK1LTBF@EL-pC=_hx}UVh@+3e@5qwPB{BRkWACO#dYkOmVYqam*WHydX{n+IbmGYb==K@;m8 zghIvzO{`~GnpjU(E0v`d6=&w>>E!?=jKKD8n-w;(4~FD)}K zvpAzXvm~P^wYW5=q$IVt1ZYQMK@Lz$UVc$-Vh)&FpqrMOSW;R9GASd!I36Mu542jT z7N|Tqr&!6VS}8FnC%-&3MHj-4js;2;q!#677K8i&RspmH=+5NH{H!|l5SJGeWtL^; zq^76pCMOmoCS~SimSm;^)kZ5hf=qKPDDVZkD>I-dKRLCy80Z*?Fj!$_Kv8CXQD#YH zU}Yu2x9T#g1!jJCj7G{~Nu$eKENK95tqp^>4vftjg^p=p$XK0GQp zSqzm}6ly*_?!J0W`>D>tw{g+Ih1$P135(_#D4JY+l8~o=CA8Cki;V-ANY2@^Ff*~Z z8@MtlGEADb!prP?#D~MDj-9-2lKJ&~zu;%*=Ud7;s@+^?$JMDZDU>F8o?wwmT>fIE css4evLJ{Xq?U8tQx$W|`qD}Q;l}}5{0F83z-T(jq delta 369 zcmdll^I0m$pour1jZ>@5qwPB{BRkWACf)>~Pz)0zqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcIujiwCQjDlFR3g5a+Qiwb5awFQUZq}QL4jULYH^8@j#6Sl4p2jJWpPPrZhUfnQ7Txh zKsPNlv7{8pvr@{)FOG-G1NA9Q7GZVW%)$1RjmycPiO~+|W`pd>4&14eb9kNV4U7yd z49pFUOpK!p^x+QYWHD4?QRpj>(&Lh<7WK1LTBF@EL-pC=_hx}UVh@+3eeop`Z diff --git a/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/signature/openharmony_sx.p7b b/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/signature/openharmony_sx.p7b index 66b4457a8a81fb8d3356cf46d67226c850944858..4763e9f38696d07477380d192f432ace51a52839 100644 GIT binary patch delta 642 zcmZ8fL2DC16z*;|F{y0@@leD=926vG(~WIoh!#vCNjj8o*Gp25+x8R0ylI*aJg7;$|eEItP-|?gU!V#of4reTdbs$PD#~y(7D50!v)LE zcUyUp0NoRGgV-psjD(@J1g6@pb916afeBxCoerbr_m0-O$tlB&m_QL!L#KKH6U;FP zQVu0un!+Uy4wd*zr zeRp`O!lCTO>sh45(l@Y;3j}5?j_0drZs&scm#;sm)ujn>MeS}&_d@H*z+^3YE_z;z zjgO7TXSI=oQwEeMQiAA5Zey%3f9COL-!6N!9lV+O62FyQIUNbUAgk%Uyw>mYizj(M zp?G8^qow4NeftZskn`G9H{h*F%C`qkJ+Z&nX5Ux< delta 355 zcmX>m^I0m$pour1jZ>@5qwPB{BRkWACf)>~Pz)0zqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcIujiwCQjDlFR3g5a+Qiwb5awFQUZq}QL4jULYH^8@j#6Sl4p2jJWpPPrZhUfnQR?Ie zETY^{K2V*~WNB8{&HQX%*?61`ni%bXZZya?NS@5dX+PPYH?7{l$iTwD+|bCxILbgD z?o>_|LnRi4z5*#dE~#o!KU<|W+AT9wpB;X07U(1Pa7p@?g5)3jXBcp?aR3A1oGlA8 z6N`s|8)b+yeSyy>)onNi8obllEhO^rqvajI-0Fr5W9{>OV diff --git a/ability/ability_runtime/featureability/sceneproject/startability/signature/openharmony_sx.p7b b/ability/ability_runtime/featureability/sceneproject/startability/signature/openharmony_sx.p7b index 66b4457a8a81fb8d3356cf46d67226c850944858..b83a714e8a1f112c932f3078e858bda5bacb09c1 100644 GIT binary patch delta 608 zcmew?wN0kppo!0jjZ>@5qwPB{BRkWACO&1LkUSG3qam*WHydX{n+IbmGYb==K@;m0 zghIvzO{_;*nph83E0v`d6=&w>>E!?=h!F0~>tw;(4~uecc}K@L!9UVc$-Vh)&FpqrMOSW;R9G9e?sI36Mu542LL7N|Tqr&!6V zS}8FnC%-&3MHj-4j-C9C#kC&du!5q@vdo;+^i-_9rhta=2Q y8-z9o1i$EQRbom%1zEMYD->c8(R?8LfM^e6zVpVs04 delta 343 zcmdlc^I0m$pour1jZ>@5qwPB{BRkWACf)>~Pz)0zqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcIujiwCQjDlFR3g5a+Qiwb5awFQUZq}QL4jULYH^8@j#6Sl4p2jJWpPPrZhUfnQR?K2 zETY^{K2V*~WFA)6O>AG;Se*=-80{wi;#pH~U}RunU~Xt+VjN|l4|g6Xi=h&WLSKQD z9+y*f@Y5KWEFr%*5hh;KroL@GQtS zW&Y9FJ<`#xreA(fyrQrm^+M;At+|_~G6+BVDDVcTWM0HZ(=$v9)`k52JaxVBd)8In UTjy7+EN49Uyy5J&hwN+k0No6CyZ`_I diff --git a/ability/ability_runtime/featureability/sceneproject/startabilityforresult/signature/openharmony_sx.p7b b/ability/ability_runtime/featureability/sceneproject/startabilityforresult/signature/openharmony_sx.p7b index 66b4457a8a81fb8d3356cf46d67226c850944858..331baf0dd65876aff57c027d1f7a2a998b4be296 100644 GIT binary patch delta 641 zcmew?wO^**po!0#jZ>@5qwPB{BRkWACO#dYkOmVYqam*WHydX{n+IbmGYb==K@;m; zghIvzO|0iwnpjU&E0v`d6=&w>>E!?=jKKD8n-w;(4~ueciy9n>Y!79LJQls?zU;IM0k@5qwPB{BRkWACf)>~Pz)0zqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcIujiwCQjDlFR3g5a+Qiwb5awFQUZq}QL4jULYH^8@j#6Sl4p2jJWpPPrZhUfnQ7Txh zKsPNlv7{8pvr@{)FOG-G1NA9Q7G-ta%*pnZjmycPiO~+|W`pd>j@+q}b9tTW4U7yd z49pFUOpK!p^x+QYWHD4?QRpj>(&Lh<7WK1LTBF@EL-pC=_hx}UVh@+3e;j9a=(rxqQ`UUviIkmzoeH z<&Z!E3L)Uo#n3^sh(i?AK?mvJ&_V@qu-HXGH$_WV-}OiZ$M5(3{(Zdn`|#T%6>JZT z`TWDxiRw|uk|jy)#|M1=x$1-j9z~Y0?cMxGlv=iTO|iZ2%V-g}NsN3b zujK$mkQ&BejDmZxZe#_l29d^CC`(L>lT5*K1XhVbR2 zt#~R>)N+hM*aDs-dCdYXLnyII7MPaE&=?hxyuouC-5ptI9yF`K9j9A{IqR-wMKroA z=sGn~q>MC5jXRJHx${g~te6vEI(O_cxbWvhZw9=*gok20j zEyh@~KrNEuh7P7F%DAvwH^qs;MeWG~a01!?wuz!n3t1TFMlRXy(A6`BZyc;in&eDyxGp W8mI5Sid@PcKk?(&rxg@^@cJ)$q2#gv delta 369 zcmdll^I0m$pour1jZ>@5qwPB{BRkWACf)>~Pz)0zqam*WHydX{n+IbmGYb==K@%%K zLLuXVCRPTPCYC?dN@b}<#hLkey2<$|sY+IcIujiwCQjDlFR3g5a+Qiwb5awFQUZq}QL4jULYH^8@j#6Sl4p2jJWpPPrZhUfnQ7Txh zKsPNlv7{8pvr@{)FOG-G1NA9Q7GZVW%)$1RjmycPiO~+|W`pd>4&14eb9kNV4U7yd z49pFUOpK!p^x+QYWHD4?QRpj>(&Lh<7WK1LTBF@EL-pC=_hx}UVh@+3eeop`Z diff --git a/ability/ability_runtime/newwant/actsnewwantapi7relyhap/signature/openharmony_sx.p7b b/ability/ability_runtime/newwant/actsnewwantapi7relyhap/signature/openharmony_sx.p7b index 562c6ff7788c72d8ae2fa449e1c0fe2408adb9b6..b2a7f03112e2906aea93f92817e30a343972a997 100644 GIT binary patch delta 296 zcmdljvrDGlpo!0njZ>@5qwPB{BRkWACO&nbkTMe^qam*WHydX{n+IbmGYb==K@;mW zghIvzO{~XRnph84E0v`d6=&w>>Eclz~3nK28=xB^HIk zpcP*^G*sF))E|4#$Hu?!fy*V6uNLp4*00>)t#WrBy8#y)2hbin0e=JRU8Bod5v)3jp=jUKo%Vp@5qwPB{BRkWACO!?IkO~tcqam*WHydX{n+IbmGYb==K@;l@ zghIvzO{^zbnplrkE0v`d6=&w>>EU{a9gI~Za!Q_OrX^WE3WztqOP+9Eu) QE~2_gSADkd=fCYO0ONIHasU7T diff --git a/ability/ability_runtime/newwant/actsnewwantarelyhap/signature/openharmony_sx.p7b b/ability/ability_runtime/newwant/actsnewwantarelyhap/signature/openharmony_sx.p7b index 9ab79feef4e381f5d172fa4265c75fbaaec870f4..3577be29f9caf39c82d021d6dba69ee7c2014c07 100644 GIT binary patch delta 295 zcmdlfvrVSnpo!0jjZ>@5qwPB{BRkWACO&1LkUSG3qam*WHydX{n+IbmGYb==K@;m` zghIvzO{_;)nph81E0v`d6=&w>>EsLCJCvrA;Min2vYrw_E0rbf^TNY*}7Iy@5qwPB{BRkWACO$QwkP;Ikqam*WHydX{n+IbmGYb==K@;m$ zghIvzO{~XQnph82E0v`d6=&w>>E;h`JozJs{bYOI%z6U@BU4iY zgD3-ixb2)QhDt07tBG`$e jXuus&N6u|`_Ni&eE)fuuPTNuulP@eh^YO*3Q@zXpz;9}@ diff --git a/ability/ability_runtime/newwant/actsnewwantbrelyhap/signature/openharmony_sx.p7b b/ability/ability_runtime/newwant/actsnewwantbrelyhap/signature/openharmony_sx.p7b index 8a1913b766bc0866c0609b749920bdfd6dcf4d48..1d1210549993520921e2cfafeb0bb5a4972537e8 100644 GIT binary patch delta 319 zcmdlfvrVSnpo!0jjZ>@5qwPB{BRkWACO&1LkUSG3qam*WHydX{n+IbmGYb==K@;mG zghIvzO{|AmnppQ&E0v`d6=&w>>EqeY$1)2kq;DoT=yD%?Zj+6Jx)2^;+(`w)@+a zA8ucwV!*}50rcQGTNY*}77qhACPjvy_69sRINme;e_XyXCvJ7f0tRE_52xA=Z}R-V uN>f`h5~$?t+FKixKkd{%zjsMZz@5qwPB{BRkWACO$QwkP;Ikqam*WHydX{n+IbmGYb==K@;mW zghIvzO{~XRnph84E0v`d6=&w>>El^?<7MN>YnUCLdt&WKvSv%*pzSoyXCj ziP0A5B!g^&?hmtX4V@R8kiUxSwtD=!=1&+VyMKTAo_$y_kl^>dU>aQ-Ghz~ zwyUuRie0|8KEQu7L-oe{8ZHK0Y#cxjpR;9QW@2$SaAi_txYeF5_xtum^;@;E5BTkC zkKAW6Tljv?8uLpYxqnl>mv3THkW$n$+t>2MZthu;BbGCGo`v#%U1y-P#ONxU;{EOU I|M%|)0F^g!`v3p{ diff --git a/ability/ability_runtime/newwant/actsnewwantrelyhap/signature/openharmony_sx.p7b b/ability/ability_runtime/newwant/actsnewwantrelyhap/signature/openharmony_sx.p7b index 8a1913b766bc0866c0609b749920bdfd6dcf4d48..beb3f8901b628257daeac40b4fd2d3de09d3d99c 100755 GIT binary patch delta 293 zcmdlfvsI?vpo!0rjZ>@5qwPB{BRkWACO##gkQ@^uqam*WHydX{n+IbmGYb==K@;mG zghIvzO{|AmnppQ&E0v`d6=&w>>Er!py|t zZs5wKpfamv?TK$?l~3EBu?J-Dm?52Uh9P5FQDoUM1NW4-i~lhxGJKfgzCAwnwVPkd bBYlp}ho$MyY)|kwUhE6s#~$EU{Ll;lwlHi7 delta 313 zcmdlgvs0$tpo!0vjZ>@5qwPB{BRkWACO$QwkP;Ikqam*WHydX{n+IbmGYb==K@;mW zghIvzO{~XRnph84E0v`d6=&w>>El^?<7MN>YnUCLdt&WKvSv%*i^Bqu#*K zz{J?dBFaD??gCC0LnRgk(I-5*4@~OT%RBY!9&~)LU5!0Z?DDns0sfmAsyE)(a53Ow z;{f{YoGlA86N|fnE0ZF_t@doW-?uNS->Qv$z;9oB@5qwPB{BRkWACO&1LkUSG3qam*WHydX{n+IbmGYb==K@;m` zghIvzO{_;)nph81E0v`d6=&w>>ERE0vnoITsdPZ*hNma|XFcq@ XsLek+i8=K4TF&xakLr&uz9J0(zqe~W delta 310 zcmdlcvs0$tpo!0vjZ>@5qwPB{BRkWACO$QwkP;Ikqam*WHydX{n+IbmGYb==K@;m$ zghIvzO{~XQnph82E0v`d6=&w>>E;h`JozJs{bYOI%z6U@BU3XY zgD3-ixb2)QhDt07eET=7-OpFpaLdOmF}?rO4&5mGFqUUkXCt27$om);AZEbD#sT!# zIa?NHCKe9^Hzq}fo=)X0&hdI0&ss$i!nfzB9CUBGbyn2-;S`CjIunCe+X0nKaI~qI iD$$|NGK(cY_QeDp0nLpU6i&|gw&#FpgV5)%n(+WgGiCVz diff --git a/ability/ability_runtime/zidltest/BUILD.gn b/ability/ability_runtime/zidltest/BUILD.gn deleted file mode 100644 index c69bcff75..000000000 --- a/ability/ability_runtime/zidltest/BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ -# 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("//test/xts/tools/build/suite.gni") - -group("zidltest") { - testonly = true - if (is_standard_system) { - deps = [ - "actsamszidlclienttest:ActsAmsZidlClientTest", - "actsamszidlservice:ActsAmsZidlServiceRelyHap", - ] - } -} diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/AppScope/app.json b/ability/ability_runtime/zidltest/actsamszidlclienttest/AppScope/app.json deleted file mode 100644 index 3567b671b..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/AppScope/app.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "app":{ - "bundleName":"com.example.zidlclienttest", - "vendor":"huawei", - "versionCode":1000000, - "versionName":"1.0.0", - "debug":false, - "icon":"$media:icon", - "label":"$string:app_name", - "description":"$string:description_application", - "distributedNotificationEnabled":true, - "keepAlive":true, - "singleUser":true, - "minAPIVersion":8, - "targetAPIVersion":8, - "car":{ - "apiCompatibleVersion":8, - "singleUser":false - } - } -} diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/AppScope/resources/base/element/string.json b/ability/ability_runtime/zidltest/actsamszidlclienttest/AppScope/resources/base/element/string.json deleted file mode 100644 index ee69f9a86..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/AppScope/resources/base/element/string.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "string":[ - { - "name":"app_name", - "value":"ohosProject" - } - ] -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/AppScope/resources/base/media/app_icon.png b/ability/ability_runtime/zidltest/actsamszidlclienttest/AppScope/resources/base/media/app_icon.png deleted file mode 100644 index 474a55588fd7216113dd42073aadf254d4dba023..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15458 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 Y0jIQKqpXab7ytkO07*qoM6N<$f;yQ2zW@LL diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/BUILD.gn b/ability/ability_runtime/zidltest/actsamszidlclienttest/BUILD.gn deleted file mode 100644 index e846967bd..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/BUILD.gn +++ /dev/null @@ -1,43 +0,0 @@ -# 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("//test/xts/tools/build/suite.gni") - -ohos_js_hap_suite("ActsAmsZidlClientTest") { - hap_profile = "entry/src/main/module.json" - js_build_mode = "debug" - deps = [ - ":actsamszidlclienttest_js_assets", - ":actsamszidlclienttest_resources", - ] - ets2abc = true - certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAmsZidlClientTest" - subsystem_name = "ability" - part_name = "ability_runtime" -} - -ohos_app_scope("actsamszidlclienttest_app_profile") { - app_profile = "AppScope/app.json" - sources = [ "AppScope/resources" ] -} - -ohos_js_assets("actsamszidlclienttest_js_assets") { - source_dir = "entry/src/main/ets" -} - -ohos_resources("actsamszidlclienttest_resources") { - sources = [ "entry/src/main/resources" ] - deps = [ ":actsamszidlclienttest_app_profile" ] - hap_profile = "entry/src/main/module.json" -} diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/Test.json b/ability/ability_runtime/zidltest/actsamszidlclienttest/Test.json deleted file mode 100644 index dd53882af..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/Test.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "300000", - "package": "com.example.zidlclienttest", - "shell-timeout": "300000" - }, - "kits": [ - { - "test-file-name": [ - "ActsAmsZidlClientTest.hap", - "ActsAmsZidlServiceRelyHap.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - }, - { - "type": "ShellKit", - "run-command": [ - "remount" - ] - }, - { - "type": "ShellKit", - "run-command": [ - "chmod 644 /data/*.hap" - ] - } - ] -} diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/Application/AbilityStage.ts deleted file mode 100644 index 953114c1b..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/Application/AbilityStage.ts +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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 AbilityStage from "@ohos.app.ability.AbilityStage" - -export default class MyAbilityStage extends AbilityStage { - onCreate() { - console.log("MyAbilityStage onCreate") - globalThis.stageOnCreateRun = 1; - globalThis.stageContext = this.context; - } -} diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/MainAbility/MainAbility.ts deleted file mode 100644 index 0123f81b1..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/MainAbility/MainAbility.ts +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 Ability from '@ohos.app.ability.UIAbility' - -export default class MainAbility extends Ability { - onCreate(want,launchParam){ - // Ability is creating, initialize resources for this ability - console.log("ZidlClientTest onCreate") - globalThis.abilityWant = want; - } - - onDestroy() { - // Ability is destroying, release resources for this ability - console.log("ZidlClientTest onDestroy") - } - - onWindowStageCreate(windowStage) { - // Main window is created, set main page for this ability - console.log("ZidlClientTest onWindowStageCreate") - globalThis.abilityContext = this.context - windowStage.setUIContent(this.context, "pages/index/index", null) - console.log("ZidlClientTest onWindowStageCreate finish") - } - - onWindowStageDestroy() { - // Main window is destroyed, release UI related resources - console.log("ZidlClientTest onWindowStageDestroy") - } - - onForeground() { - // Ability has brought to foreground - console.log("ZidlClientTest onForeground") - } - - onBackground() { - // Ability has back to background - console.log("ZidlClientTest onBackground") - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts deleted file mode 100644 index 7b18b7c14..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts +++ /dev/null @@ -1,434 +0,0 @@ -/* -* 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 ServiceExtension from '@ohos.application.ServiceExtensionAbility'; -import Want from '@ohos.application.Want'; -import {voidOutStringCallback} from "./zidlTool/i_zidl_tool_test"; -import {voidOutIntCallback} from "./zidlTool/i_zidl_tool_test"; -import {voidOutMapStringIntCallback} from "./zidlTool/i_zidl_tool_test"; -import {voidOutStringArrayCallback} from "./zidlTool/i_zidl_tool_test"; -import {voidInOutMapStringIntCallback} from "./zidlTool/i_zidl_tool_test"; -import {voidInOutStringArrayCallback} from "./zidlTool/i_zidl_tool_test"; -import {voidInOutIntCallback} from "./zidlTool/i_zidl_tool_test"; -import {voidInOutStringCallback} from "./zidlTool/i_zidl_tool_test"; -import {booleanVoidCallback} from "./zidlTool/i_zidl_tool_test"; -import {byteVoidCallback} from "./zidlTool/i_zidl_tool_test"; -import {shortVoidCallback} from "./zidlTool/i_zidl_tool_test"; -import {intVoidCallback} from "./zidlTool/i_zidl_tool_test"; -import {longVoidCallback} from "./zidlTool/i_zidl_tool_test"; -import {floatVoidCallback} from "./zidlTool/i_zidl_tool_test"; -import {doubleVoidCallback} from "./zidlTool/i_zidl_tool_test"; -import {stringVoidCallback} from "./zidlTool/i_zidl_tool_test"; -import {sequenceableVoidCallback} from "./zidlTool/i_zidl_tool_test"; -import {interfaceVoidCallback} from "./zidlTool/i_zidl_tool_test"; -import {mapStringStringVoidCallback} from "./zidlTool/i_zidl_tool_test"; -import {doubleArrayVoidCallback} from "./zidlTool/i_zidl_tool_test"; -import {voidOrderOutInCallback} from "./zidlTool/i_zidl_tool_test" -import {voidOrderInOutInCallback} from "./zidlTool/i_zidl_tool_test" -import {voidOrderOutInOutCallback} from "./zidlTool/i_zidl_tool_test" -import {voidOrderInInOutOutCallback} from "./zidlTool/i_zidl_tool_test" -import {onewayVoidVoidCallback} from "./zidlTool/i_zidl_tool_test" -import {voidInMapStringIntCallback} from "./zidlTool/i_zidl_tool_test" -import {voidVoidCallback} from "./zidlTool/i_zidl_tool_test" -import {voidInStringArrayCallback} from "./zidlTool/i_zidl_tool_test" -import ZidlTestServiceStub from './zidlTool/zidl_tool_test_stub'; -import MySequenceable from "./zidlTool/my_sequenceable"; -import InterfaceDeclareProxy from './interfaceDeclare/interface_declare_proxy' -import InterfaceDeclareStub from './interfaceDeclare/interface_declare_stub' -import {voidInIntCallback} from "./zidlTool/i_zidl_tool_test" -import {voidInStringCallback} from "./zidlTool/i_zidl_tool_test" -import {voidParameterTypeBooleanCallback} from "./zidlTool/i_zidl_tool_test" -import {voidParameterTypeByteCallback} from "./zidlTool/i_zidl_tool_test" -import {voidParameterTypeShortCallback} from "./zidlTool/i_zidl_tool_test" -import {voidParameterTypeIntCallback} from "./zidlTool/i_zidl_tool_test" -import {voidParameterTypeLongCallback} from "./zidlTool/i_zidl_tool_test" -import {voidParameterTypeFloatCallback} from "./zidlTool/i_zidl_tool_test" -import {voidParameterTypeDoubleCallback} from "./zidlTool/i_zidl_tool_test" -import {voidParameterTypeStringCallback} from "./zidlTool/i_zidl_tool_test" -import {voidParameterTypeSequenceableCallback} from "./zidlTool/i_zidl_tool_test" -import {voidParameterTypeInterfaceCallback} from "./zidlTool/i_zidl_tool_test" -import {voidParameterTypeMapStringStringCallback} from "./zidlTool/i_zidl_tool_test" -import {voidParameterTypeDoubleArrayCallback} from "./zidlTool/i_zidl_tool_test" -import {testInterfaceCallback} from './interfaceDeclare/i_interface_declare' - -var SUCCESS = 0; -var FAIL = 1; - -class ZidlTestImp extends ZidlTestServiceStub { - - onewayVoidVoid(callback: onewayVoidVoidCallback) { - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_0200 called"); - callback(SUCCESS); - } - - voidVoid(callback: voidVoidCallback) { - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_0300 called"); - callback(SUCCESS); - } - - booleanVoid(callback: booleanVoidCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_0400 called"); - var boolean = true; - callback(SUCCESS, boolean); - } - - byteVoid(callback: byteVoidCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_0500 called"); - var mybyte = 1; - callback(SUCCESS, mybyte); - } - - shortVoid(callback: shortVoidCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_0600 called"); - var myshort = 222; - callback(SUCCESS, myshort); - } - - intVoid(callback: intVoidCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_0700 called"); - var myint = 333; - callback(SUCCESS, myint); - } - - longVoid(callback: longVoidCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_0800 called"); - var mylong = 4444; - callback(SUCCESS, mylong); - } - - floatVoid(callback: floatVoidCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_0900 called"); - var myfloat = 10.1; - callback(SUCCESS, myfloat); - } - - doubleVoid(callback: doubleVoidCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_1000 called"); - var mydouble = 22.1; - callback(SUCCESS, mydouble); - } - - stringVoid(callback: stringVoidCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_1100 called"); - var mystring = "stringVoid"; - callback(SUCCESS, mystring); - } - - sequenceableVoid(callback: sequenceableVoidCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_1200 called"); - let mySequence = new MySequenceable(); - callback(SUCCESS, mySequence); - } - - interfaceVoid(callback: interfaceVoidCallback) { - class InterfaceDeclare extends InterfaceDeclareStub { - testInterface(data: number, callback: testInterfaceCallback): void{ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_1300 interfaceStub called"); - let result = FAIL; - - if (data == 1500) { - result = SUCCESS; - } - callback(result); - } - } - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_1300 toolStub called"); - let serverInterface = new InterfaceDeclare('serverInterface'); - callback(SUCCESS, serverInterface); - } - - mapStringStringVoid(callback: mapStringStringVoidCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_1400 called"); - let myMap = new Map(); - myMap.set("string1","string2"); - callback(SUCCESS, myMap); - } - - doubleArrayVoid(callback: doubleArrayVoidCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_1500 called"); - var array = [1.1, 2.1, 3.1]; - callback(SUCCESS, array); - } - - voidInMapStringInt(myMap, callback: voidInMapStringIntCallback){ - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_1600_1 called:'+ myMap.get("string1")); - if(myMap.get("string1") == 1){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidInStringArray(strarray, callback: voidInStringArrayCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_1600_2 called:"+ JSON.stringify(strarray)); - if(strarray[0] == "aaa"&&strarray[1] == "bbb"&&strarray[2] == "ccc"){ - callback(SUCCESS); - }else { - callback(FAIL); - } - } - - voidOutMapStringInt(callback : voidOutMapStringIntCallback){ - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_1700 called'); - var map=new Map(); - map.set("voidOutMapStringInt", 1); - callback(SUCCESS, map); - } - - voidOutStringArray(callback :voidOutStringArrayCallback){ - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_1700 called'); - var strarray = ["aa", "dd"]; - callback(SUCCESS, strarray); - } - - voidInOutMapStringInt(mapIn, callback: voidInOutMapStringIntCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_1800 called'); - var errCode = FAIL; - if ((mapIn.get("voidInOutMapStringInt1") == 1801) && - (mapIn.get("voidInOutMapStringInt2") == 1802)) { - mapIn.set("voidInOutMapStringInt1", 1802); - mapIn.set("voidInOutMapStringInt2", 1801); - errCode = SUCCESS; - } - callback(errCode, mapIn); - } - - voidInOutStringArray(strArrayIn, callback: voidInOutStringArrayCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_1800 called'); - var errCode = FAIL; - if ((strArrayIn[0] == "ddd") && - (strArrayIn[1] == "ccc")) { - strArrayIn[0] = "aaa"; - strArrayIn[1] = "bbb"; - errCode = SUCCESS; - } - callback(errCode, strArrayIn); - } - - voidInInt(number, callback : voidInIntCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_1900 called:'+ JSON.stringify(number)); - if(number == 8888){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidInString(string, callback : voidInStringCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_1900 called:'+ JSON.stringify(string)); - if(string == "voidInString"){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidOutInt(callback : voidOutIntCallback){ - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_2000 called'); - var number = 123; - callback(SUCCESS, number); - } - - voidOutString(callback : voidOutStringCallback){ - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_2000 called'); - var string = "voidOutString"; - callback(SUCCESS, string); - } - - voidInOutInt(number, callback: voidInOutIntCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_2100_1 called:'+ JSON.stringify(number)); - var num = 456789; - if(number == 123456){ - callback(SUCCESS, num); - }else{ - callback(FAIL, number); - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_2100_1 Call_Fail') - } - } - voidInOutString(strinput, callback: voidInOutStringCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_2100_2 called:'+ JSON.stringify(strinput)); - var str = "456789"; - if(strinput == "voidInOutString"){ - callback(SUCCESS, str); - }else{ - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_2100_2 Call_Fail'); - callback(FAIL, strinput); - } - } - - voidParameterTypeBoolean(oBooleanTrue, callback : voidParameterTypeBooleanCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_2200 called:'+ JSON.stringify(oBooleanTrue)); - if(oBooleanTrue == true){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeByte(number, callback : voidParameterTypeByteCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_2300 called:'+ JSON.stringify(number)); - if(number == 1111){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeShort(number, callback : voidParameterTypeShortCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_2400 called:'+ JSON.stringify(number)); - if(number == 2222){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeInt(number, callback : voidParameterTypeIntCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_2500 called:'+ JSON.stringify(number)); - if(number == 3333){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeLong(number, callback : voidParameterTypeLongCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_2600 called:'+ JSON.stringify(number)); - if(number == 4444){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeFloat(number, callback : voidParameterTypeFloatCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_2700 called:'+ JSON.stringify(number)); - if(number == 5555.1){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeDouble(number, callback : voidParameterTypeDoubleCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_2800 called:'+ JSON.stringify(number)); - if(number == 6666.1){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeString(string, callback : voidParameterTypeStringCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_2900 called:'+ JSON.stringify(string)); - if(string == "voidParameterTypeString"){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeSequenceable(MySequenceable, callback : voidParameterTypeSequenceableCallback) { - console.log('ZidlTest Process Server ACTS_Zidl_Js2JsSingle_3000 called:'+ JSON.stringify(MySequenceable)); - if((MySequenceable != null) && (MySequenceable.getNum() == 32) && (MySequenceable.getString() == "nihao")){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeInterface(param: InterfaceDeclareProxy, callback : voidParameterTypeInterfaceCallback) { - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_3100 called"); - let proxy = new InterfaceDeclareProxy(param); - proxy.testInterface(3300, (errCode)=>{ - if (errCode == SUCCESS) { - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_3100 callback SUCCESS"); - callback(SUCCESS); - } else { - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_3100 callback FAIL"); - callback(FAIL); - } - }); - - } - - voidParameterTypeMapStringString(map, callback : voidParameterTypeMapStringStringCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_3200 called:'+ map.get("voidParameterTypeMapStringString")); - if(map.get("voidParameterTypeMapStringString") == "fdhatdh"){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeDoubleArray(array, callback : voidParameterTypeDoubleArrayCallback){ - console.log('ZidlTest Server ACTS_Zidl_Js2JsSingle_3300 called:'+ JSON.stringify(array)); - if(array.length == 2 && array[0] == 1.1 && array[1] == 2.1){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidOrderOutIn(paramI, callback: voidOrderOutInCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_3400 called" + paramI); - var mystring = "hello world"; - callback(SUCCESS, mystring); - } - - voidOrderInOutIn(paramI, paramS, callback: voidOrderInOutInCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_3500 called" + paramI + " " + paramS); - var mynumber = 6; - callback(SUCCESS, mynumber); - } - - voidOrderOutInOut(paramS, callback: voidOrderOutInOutCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_3600 called" + paramS); - var mynumber = 3; - var mystring = "paramcallback"; - callback(SUCCESS, mynumber, mystring); - } - - voidOrderInInOutOut(paramS, paramI, callback: voidOrderInInOutOutCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_3700 called" + paramS + " " + paramI); - var mystring = "callback"; - var mynumber = 4; - callback(SUCCESS, mynumber, mystring); - } -} - -export default class ServiceAbility extends ServiceExtension { - onCreate(want: Want) { - globalThis.abilityWant = want; - console.log('ZidlClientTest ServiceAbility onCreate, want: ' + want.abilityName); - } - - onRequest(want, startId) { - console.log('ZidlClientTest ServiceAbility onRequest, want: ' + want.abilityName - + ', startId: ' + startId); - } - - onConnect(want) { - console.log('ZidlClientTest ServiceAbility onConnect, want:' + want.abilityName); - return new ZidlTestImp('connect'); - } - - onDisconnect(want) { - console.log('ZidlClientTest ServiceAbility onDisconnect, want:' + want.abilityName); - } - - onDestroy() { - console.log('ZidlClientTest ServiceAbility onDestroy'); - } -}; diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/interfaceDeclare/i_interface_declare.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/interfaceDeclare/i_interface_declare.ts deleted file mode 100644 index a9469ce4d..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/interfaceDeclare/i_interface_declare.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2021 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. - */ - - -export default interface IInterfaceDeclare { - testInterface(data: number, callback: testInterfaceCallback): void; -} -export type testInterfaceCallback = (errCode: number) => void; - diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_proxy.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_proxy.ts deleted file mode 100644 index 9f9cc9c43..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_proxy.ts +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2021 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 {testInterfaceCallback} from "./i_interface_declare"; -import IInterfaceDeclare from "./i_interface_declare"; -import rpc from "@ohos.rpc"; - -export default class InterfaceDeclareProxy implements IInterfaceDeclare { - constructor(proxy) { - this.proxy = proxy; - } - - testInterface(data: number, callback: testInterfaceCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeInt(data); - this.proxy.sendRequest(InterfaceDeclareProxy.COMMAND_TEST_INTERFACE, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - static readonly COMMAND_TEST_INTERFACE = 1; - private proxy -} - diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_stub.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_stub.ts deleted file mode 100644 index 1606f77b4..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_stub.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2021 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 {testInterfaceCallback} from "./i_interface_declare"; -import IInterfaceDeclare from "./i_interface_declare"; -import rpc from "@ohos.rpc"; - -export default class InterfaceDeclareStub extends rpc.RemoteObject implements IInterfaceDeclare { - constructor(des: string) { - super(des); - } - - onRemoteRequest(code: number, data, reply, option): boolean { - console.log("onRemoteRequest called, code = " + code); - switch(code) { - case InterfaceDeclareStub.COMMAND_TEST_INTERFACE: { - let _data = data.readInt(); - this.testInterface(_data, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - default: { - console.log("invalid request code" + code); - break; - } - } - return false; - } - - testInterface(data: number, callback: testInterfaceCallback): void{} - - static readonly COMMAND_TEST_INTERFACE = 1; -} - diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/service.ts deleted file mode 100644 index b49731a41..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/service.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* -* 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. -*/ -export default { - onStart() { - console.info('ServiceAbility onStart'); - }, - onStop() { - console.info('ServiceAbility onStop'); - }, - onCommand(want, startId) { - console.info('ServiceAbility onCommand'); - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/zidlTool/i_zidl_tool_test.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/zidlTool/i_zidl_tool_test.ts deleted file mode 100644 index ac9da6352..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/zidlTool/i_zidl_tool_test.ts +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (C) 2021 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 MySequenceable from "./my_sequenceable"; -import IInterfaceDeclare from "../interfaceDeclare/i_interface_declare"; - -export default interface IZidlToolTest { - onewayVoidVoid(callback: onewayVoidVoidCallback): void; - voidVoid(callback: voidVoidCallback): void; - booleanVoid(callback: booleanVoidCallback): void; - byteVoid(callback: byteVoidCallback): void; - shortVoid(callback: shortVoidCallback): void; - intVoid(callback: intVoidCallback): void; - longVoid(callback: longVoidCallback): void; - floatVoid(callback: floatVoidCallback): void; - doubleVoid(callback: doubleVoidCallback): void; - stringVoid(callback: stringVoidCallback): void; - sequenceableVoid(callback: sequenceableVoidCallback): void; - interfaceVoid(callback: interfaceVoidCallback): void; - mapStringStringVoid(callback: mapStringStringVoidCallback): void; - doubleArrayVoid(callback: doubleArrayVoidCallback): void; - voidInMapStringInt(param: Map, callback: voidInMapStringIntCallback): void; - voidInStringArray(param: string[], callback: voidInStringArrayCallback): void; - voidOutMapStringInt(callback: voidOutMapStringIntCallback): void; - voidOutStringArray(callback: voidOutStringArrayCallback): void; - voidInOutMapStringInt(param: Map, callback: voidInOutMapStringIntCallback): void; - voidInOutStringArray(param: string[], callback: voidInOutStringArrayCallback): void; - voidInInt(param: number, callback: voidInIntCallback): void; - voidInString(param: string, callback: voidInStringCallback): void; - voidOutInt(callback: voidOutIntCallback): void; - voidOutString(callback: voidOutStringCallback): void; - voidInOutInt(param: number, callback: voidInOutIntCallback): void; - voidInOutString(param: string, callback: voidInOutStringCallback): void; - voidParameterTypeBoolean(param: boolean, callback: voidParameterTypeBooleanCallback): void; - voidParameterTypeByte(param: number, callback: voidParameterTypeByteCallback): void; - voidParameterTypeShort(param: number, callback: voidParameterTypeShortCallback): void; - voidParameterTypeInt(param: number, callback: voidParameterTypeIntCallback): void; - voidParameterTypeLong(param: number, callback: voidParameterTypeLongCallback): void; - voidParameterTypeFloat(param: number, callback: voidParameterTypeFloatCallback): void; - voidParameterTypeDouble(param: number, callback: voidParameterTypeDoubleCallback): void; - voidParameterTypeString(param: string, callback: voidParameterTypeStringCallback): void; - voidParameterTypeSequenceable(param: MySequenceable, callback: voidParameterTypeSequenceableCallback): void; - voidParameterTypeInterface(param: IInterfaceDeclare, callback: voidParameterTypeInterfaceCallback): void; - voidParameterTypeMapStringString(param: Map, callback: voidParameterTypeMapStringStringCallback): void; - voidParameterTypeDoubleArray(param: number[], callback: voidParameterTypeDoubleArrayCallback): void; - voidOrderOutIn(paramI: number, callback: voidOrderOutInCallback): void; - voidOrderInOutIn(paramI: number, paramS: string, callback: voidOrderInOutInCallback): void; - voidOrderOutInOut(paramS: string, callback: voidOrderOutInOutCallback): void; - voidOrderInInOutOut(paramS: string, paramI: number, callback: voidOrderInInOutOutCallback): void; -} -export type onewayVoidVoidCallback = (errCode: number) => void; -export type voidVoidCallback = (errCode: number) => void; -export type booleanVoidCallback = (errCode: number, returnValue: boolean) => void; -export type byteVoidCallback = (errCode: number, returnValue: number) => void; -export type shortVoidCallback = (errCode: number, returnValue: number) => void; -export type intVoidCallback = (errCode: number, returnValue: number) => void; -export type longVoidCallback = (errCode: number, returnValue: number) => void; -export type floatVoidCallback = (errCode: number, returnValue: number) => void; -export type doubleVoidCallback = (errCode: number, returnValue: number) => void; -export type stringVoidCallback = (errCode: number, returnValue: string) => void; -export type sequenceableVoidCallback = (errCode: number, returnValue: MySequenceable) => void; -export type interfaceVoidCallback = (errCode: number, returnValue: IInterfaceDeclare) => void; -export type mapStringStringVoidCallback = (errCode: number, returnValue: Map) => void; -export type doubleArrayVoidCallback = (errCode: number, returnValue: number[]) => void; -export type voidInMapStringIntCallback = (errCode: number) => void; -export type voidInStringArrayCallback = (errCode: number) => void; -export type voidOutMapStringIntCallback = (errCode: number, param: Map) => void; -export type voidOutStringArrayCallback = (errCode: number, param: string[]) => void; -export type voidInOutMapStringIntCallback = (errCode: number, param: Map) => void; -export type voidInOutStringArrayCallback = (errCode: number, param: string[]) => void; -export type voidInIntCallback = (errCode: number) => void; -export type voidInStringCallback = (errCode: number) => void; -export type voidOutIntCallback = (errCode: number, param: number) => void; -export type voidOutStringCallback = (errCode: number, param: string) => void; -export type voidInOutIntCallback = (errCode: number, param: number) => void; -export type voidInOutStringCallback = (errCode: number, param: string) => void; -export type voidParameterTypeBooleanCallback = (errCode: number) => void; -export type voidParameterTypeByteCallback = (errCode: number) => void; -export type voidParameterTypeShortCallback = (errCode: number) => void; -export type voidParameterTypeIntCallback = (errCode: number) => void; -export type voidParameterTypeLongCallback = (errCode: number) => void; -export type voidParameterTypeFloatCallback = (errCode: number) => void; -export type voidParameterTypeDoubleCallback = (errCode: number) => void; -export type voidParameterTypeStringCallback = (errCode: number) => void; -export type voidParameterTypeSequenceableCallback = (errCode: number) => void; -export type voidParameterTypeInterfaceCallback = (errCode: number) => void; -export type voidParameterTypeMapStringStringCallback = (errCode: number) => void; -export type voidParameterTypeDoubleArrayCallback = (errCode: number) => void; -export type voidOrderOutInCallback = (errCode: number, paramS: string) => void; -export type voidOrderInOutInCallback = (errCode: number, paramI: number) => void; -export type voidOrderOutInOutCallback = (errCode: number, paramI: number, paramS: string) => void; -export type voidOrderInInOutOutCallback = (errCode: number, paramI: number, paramS2: string) => void; - diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/zidlTool/my_sequenceable.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/zidlTool/my_sequenceable.ts deleted file mode 100644 index bef9dcbe2..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/zidlTool/my_sequenceable.ts +++ /dev/null @@ -1,28 +0,0 @@ -export default class MySequenceable { - constructor() { - this.num = 14; - this.str = "hello"; - } - getNum() : number { - return this.num; - } - - getString() : string { - return this.str; - } - - marshalling(messageParcel) { - console.info('marshalling++++'); - messageParcel.writeInt(this.num); - messageParcel.writeString(this.str); - return true; - } - unmarshalling(messageParcel) { - console.info('unmarshalling++++'); - this.num = messageParcel.readInt(); - this.str = messageParcel.readString(); - return true; - } - private num; - private str; -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/zidlTool/zidl_tool_test_stub.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/zidlTool/zidl_tool_test_stub.ts deleted file mode 100644 index 466bc3d60..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility/zidlTool/zidl_tool_test_stub.ts +++ /dev/null @@ -1,549 +0,0 @@ -/* - * Copyright (C) 2021 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 {onewayVoidVoidCallback} from "./i_zidl_tool_test"; -import {voidVoidCallback} from "./i_zidl_tool_test"; -import {booleanVoidCallback} from "./i_zidl_tool_test"; -import {byteVoidCallback} from "./i_zidl_tool_test"; -import {shortVoidCallback} from "./i_zidl_tool_test"; -import {intVoidCallback} from "./i_zidl_tool_test"; -import {longVoidCallback} from "./i_zidl_tool_test"; -import {floatVoidCallback} from "./i_zidl_tool_test"; -import {doubleVoidCallback} from "./i_zidl_tool_test"; -import {stringVoidCallback} from "./i_zidl_tool_test"; -import {sequenceableVoidCallback} from "./i_zidl_tool_test"; -import {interfaceVoidCallback} from "./i_zidl_tool_test"; -import {mapStringStringVoidCallback} from "./i_zidl_tool_test"; -import {doubleArrayVoidCallback} from "./i_zidl_tool_test"; -import {voidInMapStringIntCallback} from "./i_zidl_tool_test"; -import {voidInStringArrayCallback} from "./i_zidl_tool_test"; -import {voidOutMapStringIntCallback} from "./i_zidl_tool_test"; -import {voidOutStringArrayCallback} from "./i_zidl_tool_test"; -import {voidInOutMapStringIntCallback} from "./i_zidl_tool_test"; -import {voidInOutStringArrayCallback} from "./i_zidl_tool_test"; -import {voidInIntCallback} from "./i_zidl_tool_test"; -import {voidInStringCallback} from "./i_zidl_tool_test"; -import {voidOutIntCallback} from "./i_zidl_tool_test"; -import {voidOutStringCallback} from "./i_zidl_tool_test"; -import {voidInOutIntCallback} from "./i_zidl_tool_test"; -import {voidInOutStringCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeBooleanCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeByteCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeShortCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeIntCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeLongCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeFloatCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeDoubleCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeStringCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeSequenceableCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeInterfaceCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeMapStringStringCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeDoubleArrayCallback} from "./i_zidl_tool_test"; -import {voidOrderOutInCallback} from "./i_zidl_tool_test"; -import {voidOrderInOutInCallback} from "./i_zidl_tool_test"; -import {voidOrderOutInOutCallback} from "./i_zidl_tool_test"; -import {voidOrderInInOutOutCallback} from "./i_zidl_tool_test"; -import IZidlToolTest from "./i_zidl_tool_test"; -import rpc from "@ohos.rpc"; -import MySequenceable from "./my_sequenceable"; -import IInterfaceDeclare from "../interfaceDeclare/i_interface_declare"; -import InterfaceDeclareStub from "../interfaceDeclare/interface_declare_stub"; - -export default class ZidlToolTestStub extends rpc.RemoteObject implements IZidlToolTest { - constructor(des: string) { - super(des); - } - - onRemoteRequest(code: number, data, reply, option): boolean { - console.log("onRemoteRequest called, code = " + code); - switch(code) { - case ZidlToolTestStub.COMMAND_ONEWAY_VOID_VOID: { - this.onewayVoidVoid((errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_VOID: { - this.voidVoid((errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_BOOLEAN_VOID: { - this.booleanVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(returnValue ? 1 : 0); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_BYTE_VOID: { - this.byteVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_SHORT_VOID: { - this.shortVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_INT_VOID: { - this.intVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_LONG_VOID: { - this.longVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeLong(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_FLOAT_VOID: { - this.floatVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeFloat(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_DOUBLE_VOID: { - this.doubleVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeDouble(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_STRING_VOID: { - this.stringVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeString(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_SEQUENCEABLE_VOID: { - this.sequenceableVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeSequenceable(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_INTERFACE_VOID: { - this.interfaceVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeRemoteObject(returnValue as InterfaceDeclareStub); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_MAP_STRING_STRING_VOID: { - this.mapStringStringVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(returnValue.size); - for (let [key, value] of returnValue) { - reply.writeString(key); - reply.writeString(value); - } - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_DOUBLE_ARRAY_VOID: { - this.doubleArrayVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeDoubleArray(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_MAP_STRING_INT: { - let _param = new Map(); - let _paramSize = data.readInt(); - for (let i = 0; i < _paramSize; ++i) { - let key = data.readString(); - let value = data.readInt(); - _param.set(key, value); - } - this.voidInMapStringInt(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_STRING_ARRAY: { - let _param = data.readStringArray(); - this.voidInStringArray(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_OUT_MAP_STRING_INT: { - this.voidOutMapStringInt((errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(param.size); - for (let [key, value] of param) { - reply.writeString(key); - reply.writeInt(value); - } - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_OUT_STRING_ARRAY: { - this.voidOutStringArray((errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeStringArray(param); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_OUT_MAP_STRING_INT: { - let _param = new Map(); - let _paramSize = data.readInt(); - for (let i = 0; i < _paramSize; ++i) { - let key = data.readString(); - let value = data.readInt(); - _param.set(key, value); - } - this.voidInOutMapStringInt(_param, (errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(param.size); - for (let [key, value] of param) { - reply.writeString(key); - reply.writeInt(value); - } - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_OUT_STRING_ARRAY: { - let _param = data.readStringArray(); - this.voidInOutStringArray(_param, (errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeStringArray(param); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_INT: { - let _param = data.readInt(); - this.voidInInt(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_STRING: { - let _param = data.readString(); - this.voidInString(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_OUT_INT: { - this.voidOutInt((errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(param); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_OUT_STRING: { - this.voidOutString((errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeString(param); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_OUT_INT: { - let _param = data.readInt(); - this.voidInOutInt(_param, (errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(param); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_OUT_STRING: { - let _param = data.readString(); - this.voidInOutString(_param, (errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeString(param); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_BOOLEAN: { - let _param = data.readInt() == 1 ? true : false; - this.voidParameterTypeBoolean(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_BYTE: { - let _param = data.readInt(); - this.voidParameterTypeByte(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_SHORT: { - let _param = data.readInt(); - this.voidParameterTypeShort(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_INT: { - let _param = data.readInt(); - this.voidParameterTypeInt(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_LONG: { - let _param = data.readLong(); - this.voidParameterTypeLong(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_FLOAT: { - let _param = data.readFloat(); - this.voidParameterTypeFloat(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_DOUBLE: { - let _param = data.readDouble(); - this.voidParameterTypeDouble(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_STRING: { - let _param = data.readString(); - this.voidParameterTypeString(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_SEQUENCEABLE: { - let _param = new MySequenceable(); - data.readSequenceable(_param); - this.voidParameterTypeSequenceable(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_INTERFACE: { - let _param = data.readRemoteObject(); - this.voidParameterTypeInterface(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_MAP_STRING_STRING: { - let _param = new Map(); - let _paramSize = data.readInt(); - for (let i = 0; i < _paramSize; ++i) { - let key = data.readString(); - let value = data.readString(); - _param.set(key, value); - } - this.voidParameterTypeMapStringString(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_DOUBLE_ARRAY: { - let _param = data.readDoubleArray(); - this.voidParameterTypeDoubleArray(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_ORDER_OUT_IN: { - let _paramI = data.readInt(); - this.voidOrderOutIn(_paramI, (errCode, paramS) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeString(paramS); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_ORDER_IN_OUT_IN: { - let _paramI = data.readInt(); - let _paramS = data.readString(); - this.voidOrderInOutIn(_paramI, _paramS, (errCode, paramI) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(paramI); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_ORDER_OUT_IN_OUT: { - let _paramS = data.readString(); - this.voidOrderOutInOut(_paramS, (errCode, paramI, paramS) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(paramI); - reply.writeString(paramS); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_ORDER_IN_IN_OUT_OUT: { - let _paramS = data.readString(); - let _paramI = data.readInt(); - this.voidOrderInInOutOut(_paramS, _paramI, (errCode, paramI, paramS2) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(paramI); - reply.writeString(paramS2); - } - }); - return true; - } - default: { - console.log("invalid request code" + code); - break; - } - } - return false; - } - - onewayVoidVoid(callback: onewayVoidVoidCallback): void{} - voidVoid(callback: voidVoidCallback): void{} - booleanVoid(callback: booleanVoidCallback): void{} - byteVoid(callback: byteVoidCallback): void{} - shortVoid(callback: shortVoidCallback): void{} - intVoid(callback: intVoidCallback): void{} - longVoid(callback: longVoidCallback): void{} - floatVoid(callback: floatVoidCallback): void{} - doubleVoid(callback: doubleVoidCallback): void{} - stringVoid(callback: stringVoidCallback): void{} - sequenceableVoid(callback: sequenceableVoidCallback): void{} - interfaceVoid(callback: interfaceVoidCallback): void{} - mapStringStringVoid(callback: mapStringStringVoidCallback): void{} - doubleArrayVoid(callback: doubleArrayVoidCallback): void{} - voidInMapStringInt(param: Map, callback: voidInMapStringIntCallback): void{} - voidInStringArray(param: string[], callback: voidInStringArrayCallback): void{} - voidOutMapStringInt(callback: voidOutMapStringIntCallback): void{} - voidOutStringArray(callback: voidOutStringArrayCallback): void{} - voidInOutMapStringInt(param: Map, callback: voidInOutMapStringIntCallback): void{} - voidInOutStringArray(param: string[], callback: voidInOutStringArrayCallback): void{} - voidInInt(param: number, callback: voidInIntCallback): void{} - voidInString(param: string, callback: voidInStringCallback): void{} - voidOutInt(callback: voidOutIntCallback): void{} - voidOutString(callback: voidOutStringCallback): void{} - voidInOutInt(param: number, callback: voidInOutIntCallback): void{} - voidInOutString(param: string, callback: voidInOutStringCallback): void{} - voidParameterTypeBoolean(param: boolean, callback: voidParameterTypeBooleanCallback): void{} - voidParameterTypeByte(param: number, callback: voidParameterTypeByteCallback): void{} - voidParameterTypeShort(param: number, callback: voidParameterTypeShortCallback): void{} - voidParameterTypeInt(param: number, callback: voidParameterTypeIntCallback): void{} - voidParameterTypeLong(param: number, callback: voidParameterTypeLongCallback): void{} - voidParameterTypeFloat(param: number, callback: voidParameterTypeFloatCallback): void{} - voidParameterTypeDouble(param: number, callback: voidParameterTypeDoubleCallback): void{} - voidParameterTypeString(param: string, callback: voidParameterTypeStringCallback): void{} - voidParameterTypeSequenceable(param: MySequenceable, callback: voidParameterTypeSequenceableCallback): void{} - voidParameterTypeInterface(param: IInterfaceDeclare, callback: voidParameterTypeInterfaceCallback): void{} - voidParameterTypeMapStringString(param: Map, callback: voidParameterTypeMapStringStringCallback): void{} - voidParameterTypeDoubleArray(param: number[], callback: voidParameterTypeDoubleArrayCallback): void{} - voidOrderOutIn(paramI: number, callback: voidOrderOutInCallback): void{} - voidOrderInOutIn(paramI: number, paramS: string, callback: voidOrderInOutInCallback): void{} - voidOrderOutInOut(paramS: string, callback: voidOrderOutInOutCallback): void{} - voidOrderInInOutOut(paramS: string, paramI: number, callback: voidOrderInInOutOutCallback): void{} - - static readonly COMMAND_ONEWAY_VOID_VOID = 1; - static readonly COMMAND_VOID_VOID = 2; - static readonly COMMAND_BOOLEAN_VOID = 3; - static readonly COMMAND_BYTE_VOID = 4; - static readonly COMMAND_SHORT_VOID = 5; - static readonly COMMAND_INT_VOID = 6; - static readonly COMMAND_LONG_VOID = 7; - static readonly COMMAND_FLOAT_VOID = 8; - static readonly COMMAND_DOUBLE_VOID = 9; - static readonly COMMAND_STRING_VOID = 10; - static readonly COMMAND_SEQUENCEABLE_VOID = 11; - static readonly COMMAND_INTERFACE_VOID = 12; - static readonly COMMAND_MAP_STRING_STRING_VOID = 13; - static readonly COMMAND_DOUBLE_ARRAY_VOID = 14; - static readonly COMMAND_VOID_IN_MAP_STRING_INT = 15; - static readonly COMMAND_VOID_IN_STRING_ARRAY = 16; - static readonly COMMAND_VOID_OUT_MAP_STRING_INT = 17; - static readonly COMMAND_VOID_OUT_STRING_ARRAY = 18; - static readonly COMMAND_VOID_IN_OUT_MAP_STRING_INT = 19; - static readonly COMMAND_VOID_IN_OUT_STRING_ARRAY = 20; - static readonly COMMAND_VOID_IN_INT = 21; - static readonly COMMAND_VOID_IN_STRING = 22; - static readonly COMMAND_VOID_OUT_INT = 23; - static readonly COMMAND_VOID_OUT_STRING = 24; - static readonly COMMAND_VOID_IN_OUT_INT = 25; - static readonly COMMAND_VOID_IN_OUT_STRING = 26; - static readonly COMMAND_VOID_PARAMETER_TYPE_BOOLEAN = 27; - static readonly COMMAND_VOID_PARAMETER_TYPE_BYTE = 28; - static readonly COMMAND_VOID_PARAMETER_TYPE_SHORT = 29; - static readonly COMMAND_VOID_PARAMETER_TYPE_INT = 30; - static readonly COMMAND_VOID_PARAMETER_TYPE_LONG = 31; - static readonly COMMAND_VOID_PARAMETER_TYPE_FLOAT = 32; - static readonly COMMAND_VOID_PARAMETER_TYPE_DOUBLE = 33; - static readonly COMMAND_VOID_PARAMETER_TYPE_STRING = 34; - static readonly COMMAND_VOID_PARAMETER_TYPE_SEQUENCEABLE = 35; - static readonly COMMAND_VOID_PARAMETER_TYPE_INTERFACE = 36; - static readonly COMMAND_VOID_PARAMETER_TYPE_MAP_STRING_STRING = 37; - static readonly COMMAND_VOID_PARAMETER_TYPE_DOUBLE_ARRAY = 38; - static readonly COMMAND_VOID_ORDER_OUT_IN = 39; - static readonly COMMAND_VOID_ORDER_IN_OUT_IN = 40; - static readonly COMMAND_VOID_ORDER_OUT_IN_OUT = 41; - static readonly COMMAND_VOID_ORDER_IN_IN_OUT_OUT = 42; -} - diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts deleted file mode 100644 index 4b236a488..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* -* 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 ServiceExtension from '@ohos.application.ServiceExtensionAbility'; -import Want from '@ohos.application.Want'; -import ZidlTestServiceStubOneway from './zidlToolOneWay/interface_attribute_declaratoin_oneway_stub'; -import {voidVoidFirstCallback} from './zidlToolOneWay/i_interface_attribute_declaratoin_oneway' -import {voidVoidSecondCallback} from './zidlToolOneWay/i_interface_attribute_declaratoin_oneway' -import {voidVoidThirdCallback} from './zidlToolOneWay/i_interface_attribute_declaratoin_oneway' - -const SUCCESS = 0; -const FAIL = 1; - -class ZidlTestImpOneway extends ZidlTestServiceStubOneway { - voidVoidFirst(callback: voidVoidFirstCallback) { - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_0100_1 called"); - callback(SUCCESS); - } - - voidVoidSecond(callback: voidVoidSecondCallback) { - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_0100_2 called"); - callback(SUCCESS); - } - - voidVoidThird(callback: voidVoidThirdCallback) { - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_0100_3 called"); - callback(SUCCESS); - } -} - -export default class ServiceAbility2 extends ServiceExtension { - onCreate(want: Want) { - globalThis.abilityWant = want; - console.log('ZidlClientTest ServiceAbility2 onCreate, want: ' + want.abilityName); - } - - onRequest(want, startId) { - console.log('ZidlClientTest ServiceAbility2 onRequest, want: ' + want.abilityName - + ', startId: ' + startId); - } - - onConnect(want) { - console.log('ZidlClientTest ServiceAbility2 onConnect, want:' + want.abilityName); - return new ZidlTestImpOneway('connect'); - } - - onDisconnect(want) { - console.log('ZidlClientTest ServiceAbility2 onDisconnect, want:' + want.abilityName); - } - - onDestroy() { - console.log('ZidlClientTest ServiceAbility2 onDestroy'); - } -}; diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/service.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/service.ts deleted file mode 100644 index b49731a41..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/service.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* -* 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. -*/ -export default { - onStart() { - console.info('ServiceAbility onStart'); - }, - onStop() { - console.info('ServiceAbility onStop'); - }, - onCommand(want, startId) { - console.info('ServiceAbility onCommand'); - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/i_interface_attribute_declaratoin_oneway.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/i_interface_attribute_declaratoin_oneway.ts deleted file mode 100644 index a17db0f5d..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/i_interface_attribute_declaratoin_oneway.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2021 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. - */ - - -export default interface IInterfaceAttributeDeclaratoinOneway { - voidVoidFirst(callback: voidVoidFirstCallback): void; - voidVoidSecond(callback: voidVoidSecondCallback): void; - voidVoidThird(callback: voidVoidThirdCallback): void; -} -export type voidVoidFirstCallback = (errCode: number) => void; -export type voidVoidSecondCallback = (errCode: number) => void; -export type voidVoidThirdCallback = (errCode: number) => void; - diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/interface_attribute_declaratoin_oneway_stub.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/interface_attribute_declaratoin_oneway_stub.ts deleted file mode 100644 index 016f352bd..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/interface_attribute_declaratoin_oneway_stub.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2021 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 {voidVoidFirstCallback} from "./i_interface_attribute_declaratoin_oneway"; -import {voidVoidSecondCallback} from "./i_interface_attribute_declaratoin_oneway"; -import {voidVoidThirdCallback} from "./i_interface_attribute_declaratoin_oneway"; -import IInterfaceAttributeDeclaratoinOneway from "./i_interface_attribute_declaratoin_oneway"; -import rpc from "@ohos.rpc"; - -export default class InterfaceAttributeDeclaratoinOnewayStub extends rpc.RemoteObject implements IInterfaceAttributeDeclaratoinOneway { - constructor(des: string) { - super(des); - } - - onRemoteRequest(code: number, data, reply, option): boolean { - console.log("onRemoteRequest called, code = " + code); - switch(code) { - case InterfaceAttributeDeclaratoinOnewayStub.COMMAND_VOID_VOID_FIRST: { - this.voidVoidFirst((errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case InterfaceAttributeDeclaratoinOnewayStub.COMMAND_VOID_VOID_SECOND: { - this.voidVoidSecond((errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case InterfaceAttributeDeclaratoinOnewayStub.COMMAND_VOID_VOID_THIRD: { - this.voidVoidThird((errCode) => { - reply.writeInt(errCode); - }); - return true; - } - default: { - console.log("invalid request code" + code); - break; - } - } - return false; - } - - voidVoidFirst(callback: voidVoidFirstCallback): void{} - voidVoidSecond(callback: voidVoidSecondCallback): void{} - voidVoidThird(callback: voidVoidThirdCallback): void{} - - static readonly COMMAND_VOID_VOID_FIRST = 1; - static readonly COMMAND_VOID_VOID_SECOND = 2; - static readonly COMMAND_VOID_VOID_THIRD = 3; -} - diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/interfaceDeclare/i_interface_declare.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/interfaceDeclare/i_interface_declare.ts deleted file mode 100644 index a9469ce4d..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/interfaceDeclare/i_interface_declare.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2021 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. - */ - - -export default interface IInterfaceDeclare { - testInterface(data: number, callback: testInterfaceCallback): void; -} -export type testInterfaceCallback = (errCode: number) => void; - diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/interfaceDeclare/interface_declare_proxy.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/interfaceDeclare/interface_declare_proxy.ts deleted file mode 100644 index 9f9cc9c43..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/interfaceDeclare/interface_declare_proxy.ts +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2021 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 {testInterfaceCallback} from "./i_interface_declare"; -import IInterfaceDeclare from "./i_interface_declare"; -import rpc from "@ohos.rpc"; - -export default class InterfaceDeclareProxy implements IInterfaceDeclare { - constructor(proxy) { - this.proxy = proxy; - } - - testInterface(data: number, callback: testInterfaceCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeInt(data); - this.proxy.sendRequest(InterfaceDeclareProxy.COMMAND_TEST_INTERFACE, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - static readonly COMMAND_TEST_INTERFACE = 1; - private proxy -} - diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/interfaceDeclare/interface_declare_stub.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/interfaceDeclare/interface_declare_stub.ts deleted file mode 100644 index 1606f77b4..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/interfaceDeclare/interface_declare_stub.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2021 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 {testInterfaceCallback} from "./i_interface_declare"; -import IInterfaceDeclare from "./i_interface_declare"; -import rpc from "@ohos.rpc"; - -export default class InterfaceDeclareStub extends rpc.RemoteObject implements IInterfaceDeclare { - constructor(des: string) { - super(des); - } - - onRemoteRequest(code: number, data, reply, option): boolean { - console.log("onRemoteRequest called, code = " + code); - switch(code) { - case InterfaceDeclareStub.COMMAND_TEST_INTERFACE: { - let _data = data.readInt(); - this.testInterface(_data, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - default: { - console.log("invalid request code" + code); - break; - } - } - return false; - } - - testInterface(data: number, callback: testInterfaceCallback): void{} - - static readonly COMMAND_TEST_INTERFACE = 1; -} - diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/index.ets deleted file mode 100644 index 4b3495d6f..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/index.ets +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 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 file from '@system.file'; - -import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index" -import testsuite from "../../test/List.test.ets" - -@Entry -@Component -struct Index { - - aboutToAppear() { - console.info("start run testcase!!!!") - const core = Core.getInstance() - const expectExtend = new ExpectExtend({ - 'id': 'extend' - }) - core.addService('expect', expectExtend) - const reportExtend = new ReportExtend(file) - - core.addService('report', reportExtend) - core.init() - core.subscribeEvent('task', reportExtend) - const configService = core.getDefaultService('config') - console.info('parameters---->' + JSON.stringify(globalThis.abilityWant.parameters)) - globalThis.abilityWant.parameters['timeout'] = 10000; - configService.setConfig(globalThis.abilityWant.parameters) - testsuite(globalThis.abilityContext) - core.execute() - } - - build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text('Test App') - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('next page') - .fontSize(25) - .fontWeight(FontWeight.Bold) - }.type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .onClick(() => { - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/index/index.ets b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/index/index.ets deleted file mode 100644 index 37b86f509..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/index/index.ets +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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 file from '@system.file'; - -import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index" -import testsuite from "../../test/List.test.ets" - - -@Entry -@Component -struct Index { - - aboutToAppear(){ - console.info("start run testcase!!!!") - const core = Core.getInstance() - const expectExtend = new ExpectExtend({ - 'id': 'extend' - }) - core.addService('expect', expectExtend) - const reportExtend = new ReportExtend(file) - - core.addService('report', reportExtend) - core.init() - core.subscribeEvent('task', reportExtend) - const configService = core.getDefaultService('config') - console.info('parameters---->' + JSON.stringify(globalThis.abilityWant.parameters)) - globalThis.abilityWant.parameters.timeout = 70000; - configService.setConfig(globalThis.abilityWant.parameters) - testsuite(globalThis.abilityContext) - core.execute() - } - - build() { - Flex({ direction:FlexDirection.Column, alignItems:ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text('Hello World') - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('next page') - .fontSize(25) - .fontWeight(FontWeight.Bold) - }.type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .onClick(() => { - - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/second.ets b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/second.ets deleted file mode 100644 index 33d9ae452..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/second.ets +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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 router from '@system.router'; - -@Entry -@Component -struct Second { - private content: string = "Second Page" - - build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text(`${this.content}`) - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('back to index') - .fontSize(20) - .fontWeight(FontWeight.Bold) - }.type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .onClick(() => { - router.back() - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/second/second.ets b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/second/second.ets deleted file mode 100644 index f9009a3e8..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/pages/second/second.ets +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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 router from '@system.router'; - -@Entry -@Component -struct Second { - private content: string = "Second Page" - - build() { - Flex({ direction: FlexDirection.Column,alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text(`${this.content}`) - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('back to index') - .fontSize(20) - .fontWeight(FontWeight.Bold) - }.type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .onClick(() => { - router.back() - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/test/Ability.test.ets deleted file mode 100644 index 87c351546..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/test/Ability.test.ets +++ /dev/null @@ -1,1586 +0,0 @@ -/* - * 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 { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index" -import MySequenceable from '../zidlTool/my_sequenceable' -import ZidlTestServiceProxy from '../zidlTool/zidl_tool_test_proxy' -import ZidlTestServiceProxyOneway from '../zidlToolOneWay/interface_attribute_declaratoin_oneway_proxy' -import InterfaceDeclareStub from '../interfaceDeclare/interface_declare_stub' -import InterfaceDeclareProxy from '../interfaceDeclare/interface_declare_proxy' -import { testInterfaceCallback } from '../interfaceDeclare/i_interface_declare' - -var connectionId = -1; -var connectionOnewayId = -1; -var connectionIdSingle = -1; -var connectionOnewayIdSingle = -1; -var testProxyMulti; -var testProxyMultiOneway; -var testProxySingle; -var testProxySingleOneway; -const SUCCESS = 0; -const FAIL = 1; - -export default function abilityTest(abilityContext) { - describe('ActsAbilityTest', function () { - - beforeAll(async (done) => { - var count = 0; - - function checkDone() { - if (count >= 4) { - done(); - } - } - - var paMultiConnect = { - onConnect: function (elementName, proxy) { - console.log("ZidlTest Client Faconnection onConnect called."); - console.log("ZidlTest Client Faconnection onConnect elementName = " + elementName); - console.log("ZidlTest Client Faconnection onConnect proxy = " + proxy); - testProxyMulti = new ZidlTestServiceProxy(proxy); - count++; - checkDone(); - }, - onDisconnect: function (elementName) { - console.log("ZidlTest Client onDisconnectService onDisconnect"); - }, - onFailed: function (code) { - console.log("ZidlTest Client onDisconnectService onFailed"); - count++; - checkDone(); - } - }; - - var paMultiOnewayConnect = { - onConnect: function (elementName, proxy) { - console.log("ZidlTest Client Faconnection onConnect called."); - console.log("ZidlTest Client Faconnection onConnect elementName = " + elementName); - console.log("ZidlTest Client Faconnection onConnect proxy = " + proxy); - testProxyMultiOneway = new ZidlTestServiceProxyOneway(proxy); - count++; - checkDone(); - }, - onDisconnect: function (elementName) { - console.log("ZidlTest Client onDisconnectService onDisconnect"); - }, - onFailed: function (code) { - console.log("ZidlTest Client onDisconnectService onFailed"); - count++; - checkDone(); - } - }; - - var paSingleConnect = { - onConnect: function (elementName, proxy) { - console.log("ZidlTest Client Faconnection onConnect called."); - console.log("ZidlTest Client Faconnection onConnect elementName = " + elementName); - console.log("ZidlTest Client Faconnection onConnect proxy = " + proxy); - testProxySingle = new ZidlTestServiceProxy(proxy); - count++; - checkDone(); - }, - onDisconnect: function (elementName) { - console.log("ZidlTest Client onDisconnectService onDisconnect"); - }, - onFailed: function (code) { - console.log("ZidlTest Client onDisconnectService onFailed"); - count++; - checkDone(); - } - }; - - var paSingleOnewayConnect = { - onConnect: function (elementName, proxy) { - console.log("ZidlTest Client Faconnection onConnect called."); - console.log("ZidlTest Client Faconnection onConnect elementName = " + elementName); - console.log("ZidlTest Client Faconnection onConnect proxy = " + proxy); - testProxySingleOneway = new ZidlTestServiceProxyOneway(proxy); - count++; - checkDone(); - }, - onDisconnect: function (elementName) { - console.log("ZidlTest Client onDisconnectService onDisconnect"); - }, - onFailed: function (code) { - console.log("ZidlTest Client onDisconnectService onFailed"); - count++; - checkDone(); - } - }; - - let wantMulti = { - "bundleName": "com.example.zidlservice", - "abilityName": "com.example.zidlservice.ServiceAbility" - }; - let wantMultiOneway = { - "bundleName": "com.example.zidlservice", - "abilityName": "com.example.zidlservice.ServiceAbility2" - }; - let wantSingle = { - "bundleName": "com.example.zidlclienttest", - "abilityName": "com.example.zidlclienttest.ServiceAbility" - }; - let wantSingleOneway = { - "bundleName": "com.example.zidlclienttest", - "abilityName": "com.example.zidlclienttest.ServiceAbility2" - }; - - console.info('ZidlTest Client connectAbility start'); - connectionId = globalThis.abilityContext.connectServiceExtensionAbility(wantMulti, paMultiConnect); - console.info('ZidlTest Client connectAbility end connectionId = ' + connectionId); - connectionOnewayId = globalThis.abilityContext.connectServiceExtensionAbility(wantMultiOneway, paMultiOnewayConnect); - console.info('ZidlTest Client connectAbility end connectionOnewayId = ' + connectionOnewayId); - - connectionIdSingle = globalThis.abilityContext.connectServiceExtensionAbility(wantSingle, paSingleConnect); - console.info('ZidlTest Client connectAbility end connectionIdSingle = ' + connectionIdSingle); - connectionOnewayIdSingle = globalThis.abilityContext.connectServiceExtensionAbility(wantSingleOneway, paSingleOnewayConnect); - console.info('ZidlTest Client connectAbility end connectionOnewayIdSingle = ' + connectionOnewayIdSingle); - }) - - afterEach(async (done) => { - setTimeout(() => { - done(); - }, 200) - }) - - afterAll(async (done) => { - var count = 0; - - function checkDone() { - if (count >= 4) { - done(); - } - } - - globalThis.abilityContext.disconnectServiceExtensionAbility(connectionId, (err) => { - console.info('ZidlTest Client disconnectAbility result ' + JSON.stringify(err)); - connectionId = -1; - testProxyMulti = null; - count++; - checkDone(); - }) - - globalThis.abilityContext.disconnectServiceExtensionAbility(connectionOnewayId, (err) => { - console.info('ZidlTest Client disconnectAbility2 result ' + JSON.stringify(err)); - connectionOnewayId = -1; - testProxyMultiOneway = null; - count++; - checkDone(); - }) - - globalThis.abilityContext.disconnectServiceExtensionAbility(connectionIdSingle, (err) => { - console.info('ZidlTest Client disconnectAbility result ' + JSON.stringify(err)); - connectionIdSingle = -1; - testProxyMulti = null; - count++; - checkDone(); - }) - - globalThis.abilityContext.disconnectServiceExtensionAbility(connectionOnewayIdSingle, (err) => { - console.info('ZidlTest Client disconnectAbility2 result ' + JSON.stringify(err)); - connectionOnewayIdSingle = -1; - testProxyMultiOneway = null; - count++; - checkDone(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_0100 - * @tc.name: support method attributes declaration [oneway] - * @tc.desc: [oneway] interface zidl.systemtest.IInterfaceAttributeDeclaratoinOneway {} - */ - it('ACTS_Zidl_Js2JsMulti_0100', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_0100 begin'); - var flagFir = false; - var flagSec = false; - var flagThi = false; - - function checkFinish() { - if (flagFir && flagSec && flagThi) { - done(); - } - } - - setTimeout(function () { - testProxyMultiOneway.voidVoidFirst((errCode) => { - expect(errCode).assertEqual(SUCCESS); - flagFir = true; - checkFinish(); - }); - testProxyMultiOneway.voidVoidSecond((errCode) => { - expect(errCode).assertEqual(SUCCESS); - flagSec = true; - checkFinish(); - }); - testProxyMultiOneway.voidVoidThird((errCode) => { - expect(errCode).assertEqual(SUCCESS); - flagThi = true; - checkFinish(); - }); - }, 500); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_0200 - * @tc.name: support method attributes declaration [oneway] - * @tc.desc: [oneway] void onewayVoidVoid() - */ - it('ACTS_Zidl_Js2JsMulti_0200', 0, async function (done) { - testProxyMulti.onewayVoidVoid((errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_0300 - * @tc.name: support method result type void - * @tc.desc: void voidVoid(); - */ - it('ACTS_Zidl_Js2JsMulti_0300', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_0300 begin'); - testProxyMulti.voidVoid((errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_0400 - * @tc.name: support method result type boolean - * @tc.desc: boolean booleanVoid(); - */ - it('ACTS_Zidl_Js2JsMulti_0400', 0, async function (done) { - testProxyMulti.booleanVoid((errCode, boolean) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_0400 call return:" + boolean); - expect(errCode).assertEqual(SUCCESS); - expect(boolean).assertEqual(true); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_0500 - * @tc.name: support method result type byte - * @tc.desc: number byteVoid(); - */ - it('ACTS_Zidl_Js2JsMulti_0500', 0, async function (done) { - testProxyMulti.byteVoid((errCode, mybyte) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_0500 call return:" + mybyte); - expect(errCode).assertEqual(SUCCESS); - expect(mybyte).assertEqual(1); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_0600 - * @tc.name: support method result type short - * @tc.desc: number shortVoid(); - */ - it('ACTS_Zidl_Js2JsMulti_0600', 0, async function (done) { - testProxyMulti.shortVoid((errCode, myshort) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_0600 call return:" + myshort); - expect(errCode).assertEqual(SUCCESS); - expect(myshort).assertEqual(222); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_0700 - * @tc.name: support method result type int - * @tc.desc: number intVoid(); - */ - it('ACTS_Zidl_Js2JsMulti_0700', 0, async function (done) { - testProxyMulti.intVoid((errCode, myint) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_0700 call return:" + myint); - expect(errCode).assertEqual(SUCCESS); - expect(myint).assertEqual(333); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_0800 - * @tc.name: support method result type long - * @tc.desc: number longVoid(); - */ - it('ACTS_Zidl_Js2JsMulti_0800', 0, async function (done) { - testProxyMulti.longVoid((errCode, mylong) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_0800 call return:" + mylong); - expect(errCode).assertEqual(SUCCESS); - expect(mylong).assertEqual(4444); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_0900 - * @tc.name: support method result type float - * @tc.desc: number floatVoid(); - */ - it('ACTS_Zidl_Js2JsMulti_0900', 0, async function (done) { - testProxyMulti.floatVoid((errCode, myfloat) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_0900 call return:" + myfloat); - expect(errCode).assertEqual(SUCCESS); - expect(myfloat).assertEqual(10.1); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_1000 - * @tc.name: support method result type double - * @tc.desc: number doubleVoid(); - */ - it('ACTS_Zidl_Js2JsMulti_1000', 0, async function (done) { - testProxyMulti.doubleVoid((errCode, mydouble) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_1000 call return:" + mydouble); - expect(errCode).assertEqual(SUCCESS); - expect(mydouble).assertEqual(22.1); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_1100 - * @tc.name: support method result type String - * @tc.desc: String stringVoid(); - */ - it('ACTS_Zidl_Js2JsMulti_1100', 0, async function (done) { - testProxyMulti.stringVoid((errCode, mystring) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_1100 call return:" + mystring); - expect(errCode).assertEqual(SUCCESS); - expect(mystring).assertEqual("stringVoid"); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_1200 - * @tc.name: support method result type sequenceable - * @tc.desc: TestInfo sequenceableVoid(); - */ - it('ACTS_Zidl_Js2JsMulti_1200', 0, async function (done) { - testProxyMulti.sequenceableVoid((errCode, mysequenceable) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_1200 call return:" + JSON.stringify(mysequenceable)); - expect(errCode).assertEqual(SUCCESS); - expect(mysequenceable.getNum()).assertEqual(14); - expect(mysequenceable.getString()).assertEqual("hello"); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_1300 - * @tc.name: support method result type interface - * @tc.desc: ITest interfaceVoid(); - */ - it('ACTS_Zidl_Js2JsMulti_1300', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_1300 begin'); - - testProxyMulti.interfaceVoid((errCode, data) => { - console.log("ZidlTest Server ACTS_Zidl_Js2JsMulti_1300 called"); - expect(errCode).assertEqual(SUCCESS); - let proxy = new InterfaceDeclareProxy(data); - proxy.testInterface(1500, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }); - }) - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_1400 - * @tc.name: support method result type Map container type - * @tc.desc: Map mapStringStringVoid(); - */ - it('ACTS_Zidl_Js2JsMulti_1400', 0, async function (done) { - testProxyMulti.mapStringStringVoid((errCode, mymapStringString) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_1400 call return:" + mymapStringString.get("string1")); - expect(errCode).assertEqual(SUCCESS); - expect(mymapStringString.get("string1")).assertEqual("string2"); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_1500 - * @tc.name: support method result type array type - * @tc.desc: double[] doubleArrayVoid(); - */ - it('ACTS_Zidl_Js2JsMulti_1500', 0, async function (done) { - testProxyMulti.doubleArrayVoid((errCode, mydoubleArray) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_1500 call return:" + mydoubleArray); - expect(errCode).assertEqual(SUCCESS); - expect(mydoubleArray.length).assertEqual(3); - expect(mydoubleArray[0]).assertEqual(1.1); - expect(mydoubleArray[1]).assertEqual(2.1); - expect(mydoubleArray[2]).assertEqual(3.1); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_1600 - * @tc.name: support object type formal parameter attribute in - * @tc.desc: sequenceable zidl.systemtest.TestInfo; void voidInObject([in] TestInfo param); - */ - it('ACTS_Zidl_Js2JsMulti_1600', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_1600 begin'); - var flagFir = false; - var flagSec = false; - - function checkFinish() { - if (flagFir && flagSec) { - done(); - } - } - - let myMap = new Map(); - myMap.set("string1", 1); - var strarray = ["aaa", "bbb", "ccc"]; - testProxyMulti.voidInMapStringInt(myMap, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - flagFir = true; - checkFinish(); - }); - testProxyMulti.voidInStringArray(strarray, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - flagSec = true; - checkFinish(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_1700 - * @tc.name: support object type formal parameter attribute out - * @tc.desc: sequenceable zidl.systemtest.TestInfo;void voidOutObject([out] String param); - */ - it('ACTS_Zidl_Js2JsMulti_1700', 0, async function (done) { - var flagFir = false; - var flagSec = false; - - function checkFinish() { - if (flagFir && flagSec) { - done(); - } - } - - testProxyMulti.voidOutMapStringInt((errCode, map) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_1700 call return:" + map.get("voidOutMapStringInt")); - expect(errCode).assertEqual(SUCCESS); - expect(map.get("voidOutMapStringInt")).assertEqual(1); - flagFir = true; - checkFinish(); - }); - testProxyMulti.voidOutStringArray((errCode, strArray) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_1700 call return:" + JSON.stringify(strArray)); - expect(errCode).assertEqual(SUCCESS); - expect(strArray[0]).assertEqual("aa"); - expect(strArray[1]).assertEqual("dd"); - flagSec = true; - checkFinish(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_1800 - * @tc.name: support object type formal parameter attribute in, out - * @tc.desc: sequenceable zidl.systemtest.TestInfo;void voidInOutObject([in, out] TestInfo param); - */ - it('ACTS_Zidl_Js2JsMulti_1800', 0, async function (done) { - var flagFir = false; - var flagSec = false; - - function checkFinish() { - if (flagFir && flagSec) { - done(); - } - } - - var mapIn = new Map(); - mapIn.set("voidInOutMapStringInt1", 1801); - mapIn.set("voidInOutMapStringInt2", 1802); - testProxyMulti.voidInOutMapStringInt(mapIn, (errCode, map) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_1800 call return:" + map.get("voidInOutMapStringInt")); - expect(errCode).assertEqual(SUCCESS); - expect(map.get("voidInOutMapStringInt1")).assertEqual(1802); - expect(map.get("voidInOutMapStringInt2")).assertEqual(1801); - flagFir = true; - checkFinish(); - }); - - var strArrayIn = ["ddd", "ccc"]; - testProxyMulti.voidInOutStringArray(strArrayIn, (errCode, strArray) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_1800 call return:" + JSON.stringify(strArray)); - expect(errCode).assertEqual(SUCCESS); - expect(strArray[0]).assertEqual("aaa"); - expect(strArray[1]).assertEqual("bbb"); - flagSec = true; - checkFinish(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_1900 - * @tc.name: support basic type formal parameter attribute in - * @tc.desc: void voidInInt([in] number param);void voidInString([in] String param); - */ - it('ACTS_Zidl_Js2JsMulti_1900', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_1900 begin'); - var number8 = 8888; - var str3 = "voidInString"; - var flagFir = false; - var flagSec = false; - - function checkFinish() { - if (flagFir && flagSec) { - done(); - } - } - - testProxyMulti.voidInInt(number8, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - flagFir = true; - checkFinish(); - }); - testProxyMulti.voidInString(str3, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - flagSec = true; - checkFinish(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_2000 - * @tc.name: support basic type formal parameter attribute out - * @tc.desc: void voidOutInt([out] number param);void voidOutString([out] String param); - */ - it('ACTS_Zidl_Js2JsMulti_2000', 0, async function (done) { - var flagFir = false; - var flagSec = false; - - function checkFinish() { - if (flagFir && flagSec) { - done(); - } - } - - testProxyMulti.voidOutInt((errCode, number) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_2000 call return:" + JSON.stringify(number)); - expect(errCode).assertEqual(SUCCESS); - expect(number).assertEqual(123); - flagFir = true; - checkFinish(); - }); - testProxyMulti.voidOutString((errCode, str) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_2000 call return:" + JSON.stringify(str)); - expect(str).assertEqual("voidOutString"); - expect(errCode).assertEqual(SUCCESS); - flagSec = true; - checkFinish(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_2100 - * @tc.name: support basic type formal parameter attribute in, out - * @tc.desc: void voidInOutInt([in, out] number param);void voidInOutString([in, out] String param); - */ - it('ACTS_Zidl_Js2JsMulti_2100', 0, async function (done) { - var flagFir = false; - var flagSec = false; - - function checkFinish() { - if (flagFir && flagSec) { - done(); - } - } - - console.log('ACTS_Zidl_Js2JsMulti_2100 begin'); - var number23 = 123456; - var str1 = "voidInOutString"; - testProxyMulti.voidInOutInt(number23, (errCode, number) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_2100 call return:" + JSON.stringify(number)); - expect(errCode).assertEqual(SUCCESS); - expect(number).assertEqual(456789); - flagFir = true; - checkFinish(); - }); - testProxyMulti.voidInOutString(str1, (errCode, str) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_2100 call return:" + JSON.stringify(str)); - expect(errCode).assertEqual(SUCCESS); - expect(str).assertEqual("456789"); - flagSec = true; - checkFinish(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_2200 - * @tc.name: support formal parameter type boolean - * @tc.desc: void voidBoolean([in] boolean param); - */ - it('ACTS_Zidl_Js2JsMulti_2200', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_2200 begin'); - var oBooleanTrue = true; - - testProxyMulti.voidParameterTypeBoolean(oBooleanTrue, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_2300 - * @tc.name: support formal parameter type byte - * @tc.desc: void voidByte([in] byte param); - */ - it('ACTS_Zidl_Js2JsMulti_2300', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_2300 begin'); - var number1 = 1111; - - testProxyMulti.voidParameterTypeByte(number1, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_2400 - * @tc.name: support formal parameter type short - * @tc.desc: void voidShort([in] short param); - */ - it('ACTS_Zidl_Js2JsMulti_2400', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_2400 begin'); - var number2 = 2222; - - testProxyMulti.voidParameterTypeShort(number2, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_2500 - * @tc.name: support formal parameter type int - * @tc.desc: void voidInt([in] int param); - */ - it('ACTS_Zidl_Js2JsMulti_2500', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_2500 begin'); - var number3 = 3333; - - testProxyMulti.voidParameterTypeInt(number3, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_2600 - * @tc.name: support formal parameter type long - * @tc.desc: void voidLong([in] long param); - */ - it('ACTS_Zidl_Js2JsMulti_2600', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_2600 begin'); - var number4 = 4444; - - testProxyMulti.voidParameterTypeLong(number4, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_2700 - * @tc.name: support formal parameter type float - * @tc.desc: void voidFloat([in] float param); - */ - it('ACTS_Zidl_Js2JsMulti_2700', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_2700 begin'); - var number5 = 5555.1; - - testProxyMulti.voidParameterTypeFloat(number5, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_2800 - * @tc.name: support formal parameter type double - * @tc.desc: void voidDouble([in] double param); - */ - it('ACTS_Zidl_Js2JsMulti_2800', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_2800 begin'); - var number6 = 6666.1; - - setTimeout(function () { - testProxyMulti.voidParameterTypeDouble(number6, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }, 500); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_2900 - * @tc.name: support formal parameter type String - * @tc.desc: void voidString([in] String param); - */ - it('ACTS_Zidl_Js2JsMulti_2900', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_2900 begin'); - var str2 = "voidParameterTypeString"; - - testProxyMulti.voidParameterTypeString(str2, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_3000 - * @tc.name: support formal parameter type sequenceable - * @tc.desc: void voidSequenceable([in] TestInfo param); - */ - it('ACTS_Zidl_Js2JsMulti_3000', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_3000 begin'); - let mySequence = new MySequenceable(); - - testProxyMulti.voidParameterTypeSequenceable(mySequence, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_3100 - * @tc.name: support formal parameter type interface - * @tc.desc: void voidInterface([in] ITest param); - */ - it('ACTS_Zidl_Js2JsMulti_3100', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_3100 begin'); - - class InterfaceDeclare extends InterfaceDeclareStub { - testInterface(data: number, callback: testInterfaceCallback): void { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_3100 called"); - let result = FAIL; - - if (data == 3300) { - result = SUCCESS; - } - callback(result); - } - } - - let clientInterface = new InterfaceDeclare('clientInterface'); - - testProxyMulti.voidParameterTypeInterface(clientInterface, (errCode) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_3100 clientInterface callback"); - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_3200 - * @tc.name: support formal parameter type Map - * @tc.desc: void voidMapStringString([in] Map param); - */ - it('ACTS_Zidl_Js2JsMulti_3200', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_3200 begin'); - var map = new Map(); - map.set("voidParameterTypeMapStringString", "fdhatdh"); - - testProxyMulti.voidParameterTypeMapStringString(map, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_3300 - * @tc.name: support formal parameter type array - * @tc.desc: void voidDoubleArray([in] double[] param); - */ - it('ACTS_Zidl_Js2JsMulti_3300', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsMulti_3300 begin'); - var array = [1.1, 2.1]; - - testProxyMulti.voidParameterTypeDoubleArray(array, (errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_3400 - * @tc.name: parameter order - * @tc.desc: order of parameter properties [out], [in] - */ - it('ACTS_Zidl_Js2JsMulti_3400', 0, async function (done) { - var num = 61; - testProxyMulti.voidOrderOutIn(num, (errCode, string) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_3400 call return:" + string); - expect(errCode).assertEqual(SUCCESS); - expect(string).assertEqual("hello world"); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_3500 - * @tc.name: parameter order - * @tc.desc: order of parameter properties [in, out], [in] - */ - it('ACTS_Zidl_Js2JsMulti_3500', 0, async function (done) { - var num = 62; - var str = "inputparam"; - testProxyMulti.voidOrderInOutIn(num, str, (errCode, numparam) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_3500 call return:" + numparam); - expect(errCode).assertEqual(SUCCESS); - expect(numparam).assertEqual(6); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_3600 - * @tc.name: parameter order - * @tc.desc: order of parameter properties [out], [in, out] - */ - it('ACTS_Zidl_Js2JsMulti_3600', 0, async function (done) { - var str = "param"; - testProxyMulti.voidOrderOutInOut(str, (errCode, paramI, paramS) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_3600 call return:" + paramI + " " + paramS); - expect(errCode).assertEqual(SUCCESS); - expect(paramI).assertEqual(3); - expect(paramS).assertEqual("paramcallback"); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsMulti_3700 - * @tc.name: parameter order - * @tc.desc: order of parameter properties [in], [in, out], [out] - */ - it('ACTS_Zidl_Js2JsMulti_3700', 0, async function (done) { - var str = "paramInput"; - var num = 64; - testProxyMulti.voidOrderInInOutOut(str, num, (errCode, paramI, paramS) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsMulti_3700 call return:" + paramS + " " + paramI); - expect(errCode).assertEqual(SUCCESS); - expect(paramS).assertEqual("callback"); - expect(paramI).assertEqual(4); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_0100 - * @tc.name: support method attributes declaration [oneway] - * @tc.desc: [oneway] interface zidl.systemtest.IInterfaceAttributeDeclaratoinOneway {} - */ - it('ACTS_Zidl_Js2JsSingle_0100', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_0100 begin'); - var flagFir = false; - var flagSec = false; - var flagThi = false; - - function checkFinish() { - if (flagFir && flagSec && flagThi) { - done(); - } - } - - setTimeout(function () { - testProxySingleOneway.voidVoidFirst((errCode) => { - expect(errCode).assertEqual(SUCCESS); - flagFir = true; - checkFinish(); - }); - testProxySingleOneway.voidVoidSecond((errCode) => { - expect(errCode).assertEqual(SUCCESS); - flagSec = true; - checkFinish(); - }); - testProxySingleOneway.voidVoidThird((errCode) => { - expect(errCode).assertEqual(SUCCESS); - flagThi = true; - checkFinish(); - }); - }, 500); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_0200 - * @tc.name: support method attributes declaration [oneway] - * @tc.desc: [oneway] void onewayVoidVoid() - */ - it('ACTS_Zidl_Js2JsSingle_0200', 0, async function (done) { - testProxySingle.onewayVoidVoid((errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_0300 - * @tc.name: support method result type void - * @tc.desc: void voidVoid(); - */ - it('ACTS_Zidl_Js2JsSingle_0300', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_0300 begin'); - testProxySingle.voidVoid((errCode) => { - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_0400 - * @tc.name: support method result type boolean - * @tc.desc: boolean booleanVoid(); - */ - it('ACTS_Zidl_Js2JsSingle_0400', 0, async function (done) { - testProxySingle.booleanVoid((errCode, boolean) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_0400 call return:" + boolean); - expect(errCode).assertEqual(SUCCESS); - expect(boolean).assertEqual(true); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_0500 - * @tc.name: support method result type byte - * @tc.desc: number byteVoid(); - */ - it('ACTS_Zidl_Js2JsSingle_0500', 0, async function (done) { - testProxySingle.byteVoid((errCode, mybyte) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_0500 call return:" + mybyte); - expect(errCode).assertEqual(SUCCESS); - expect(mybyte).assertEqual(1); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_0600 - * @tc.name: support method result type short - * @tc.desc: number shortVoid(); - */ - it('ACTS_Zidl_Js2JsSingle_0600', 0, async function (done) { - testProxySingle.shortVoid((errCode, myshort) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_0600 call return:" + myshort); - expect(errCode).assertEqual(SUCCESS); - expect(myshort).assertEqual(222); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_0700 - * @tc.name: support method result type int - * @tc.desc: number intVoid(); - */ - it('ACTS_Zidl_Js2JsSingle_0700', 0, async function (done) { - testProxySingle.intVoid((errCode, myint) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_0700 call return:" + myint); - expect(errCode).assertEqual(SUCCESS); - expect(myint).assertEqual(333); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_0800 - * @tc.name: support method result type long - * @tc.desc: number longVoid(); - */ - it('ACTS_Zidl_Js2JsSingle_0800', 0, async function (done) { - testProxySingle.longVoid((errCode, mylong) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_0800 call return:" + mylong); - expect(errCode).assertEqual(SUCCESS); - expect(mylong).assertEqual(4444); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_0900 - * @tc.name: support method result type float - * @tc.desc: number floatVoid(); - */ - it('ACTS_Zidl_Js2JsSingle_0900', 0, async function (done) { - testProxySingle.floatVoid((errCode, myfloat) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_0900 call return:" + myfloat); - expect(errCode).assertEqual(SUCCESS); - expect(myfloat).assertEqual(10.1); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_1000 - * @tc.name: support method result type double - * @tc.desc: number doubleVoid(); - */ - it('ACTS_Zidl_Js2JsSingle_1000', 0, async function (done) { - testProxySingle.doubleVoid((errCode, mydouble) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_1000 call return:" + mydouble); - expect(errCode).assertEqual(SUCCESS); - expect(mydouble).assertEqual(22.1); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_1100 - * @tc.name: support method result type String - * @tc.desc: String stringVoid(); - */ - it('ACTS_Zidl_Js2JsSingle_1100', 0, async function (done) { - testProxySingle.stringVoid((errCode, mystring) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_1100 call return:" + mystring); - expect(errCode).assertEqual(SUCCESS); - expect(mystring).assertEqual("stringVoid"); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_1200 - * @tc.name: support method result type sequenceable - * @tc.desc: TestInfo sequenceableVoid(); - */ - it('ACTS_Zidl_Js2JsSingle_1200', 0, async function (done) { - testProxySingle.sequenceableVoid((errCode, mysequenceable) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_1200 call return:" + JSON.stringify(mysequenceable)); - expect(errCode).assertEqual(SUCCESS); - expect(mysequenceable.getNum()).assertEqual(14); - expect(mysequenceable.getString()).assertEqual("hello"); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_1300 - * @tc.name: support method result type interface - * @tc.desc: ITest interfaceVoid(); - */ - it('ACTS_Zidl_Js2JsSingle_1300', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_1300 begin'); - - testProxySingle.interfaceVoid((errCode, data) => { - console.log("ZidlTest Server ACTS_Zidl_Js2JsSingle_1300 called"); - expect(errCode).assertEqual(SUCCESS); - let proxy = new InterfaceDeclareProxy(data); - proxy.testInterface(1500, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }); - }) - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_1400 - * @tc.name: support method result type Map container type - * @tc.desc: Map mapStringStringVoid(); - */ - it('ACTS_Zidl_Js2JsSingle_1400', 0, async function (done) { - testProxySingle.mapStringStringVoid((errCode, mymapStringString) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_1400 call return:" + mymapStringString.get("string1")); - expect(errCode).assertEqual(SUCCESS); - expect(mymapStringString.get("string1")).assertEqual("string2"); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_1500 - * @tc.name: support method result type array type - * @tc.desc: double[] doubleArrayVoid(); - */ - it('ACTS_Zidl_Js2JsSingle_1500', 0, async function (done) { - testProxySingle.doubleArrayVoid((errCode, mydoubleArray) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_1500 call return:" + mydoubleArray); - expect(errCode).assertEqual(SUCCESS); - expect(mydoubleArray.length).assertEqual(3); - expect(mydoubleArray[0]).assertEqual(1.1); - expect(mydoubleArray[1]).assertEqual(2.1); - expect(mydoubleArray[2]).assertEqual(3.1); - done(); - }) - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_1600 - * @tc.name: support object type formal parameter attribute in - * @tc.desc: sequenceable zidl.systemtest.TestInfo; void voidInObject([in] TestInfo param); - */ - it('ACTS_Zidl_Js2JsSingle_1600', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_1600 begin'); - var flagFir = false; - var flagSec = false; - - function checkFinish() { - if (flagFir && flagSec) { - done(); - } - } - - let myMap = new Map(); - myMap.set("string1", 1); - var strarray = ["aaa", "bbb", "ccc"]; - testProxySingle.voidInMapStringInt(myMap, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - flagFir = true; - checkFinish(); - }); - testProxySingle.voidInStringArray(strarray, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - flagSec = true; - checkFinish(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_1700 - * @tc.name: support object type formal parameter attribute out - * @tc.desc: sequenceable zidl.systemtest.TestInfo;void voidOutObject([out] String param); - */ - it('ACTS_Zidl_Js2JsSingle_1700', 0, async function (done) { - var flagFir = false; - var flagSec = false; - - function checkFinish() { - if (flagFir && flagSec) { - done(); - } - } - - testProxySingle.voidOutMapStringInt((errCode, map) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_1700 call return:" + map.get("voidOutMapStringInt")); - expect(errCode).assertEqual(SUCCESS); - expect(map.get("voidOutMapStringInt")).assertEqual(1); - flagFir = true; - checkFinish(); - }); - testProxySingle.voidOutStringArray((errCode, strArray) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_1700 call return:" + JSON.stringify(strArray)); - expect(errCode).assertEqual(SUCCESS); - expect(strArray[0]).assertEqual("aa"); - expect(strArray[1]).assertEqual("dd"); - flagSec = true; - checkFinish(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_1800 - * @tc.name: support object type formal parameter attribute in, out - * @tc.desc: sequenceable zidl.systemtest.TestInfo;void voidInOutObject([in, out] TestInfo param); - */ - it('ACTS_Zidl_Js2JsSingle_1800', 0, async function (done) { - var flagFir = false; - var flagSec = false; - - function checkFinish() { - if (flagFir && flagSec) { - done(); - } - } - - var mapIn = new Map(); - mapIn.set("voidInOutMapStringInt1", 1801); - mapIn.set("voidInOutMapStringInt2", 1802); - testProxySingle.voidInOutMapStringInt(mapIn, (errCode, map) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_1800 call return:" + map.get("voidInOutMapStringInt")); - expect(errCode).assertEqual(SUCCESS); - expect(map.get("voidInOutMapStringInt1")).assertEqual(1802); - expect(map.get("voidInOutMapStringInt2")).assertEqual(1801); - flagFir = true; - checkFinish(); - }); - var strArrayIn = ["ddd", "ccc"]; - testProxySingle.voidInOutStringArray(strArrayIn, (errCode, strArray) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_1800 call return:" + JSON.stringify(strArray)); - expect(errCode).assertEqual(SUCCESS); - expect(strArray[0]).assertEqual("aaa"); - expect(strArray[1]).assertEqual("bbb"); - flagSec = true; - checkFinish(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_1900 - * @tc.name: support basic type formal parameter attribute in - * @tc.desc: void voidInInt([in] number param);void voidInString([in] String param); - */ - it('ACTS_Zidl_Js2JsSingle_1900', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_1900 begin'); - var number8 = 8888; - var str3 = "voidInString"; - var flagFir = false; - var flagSec = false; - - function checkFinish() { - if (flagFir && flagSec) { - done(); - } - } - - testProxySingle.voidInInt(number8, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - flagFir = true; - checkFinish(); - }); - testProxySingle.voidInString(str3, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - flagSec = true; - checkFinish(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_2000 - * @tc.name: support basic type formal parameter attribute out - * @tc.desc: void voidOutInt([out] number param);void voidOutString([out] String param); - */ - it('ACTS_Zidl_Js2JsSingle_2000', 0, async function (done) { - var flagFir = false; - var flagSec = false; - - function checkFinish() { - if (flagFir && flagSec) { - done(); - } - } - - testProxySingle.voidOutInt((errCode, number) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_2000 call return:" + JSON.stringify(number)); - expect(errCode).assertEqual(SUCCESS); - expect(number).assertEqual(123); - flagFir = true; - checkFinish(); - }); - testProxySingle.voidOutString((errCode, str) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_2000 call return:" + JSON.stringify(str)); - expect(str).assertEqual("voidOutString"); - expect(errCode).assertEqual(SUCCESS); - flagSec = true; - checkFinish(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_2100 - * @tc.name: support basic type formal parameter attribute in, out - * @tc.desc: void voidInOutInt([in, out] number param);void voidInOutString([in, out] String param); - */ - it('ACTS_Zidl_Js2JsSingle_2100', 0, async function (done) { - var flagFir = false; - var flagSec = false; - - function checkFinish() { - if (flagFir && flagSec) { - done(); - } - } - - console.log('ACTS_Zidl_Js2JsSingle_2100 begin'); - var number23 = 123456; - var str1 = "voidInOutString"; - testProxySingle.voidInOutInt(number23, (errCode, number) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_2100 call return:" + JSON.stringify(number)); - expect(errCode).assertEqual(SUCCESS); - expect(number).assertEqual(456789); - flagFir = true; - checkFinish(); - }); - testProxySingle.voidInOutString(str1, (errCode, str) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_2100 call return:" + JSON.stringify(str)); - expect(errCode).assertEqual(SUCCESS); - expect(str).assertEqual("456789"); - flagSec = true; - checkFinish(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_2200 - * @tc.name: support formal parameter type boolean - * @tc.desc: void voidBoolean([in] boolean param); - */ - it('ACTS_Zidl_Js2JsSingle_2200', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_2200 begin'); - var oBooleanTrue = true; - - testProxySingle.voidParameterTypeBoolean(oBooleanTrue, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_2300 - * @tc.name: support formal parameter type byte - * @tc.desc: void voidByte([in] byte param); - */ - it('ACTS_Zidl_Js2JsSingle_2300', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_2300 begin'); - var number1 = 1111; - - testProxySingle.voidParameterTypeByte(number1, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_2400 - * @tc.name: support formal parameter type short - * @tc.desc: void voidShort([in] short param); - */ - it('ACTS_Zidl_Js2JsSingle_2400', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_2400 begin'); - var number2 = 2222; - - testProxySingle.voidParameterTypeShort(number2, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_2500 - * @tc.name: support formal parameter type int - * @tc.desc: void voidInt([in] int param); - */ - it('ACTS_Zidl_Js2JsSingle_2500', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_2500 begin'); - var number3 = 3333; - - testProxySingle.voidParameterTypeInt(number3, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_2600 - * @tc.name: support formal parameter type long - * @tc.desc: void voidLong([in] long param); - */ - it('ACTS_Zidl_Js2JsSingle_2600', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_2600 begin'); - var number4 = 4444; - - testProxySingle.voidParameterTypeLong(number4, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_2700 - * @tc.name: support formal parameter type float - * @tc.desc: void voidFloat([in] float param); - */ - it('ACTS_Zidl_Js2JsSingle_2700', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_2700 begin'); - var number5 = 5555.1; - - testProxySingle.voidParameterTypeFloat(number5, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_2800 - * @tc.name: support formal parameter type double - * @tc.desc: void voidDouble([in] double param); - */ - it('ACTS_Zidl_Js2JsSingle_2800', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_2800 begin'); - var number6 = 6666.1; - - setTimeout(function () { - testProxySingle.voidParameterTypeDouble(number6, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }, 500); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_2900 - * @tc.name: support formal parameter type String - * @tc.desc: void voidString([in] String param); - */ - it('ACTS_Zidl_Js2JsSingle_2900', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_2900 begin'); - var str2 = "voidParameterTypeString"; - - testProxySingle.voidParameterTypeString(str2, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_3000 - * @tc.name: support formal parameter type sequenceable - * @tc.desc: void voidSequenceable([in] TestInfo param); - */ - it('ACTS_Zidl_Js2JsSingle_3000', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_3000 begin'); - let mySequence = new MySequenceable(); - - testProxySingle.voidParameterTypeSequenceable(mySequence, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_3100 - * @tc.name: support formal parameter type interface - * @tc.desc: void voidInterface([in] ITest param); - */ - it('ACTS_Zidl_Js2JsSingle_3100', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_3100 begin'); - - class InterfaceDeclare extends InterfaceDeclareStub { - testInterface(data: number, callback: testInterfaceCallback): void{ - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_3100 called"); - let result = FAIL; - - if (data == 3300) { - result = SUCCESS; - } - callback(result); - } - } - - let clientInterface = new InterfaceDeclare('clientInterface'); - - testProxySingle.voidParameterTypeInterface(clientInterface, (errCode)=>{ - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_3100 clientInterface callback"); - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_3200 - * @tc.name: support formal parameter type Map - * @tc.desc: void voidMapStringString([in] Map param); - */ - it('ACTS_Zidl_Js2JsSingle_3200', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_3200 begin'); - var map = new Map(); - map.set("voidParameterTypeMapStringString", "fdhatdh"); - - testProxySingle.voidParameterTypeMapStringString(map, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_3300 - * @tc.name: support formal parameter type array - * @tc.desc: void voidDoubleArray([in] double[] param); - */ - it('ACTS_Zidl_Js2JsSingle_3300', 0, async function (done) { - console.log('ACTS_Zidl_Js2JsSingle_3300 begin'); - var array = [1.1, 2.1]; - - testProxySingle.voidParameterTypeDoubleArray(array, (errCode)=>{ - expect(errCode).assertEqual(SUCCESS); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_3400 - * @tc.name: parameter order - * @tc.desc: order of parameter properties [out], [in] - */ - it('ACTS_Zidl_Js2JsSingle_3400', 0, async function (done) { - var num = 61; - testProxySingle.voidOrderOutIn(num, (errCode, string) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_3400 call return:" + string); - expect(errCode).assertEqual(SUCCESS); - expect(string).assertEqual("hello world"); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_3500 - * @tc.name: parameter order - * @tc.desc: order of parameter properties [in, out], [in] - */ - it('ACTS_Zidl_Js2JsSingle_3500', 0, async function (done) { - var num = 62; - var str = "inputparam"; - testProxySingle.voidOrderInOutIn(num, str, (errCode, numparam) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_3500 call return:" + numparam); - expect(errCode).assertEqual(SUCCESS); - expect(numparam).assertEqual(6); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_3600 - * @tc.name: parameter order - * @tc.desc: order of parameter properties [out], [in, out] - */ - it('ACTS_Zidl_Js2JsSingle_3600', 0, async function (done) { - var str = "param"; - testProxySingle.voidOrderOutInOut(str, (errCode, paramI, paramS) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_3600 call return:" + paramI + " " + paramS); - expect(errCode).assertEqual(SUCCESS); - expect(paramI).assertEqual(3); - expect(paramS).assertEqual("paramcallback"); - done(); - }); - }) - - /** - * @tc.number: ACTS_Zidl_Js2JsSingle_3700 - * @tc.name: parameter order - * @tc.desc: order of parameter properties [in], [in, out], [out] - */ - it('ACTS_Zidl_Js2JsSingle_3700', 0, async function (done) { - var str = "paramInput"; - var num = 64; - testProxySingle.voidOrderInInOutOut(str, num, (errCode, paramI, paramS) => { - console.log("ZidlTest Client ACTS_Zidl_Js2JsSingle_3700 call return:" + paramS + " " + paramI); - expect(errCode).assertEqual(SUCCESS); - expect(paramS).assertEqual("callback"); - expect(paramI).assertEqual(4); - done(); - }); - }) - }) -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/test/List.test.ets b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/test/List.test.ets deleted file mode 100644 index 882f978e7..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/test/List.test.ets +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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 abilityTest from './Ability.test.ets' - - -export default function testsuite(context) { - - abilityTest(context) - -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlTool/i_zidl_tool_test.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlTool/i_zidl_tool_test.ts deleted file mode 100644 index ac9da6352..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlTool/i_zidl_tool_test.ts +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (C) 2021 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 MySequenceable from "./my_sequenceable"; -import IInterfaceDeclare from "../interfaceDeclare/i_interface_declare"; - -export default interface IZidlToolTest { - onewayVoidVoid(callback: onewayVoidVoidCallback): void; - voidVoid(callback: voidVoidCallback): void; - booleanVoid(callback: booleanVoidCallback): void; - byteVoid(callback: byteVoidCallback): void; - shortVoid(callback: shortVoidCallback): void; - intVoid(callback: intVoidCallback): void; - longVoid(callback: longVoidCallback): void; - floatVoid(callback: floatVoidCallback): void; - doubleVoid(callback: doubleVoidCallback): void; - stringVoid(callback: stringVoidCallback): void; - sequenceableVoid(callback: sequenceableVoidCallback): void; - interfaceVoid(callback: interfaceVoidCallback): void; - mapStringStringVoid(callback: mapStringStringVoidCallback): void; - doubleArrayVoid(callback: doubleArrayVoidCallback): void; - voidInMapStringInt(param: Map, callback: voidInMapStringIntCallback): void; - voidInStringArray(param: string[], callback: voidInStringArrayCallback): void; - voidOutMapStringInt(callback: voidOutMapStringIntCallback): void; - voidOutStringArray(callback: voidOutStringArrayCallback): void; - voidInOutMapStringInt(param: Map, callback: voidInOutMapStringIntCallback): void; - voidInOutStringArray(param: string[], callback: voidInOutStringArrayCallback): void; - voidInInt(param: number, callback: voidInIntCallback): void; - voidInString(param: string, callback: voidInStringCallback): void; - voidOutInt(callback: voidOutIntCallback): void; - voidOutString(callback: voidOutStringCallback): void; - voidInOutInt(param: number, callback: voidInOutIntCallback): void; - voidInOutString(param: string, callback: voidInOutStringCallback): void; - voidParameterTypeBoolean(param: boolean, callback: voidParameterTypeBooleanCallback): void; - voidParameterTypeByte(param: number, callback: voidParameterTypeByteCallback): void; - voidParameterTypeShort(param: number, callback: voidParameterTypeShortCallback): void; - voidParameterTypeInt(param: number, callback: voidParameterTypeIntCallback): void; - voidParameterTypeLong(param: number, callback: voidParameterTypeLongCallback): void; - voidParameterTypeFloat(param: number, callback: voidParameterTypeFloatCallback): void; - voidParameterTypeDouble(param: number, callback: voidParameterTypeDoubleCallback): void; - voidParameterTypeString(param: string, callback: voidParameterTypeStringCallback): void; - voidParameterTypeSequenceable(param: MySequenceable, callback: voidParameterTypeSequenceableCallback): void; - voidParameterTypeInterface(param: IInterfaceDeclare, callback: voidParameterTypeInterfaceCallback): void; - voidParameterTypeMapStringString(param: Map, callback: voidParameterTypeMapStringStringCallback): void; - voidParameterTypeDoubleArray(param: number[], callback: voidParameterTypeDoubleArrayCallback): void; - voidOrderOutIn(paramI: number, callback: voidOrderOutInCallback): void; - voidOrderInOutIn(paramI: number, paramS: string, callback: voidOrderInOutInCallback): void; - voidOrderOutInOut(paramS: string, callback: voidOrderOutInOutCallback): void; - voidOrderInInOutOut(paramS: string, paramI: number, callback: voidOrderInInOutOutCallback): void; -} -export type onewayVoidVoidCallback = (errCode: number) => void; -export type voidVoidCallback = (errCode: number) => void; -export type booleanVoidCallback = (errCode: number, returnValue: boolean) => void; -export type byteVoidCallback = (errCode: number, returnValue: number) => void; -export type shortVoidCallback = (errCode: number, returnValue: number) => void; -export type intVoidCallback = (errCode: number, returnValue: number) => void; -export type longVoidCallback = (errCode: number, returnValue: number) => void; -export type floatVoidCallback = (errCode: number, returnValue: number) => void; -export type doubleVoidCallback = (errCode: number, returnValue: number) => void; -export type stringVoidCallback = (errCode: number, returnValue: string) => void; -export type sequenceableVoidCallback = (errCode: number, returnValue: MySequenceable) => void; -export type interfaceVoidCallback = (errCode: number, returnValue: IInterfaceDeclare) => void; -export type mapStringStringVoidCallback = (errCode: number, returnValue: Map) => void; -export type doubleArrayVoidCallback = (errCode: number, returnValue: number[]) => void; -export type voidInMapStringIntCallback = (errCode: number) => void; -export type voidInStringArrayCallback = (errCode: number) => void; -export type voidOutMapStringIntCallback = (errCode: number, param: Map) => void; -export type voidOutStringArrayCallback = (errCode: number, param: string[]) => void; -export type voidInOutMapStringIntCallback = (errCode: number, param: Map) => void; -export type voidInOutStringArrayCallback = (errCode: number, param: string[]) => void; -export type voidInIntCallback = (errCode: number) => void; -export type voidInStringCallback = (errCode: number) => void; -export type voidOutIntCallback = (errCode: number, param: number) => void; -export type voidOutStringCallback = (errCode: number, param: string) => void; -export type voidInOutIntCallback = (errCode: number, param: number) => void; -export type voidInOutStringCallback = (errCode: number, param: string) => void; -export type voidParameterTypeBooleanCallback = (errCode: number) => void; -export type voidParameterTypeByteCallback = (errCode: number) => void; -export type voidParameterTypeShortCallback = (errCode: number) => void; -export type voidParameterTypeIntCallback = (errCode: number) => void; -export type voidParameterTypeLongCallback = (errCode: number) => void; -export type voidParameterTypeFloatCallback = (errCode: number) => void; -export type voidParameterTypeDoubleCallback = (errCode: number) => void; -export type voidParameterTypeStringCallback = (errCode: number) => void; -export type voidParameterTypeSequenceableCallback = (errCode: number) => void; -export type voidParameterTypeInterfaceCallback = (errCode: number) => void; -export type voidParameterTypeMapStringStringCallback = (errCode: number) => void; -export type voidParameterTypeDoubleArrayCallback = (errCode: number) => void; -export type voidOrderOutInCallback = (errCode: number, paramS: string) => void; -export type voidOrderInOutInCallback = (errCode: number, paramI: number) => void; -export type voidOrderOutInOutCallback = (errCode: number, paramI: number, paramS: string) => void; -export type voidOrderInInOutOutCallback = (errCode: number, paramI: number, paramS2: string) => void; - diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlTool/my_sequenceable.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlTool/my_sequenceable.ts deleted file mode 100644 index 742b78e6a..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlTool/my_sequenceable.ts +++ /dev/null @@ -1,28 +0,0 @@ -export default class MySequenceable { - constructor() { - this.num = 32; - this.str = "nihao"; - } - getNum() : number { - return this.num; - } - - getString() : string { - return this.str; - } - - marshalling(messageParcel) { - console.info('marshalling++++'); - messageParcel.writeInt(this.num); - messageParcel.writeString(this.str); - return true; - } - unmarshalling(messageParcel) { - console.info('unmarshalling++++'); - this.num = messageParcel.readInt(); - this.str = messageParcel.readString(); - return true; - } - private num; - private str; -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlTool/zidl_tool_test_proxy.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlTool/zidl_tool_test_proxy.ts deleted file mode 100644 index c1431ca78..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlTool/zidl_tool_test_proxy.ts +++ /dev/null @@ -1,948 +0,0 @@ -/* - * Copyright (C) 2021 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 {onewayVoidVoidCallback} from "./i_zidl_tool_test"; -import {voidVoidCallback} from "./i_zidl_tool_test"; -import {booleanVoidCallback} from "./i_zidl_tool_test"; -import {byteVoidCallback} from "./i_zidl_tool_test"; -import {shortVoidCallback} from "./i_zidl_tool_test"; -import {intVoidCallback} from "./i_zidl_tool_test"; -import {longVoidCallback} from "./i_zidl_tool_test"; -import {floatVoidCallback} from "./i_zidl_tool_test"; -import {doubleVoidCallback} from "./i_zidl_tool_test"; -import {stringVoidCallback} from "./i_zidl_tool_test"; -import {sequenceableVoidCallback} from "./i_zidl_tool_test"; -import {interfaceVoidCallback} from "./i_zidl_tool_test"; -import {mapStringStringVoidCallback} from "./i_zidl_tool_test"; -import {doubleArrayVoidCallback} from "./i_zidl_tool_test"; -import {voidInMapStringIntCallback} from "./i_zidl_tool_test"; -import {voidInStringArrayCallback} from "./i_zidl_tool_test"; -import {voidOutMapStringIntCallback} from "./i_zidl_tool_test"; -import {voidOutStringArrayCallback} from "./i_zidl_tool_test"; -import {voidInOutMapStringIntCallback} from "./i_zidl_tool_test"; -import {voidInOutStringArrayCallback} from "./i_zidl_tool_test"; -import {voidInIntCallback} from "./i_zidl_tool_test"; -import {voidInStringCallback} from "./i_zidl_tool_test"; -import {voidOutIntCallback} from "./i_zidl_tool_test"; -import {voidOutStringCallback} from "./i_zidl_tool_test"; -import {voidInOutIntCallback} from "./i_zidl_tool_test"; -import {voidInOutStringCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeBooleanCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeByteCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeShortCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeIntCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeLongCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeFloatCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeDoubleCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeStringCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeSequenceableCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeInterfaceCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeMapStringStringCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeDoubleArrayCallback} from "./i_zidl_tool_test"; -import {voidOrderOutInCallback} from "./i_zidl_tool_test"; -import {voidOrderInOutInCallback} from "./i_zidl_tool_test"; -import {voidOrderOutInOutCallback} from "./i_zidl_tool_test"; -import {voidOrderInInOutOutCallback} from "./i_zidl_tool_test"; -import IZidlToolTest from "./i_zidl_tool_test"; -import rpc from "@ohos.rpc"; -import MySequenceable from "./my_sequenceable"; -import IInterfaceDeclare from "../interfaceDeclare/i_interface_declare"; -import InterfaceDeclareStub from "../interfaceDeclare/interface_declare_stub"; - -export default class ZidlToolTestProxy implements IZidlToolTest { - constructor(proxy) { - this.proxy = proxy; - } - - onewayVoidVoid(callback: onewayVoidVoidCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_ASYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_ONEWAY_VOID_VOID, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidVoid(callback: voidVoidCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_VOID, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - booleanVoid(callback: booleanVoidCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_BOOLEAN_VOID, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _returnValue = undefined; - callback(_errCode, _returnValue); - return; - } - let _returnValue = result.reply.readInt() == 1 ? true : false; - callback(_errCode, _returnValue); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - byteVoid(callback: byteVoidCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_BYTE_VOID, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _returnValue = undefined; - callback(_errCode, _returnValue); - return; - } - let _returnValue = result.reply.readInt(); - callback(_errCode, _returnValue); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - shortVoid(callback: shortVoidCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_SHORT_VOID, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _returnValue = undefined; - callback(_errCode, _returnValue); - return; - } - let _returnValue = result.reply.readInt(); - callback(_errCode, _returnValue); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - intVoid(callback: intVoidCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_INT_VOID, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _returnValue = undefined; - callback(_errCode, _returnValue); - return; - } - let _returnValue = result.reply.readInt(); - callback(_errCode, _returnValue); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - longVoid(callback: longVoidCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_LONG_VOID, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _returnValue = undefined; - callback(_errCode, _returnValue); - return; - } - let _returnValue = result.reply.readLong(); - callback(_errCode, _returnValue); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - floatVoid(callback: floatVoidCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_FLOAT_VOID, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _returnValue = undefined; - callback(_errCode, _returnValue); - return; - } - let _returnValue = result.reply.readFloat(); - callback(_errCode, _returnValue); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - doubleVoid(callback: doubleVoidCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_DOUBLE_VOID, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _returnValue = undefined; - callback(_errCode, _returnValue); - return; - } - let _returnValue = result.reply.readDouble(); - callback(_errCode, _returnValue); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - stringVoid(callback: stringVoidCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_STRING_VOID, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _returnValue = undefined; - callback(_errCode, _returnValue); - return; - } - let _returnValue = result.reply.readString(); - callback(_errCode, _returnValue); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - sequenceableVoid(callback: sequenceableVoidCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_SEQUENCEABLE_VOID, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _returnValue = undefined; - callback(_errCode, _returnValue); - return; - } - let _returnValue = new MySequenceable(); - result.reply.readSequenceable(_returnValue); - callback(_errCode, _returnValue); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - interfaceVoid(callback: interfaceVoidCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_INTERFACE_VOID, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _returnValue = undefined; - callback(_errCode, _returnValue); - return; - } - let _returnValue = result.reply.readRemoteObject(); - callback(_errCode, _returnValue); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - mapStringStringVoid(callback: mapStringStringVoidCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_MAP_STRING_STRING_VOID, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _returnValue = undefined; - callback(_errCode, _returnValue); - return; - } - let _returnValue = new Map(); - let _returnValueSize = result.reply.readInt(); - for (let i = 0; i < _returnValueSize; ++i) { - let key = result.reply.readString(); - let value = result.reply.readString(); - _returnValue.set(key, value); - } - callback(_errCode, _returnValue); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - doubleArrayVoid(callback: doubleArrayVoidCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_DOUBLE_ARRAY_VOID, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _returnValue = undefined; - callback(_errCode, _returnValue); - return; - } - let _returnValue = result.reply.readDoubleArray(); - callback(_errCode, _returnValue); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidInMapStringInt(param: Map, callback: voidInMapStringIntCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeInt(param.size); - for (let [key, value] of param) { - _data.writeString(key); - _data.writeInt(value); - } - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_IN_MAP_STRING_INT, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidInStringArray(param: string[], callback: voidInStringArrayCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeStringArray(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_IN_STRING_ARRAY, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidOutMapStringInt(callback: voidOutMapStringIntCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_OUT_MAP_STRING_INT, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _param = undefined; - callback(_errCode,_param); - return; - } - let _param = new Map(); - let _paramSize = result.reply.readInt(); - for (let i = 0; i < _paramSize; ++i) { - let key = result.reply.readString(); - let value = result.reply.readInt(); - _param.set(key, value); - } - callback(_errCode,_param); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidOutStringArray(callback: voidOutStringArrayCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_OUT_STRING_ARRAY, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _param = undefined; - callback(_errCode,_param); - return; - } - let _param = result.reply.readStringArray(); - callback(_errCode,_param); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidInOutMapStringInt(param: Map, callback: voidInOutMapStringIntCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeInt(param.size); - for (let [key, value] of param) { - _data.writeString(key); - _data.writeInt(value); - } - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_IN_OUT_MAP_STRING_INT, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _param = undefined; - callback(_errCode,_param); - return; - } - let _param = new Map(); - let _paramSize = result.reply.readInt(); - for (let i = 0; i < _paramSize; ++i) { - let key = result.reply.readString(); - let value = result.reply.readInt(); - _param.set(key, value); - } - callback(_errCode,_param); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidInOutStringArray(param: string[], callback: voidInOutStringArrayCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeStringArray(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_IN_OUT_STRING_ARRAY, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _param = undefined; - callback(_errCode,_param); - return; - } - let _param = result.reply.readStringArray(); - callback(_errCode,_param); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidInInt(param: number, callback: voidInIntCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeInt(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_IN_INT, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidInString(param: string, callback: voidInStringCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeString(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_IN_STRING, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidOutInt(callback: voidOutIntCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_OUT_INT, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _param = undefined; - callback(_errCode,_param); - return; - } - let _param = result.reply.readInt(); - callback(_errCode,_param); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidOutString(callback: voidOutStringCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_OUT_STRING, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _param = undefined; - callback(_errCode,_param); - return; - } - let _param = result.reply.readString(); - callback(_errCode,_param); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidInOutInt(param: number, callback: voidInOutIntCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeInt(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_IN_OUT_INT, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _param = undefined; - callback(_errCode,_param); - return; - } - let _param = result.reply.readInt(); - callback(_errCode,_param); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidInOutString(param: string, callback: voidInOutStringCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeString(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_IN_OUT_STRING, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _param = undefined; - callback(_errCode,_param); - return; - } - let _param = result.reply.readString(); - callback(_errCode,_param); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidParameterTypeBoolean(param: boolean, callback: voidParameterTypeBooleanCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeInt(param ? 1 : 0); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_PARAMETER_TYPE_BOOLEAN, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidParameterTypeByte(param: number, callback: voidParameterTypeByteCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeInt(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_PARAMETER_TYPE_BYTE, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidParameterTypeShort(param: number, callback: voidParameterTypeShortCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeInt(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_PARAMETER_TYPE_SHORT, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidParameterTypeInt(param: number, callback: voidParameterTypeIntCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeInt(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_PARAMETER_TYPE_INT, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidParameterTypeLong(param: number, callback: voidParameterTypeLongCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeLong(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_PARAMETER_TYPE_LONG, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidParameterTypeFloat(param: number, callback: voidParameterTypeFloatCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeFloat(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_PARAMETER_TYPE_FLOAT, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidParameterTypeDouble(param: number, callback: voidParameterTypeDoubleCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeDouble(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_PARAMETER_TYPE_DOUBLE, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidParameterTypeString(param: string, callback: voidParameterTypeStringCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeString(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_PARAMETER_TYPE_STRING, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidParameterTypeSequenceable(param: MySequenceable, callback: voidParameterTypeSequenceableCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeSequenceable(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_PARAMETER_TYPE_SEQUENCEABLE, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidParameterTypeInterface(param: IInterfaceDeclare, callback: voidParameterTypeInterfaceCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeRemoteObject(param as InterfaceDeclareStub); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_PARAMETER_TYPE_INTERFACE, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidParameterTypeMapStringString(param: Map, callback: voidParameterTypeMapStringStringCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeInt(param.size); - for (let [key, value] of param) { - _data.writeString(key); - _data.writeString(value); - } - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_PARAMETER_TYPE_MAP_STRING_STRING, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidParameterTypeDoubleArray(param: number[], callback: voidParameterTypeDoubleArrayCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeDoubleArray(param); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_PARAMETER_TYPE_DOUBLE_ARRAY, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidOrderOutIn(paramI: number, callback: voidOrderOutInCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeInt(paramI); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_ORDER_OUT_IN, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _paramS = undefined; - callback(_errCode,_paramS); - return; - } - let _paramS = result.reply.readString(); - callback(_errCode,_paramS); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidOrderInOutIn(paramI: number, paramS: string, callback: voidOrderInOutInCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeInt(paramI); - _data.writeString(paramS); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_ORDER_IN_OUT_IN, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _paramI = undefined; - callback(_errCode,_paramI); - return; - } - let _paramI = result.reply.readInt(); - callback(_errCode,_paramI); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidOrderOutInOut(paramS: string, callback: voidOrderOutInOutCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeString(paramS); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_ORDER_OUT_IN_OUT, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _paramI = undefined; - let _paramS = undefined; - callback(_errCode,_paramI, _paramS); - return; - } - let _paramI = result.reply.readInt(); - let _paramS = result.reply.readString(); - callback(_errCode,_paramI, _paramS); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidOrderInInOutOut(paramS: string, paramI: number, callback: voidOrderInInOutOutCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeString(paramS); - _data.writeInt(paramI); - this.proxy.sendRequest(ZidlToolTestProxy.COMMAND_VOID_ORDER_IN_IN_OUT_OUT, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - if (_errCode != 0) { - let _paramI = undefined; - let _paramS2 = undefined; - callback(_errCode,_paramI, _paramS2); - return; - } - let _paramI = result.reply.readInt(); - let _paramS2 = result.reply.readString(); - callback(_errCode,_paramI, _paramS2); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - static readonly COMMAND_ONEWAY_VOID_VOID = 1; - static readonly COMMAND_VOID_VOID = 2; - static readonly COMMAND_BOOLEAN_VOID = 3; - static readonly COMMAND_BYTE_VOID = 4; - static readonly COMMAND_SHORT_VOID = 5; - static readonly COMMAND_INT_VOID = 6; - static readonly COMMAND_LONG_VOID = 7; - static readonly COMMAND_FLOAT_VOID = 8; - static readonly COMMAND_DOUBLE_VOID = 9; - static readonly COMMAND_STRING_VOID = 10; - static readonly COMMAND_SEQUENCEABLE_VOID = 11; - static readonly COMMAND_INTERFACE_VOID = 12; - static readonly COMMAND_MAP_STRING_STRING_VOID = 13; - static readonly COMMAND_DOUBLE_ARRAY_VOID = 14; - static readonly COMMAND_VOID_IN_MAP_STRING_INT = 15; - static readonly COMMAND_VOID_IN_STRING_ARRAY = 16; - static readonly COMMAND_VOID_OUT_MAP_STRING_INT = 17; - static readonly COMMAND_VOID_OUT_STRING_ARRAY = 18; - static readonly COMMAND_VOID_IN_OUT_MAP_STRING_INT = 19; - static readonly COMMAND_VOID_IN_OUT_STRING_ARRAY = 20; - static readonly COMMAND_VOID_IN_INT = 21; - static readonly COMMAND_VOID_IN_STRING = 22; - static readonly COMMAND_VOID_OUT_INT = 23; - static readonly COMMAND_VOID_OUT_STRING = 24; - static readonly COMMAND_VOID_IN_OUT_INT = 25; - static readonly COMMAND_VOID_IN_OUT_STRING = 26; - static readonly COMMAND_VOID_PARAMETER_TYPE_BOOLEAN = 27; - static readonly COMMAND_VOID_PARAMETER_TYPE_BYTE = 28; - static readonly COMMAND_VOID_PARAMETER_TYPE_SHORT = 29; - static readonly COMMAND_VOID_PARAMETER_TYPE_INT = 30; - static readonly COMMAND_VOID_PARAMETER_TYPE_LONG = 31; - static readonly COMMAND_VOID_PARAMETER_TYPE_FLOAT = 32; - static readonly COMMAND_VOID_PARAMETER_TYPE_DOUBLE = 33; - static readonly COMMAND_VOID_PARAMETER_TYPE_STRING = 34; - static readonly COMMAND_VOID_PARAMETER_TYPE_SEQUENCEABLE = 35; - static readonly COMMAND_VOID_PARAMETER_TYPE_INTERFACE = 36; - static readonly COMMAND_VOID_PARAMETER_TYPE_MAP_STRING_STRING = 37; - static readonly COMMAND_VOID_PARAMETER_TYPE_DOUBLE_ARRAY = 38; - static readonly COMMAND_VOID_ORDER_OUT_IN = 39; - static readonly COMMAND_VOID_ORDER_IN_OUT_IN = 40; - static readonly COMMAND_VOID_ORDER_OUT_IN_OUT = 41; - static readonly COMMAND_VOID_ORDER_IN_IN_OUT_OUT = 42; - private proxy -} - diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlToolOneWay/i_interface_attribute_declaratoin_oneway.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlToolOneWay/i_interface_attribute_declaratoin_oneway.ts deleted file mode 100644 index a17db0f5d..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlToolOneWay/i_interface_attribute_declaratoin_oneway.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2021 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. - */ - - -export default interface IInterfaceAttributeDeclaratoinOneway { - voidVoidFirst(callback: voidVoidFirstCallback): void; - voidVoidSecond(callback: voidVoidSecondCallback): void; - voidVoidThird(callback: voidVoidThirdCallback): void; -} -export type voidVoidFirstCallback = (errCode: number) => void; -export type voidVoidSecondCallback = (errCode: number) => void; -export type voidVoidThirdCallback = (errCode: number) => void; - diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlToolOneWay/interface_attribute_declaratoin_oneway_proxy.ts b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlToolOneWay/interface_attribute_declaratoin_oneway_proxy.ts deleted file mode 100644 index b3f7e0549..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/ets/zidlToolOneWay/interface_attribute_declaratoin_oneway_proxy.ts +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2021 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 {voidVoidFirstCallback} from "./i_interface_attribute_declaratoin_oneway"; -import {voidVoidSecondCallback} from "./i_interface_attribute_declaratoin_oneway"; -import {voidVoidThirdCallback} from "./i_interface_attribute_declaratoin_oneway"; -import IInterfaceAttributeDeclaratoinOneway from "./i_interface_attribute_declaratoin_oneway"; -import rpc from "@ohos.rpc"; - -export default class InterfaceAttributeDeclaratoinOnewayProxy implements IInterfaceAttributeDeclaratoinOneway { - constructor(proxy) { - this.proxy = proxy; - } - - voidVoidFirst(callback: voidVoidFirstCallback): void - { - let _option = new rpc.MessageOption(1); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(InterfaceAttributeDeclaratoinOnewayProxy.COMMAND_VOID_VOID_FIRST, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidVoidSecond(callback: voidVoidSecondCallback): void - { - let _option = new rpc.MessageOption(1); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(InterfaceAttributeDeclaratoinOnewayProxy.COMMAND_VOID_VOID_SECOND, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - voidVoidThird(callback: voidVoidThirdCallback): void - { - let _option = new rpc.MessageOption(1); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - this.proxy.sendRequest(InterfaceAttributeDeclaratoinOnewayProxy.COMMAND_VOID_VOID_THIRD, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - static readonly COMMAND_VOID_VOID_FIRST = 1; - static readonly COMMAND_VOID_VOID_SECOND = 2; - static readonly COMMAND_VOID_VOID_THIRD = 3; - private proxy -} - diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/module.json b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/module.json deleted file mode 100644 index 281074d04..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/module.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.zidlclienttest.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "launchType": "singleton", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ] - } - ], - "extensionAbilities": [ - { - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "name": "com.example.zidlclienttest.ServiceAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - }, - { - "srcEntrance": "./ets/ServiceAbility2/ServiceAbility2.ts", - "name": "com.example.zidlclienttest.ServiceAbility2", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - } - ], - "requestPermissions": [ - { - "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason": "need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name": "ohos.permission.GET_BUNDLE_INFO", - "reason": "need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name": "ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason": "need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name": "ohos.permission.REMOVE_CACHE_FILES", - "reason": "need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name": "ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason": "need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name": "ohos.permission.INSTALL_BUNDLE", - "reason": "need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name": "ohos.permission.MANAGE_MISSIONS", - "reason": "need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name": "ohos.permission.GET_RUNNING_INFO", - "reason": "need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name": "ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason": "need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name": "ohos.permission.CLEAN_APPLICATION_DATA", - "reason": "need use ohos.permission.CLEAN_APPLICATION_DATA" - } - ] - } -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/resources/base/element/string.json deleted file mode 100644 index 2977b612e..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/resources/base/element/string.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "string": [ - { - "name": "phone_entry_dsc", - "value": "i am an entry for phone" - }, - { - "name": "phone_entry_main", - "value": "the phone entry ability" - }, - { - "name": "entry_label", - "value": "ActsContextTest" - }, - { - "name": "form_description", - "value": "my form" - }, - { - "name": "serviceability_description", - "value": "my whether" - }, - { - "name": "description_application", - "value": "demo for test" - }, - { - "name": "app_name", - "value": "Demo" - } - ] -} diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/resources/base/media/icon.png deleted file mode 100644 index 474a55588fd7216113dd42073aadf254d4dba023..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15458 zcmV-oJe|XdP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXfJNHRMK~#8N)t$?W zZ`*d)f6uD@IOn2&LJ;lP6@!gHh#>Y1!r&0HL_gDqb&`3X(Z=GaQp8SP` z92In5!tr>lHv4nxKS1{J@p1P!+F4$_JksuYcRrnVr_*tFKEi|jF}%m8r`_Y_l6p^% z@+LnCznqL`mDBrry9$FzRWuxkQF=}GpwhbiR|yW zmfjQNx4tFelhpeM=s1qPZ}7VBtuHUqIh+_+IvN7$>(jXIa?55SEAd6rfw_FG^Ciq> zUAOb*d;6XH7UwzzrTnE1QtLJmPK4||=GS#JMbf8dX;2o^T+5qYx7QF%t86tY^M!6V zrngTY z1udv}ju^g5nNRXGgh*Bp3Mrd$sWa|p#az3e^Glh~4OYDwx?a*KW72*IFc`5a72{iM zp*N~%>#A7GyQ5CGc@5sreOI4Vr-jh46-ty$UgtlNS4u^>BKcJpW(i@*S9!$UCqmcd z(U6LQxPK-@LYcI@ROQlUqYfv9)@pP1D z^PGd_#Bn=j?h;(A2YP*^zO{q!-impmO*sshM)pxC{aRnxpLI$OVz(ElViw;?d~N$q$^VbIP>sa0q0)N~6iq!!fI>IcRGDdADCq?$^K61=g>C{IY# z;~=ksR37V9Yzp%@sRJ8ebxt7()agtNj zFX-#JY(~NHNecrS7DT}|J>yQfr$J*Ww>;PMMSj|?ifs>m;mOpS;hB2QJtAw(Aw2S_ zSHe`NtQeUBZN(O=rgRoV{J5F+Ft*YQkw zwtwkXsI}a&=y|SSZxEX3H8VG5pvDb*DypGrx7RHOJ0i^ra2-P!NRFO4D{+Ry>|JXL zGjQaB$9omq%IUE9OgQbqtQMtUxwo448OTeE6JEO(GROhuciWZ5BouJ*L~LTeo;4dtD1t#pnhtSi{UW~!N8lsnLV4AB&!P?*BYDt{H& z%&bDsz7IE15kl1~PvI`8P44N?xzRmdc}}725-w90Fdv0S!A0anyY|dSG}_^L&))LF zz4K+fI-yqH>N0 zgo)+iY3)b8AJt+2Z>KNwTQ-d?GjYyuI%!>DNlTFvDiBBa$CrlyNy#r_Sho8!34uL# zRbE+7I??*TrZGd;$+f!%8_B1Sc*Ia#=XozCRDucxF$H^&J+EfrLzkl0 z&Y3P^^vbm_^GJtcTe;>pe{n4!{EtOfLyv17pOHk&6d)QY28Om{l|N|LJYM(9dcX=m z(`(v2zJ^0${=gPYRc@u!raOd&0;{ZWR``si^fg~l4oL?SD>EgWzMqA-<`?rq(W^EZ zVWn$bq5GX_&GgJOY`!oa&@zRZ&4hiDHmw<(Mk_N)4(+wilna`8P6Sjw)OS?{y0(N(0*);t@8SAl~B`A^+@J zV1RVu>FKY$>KaP3uj?dg$oKga*<{6RD1b)fODgTiZOJR>{Kkeu4uk2y#e!oE4iAlB zYL*V8DT~1MLc{NwyHeClv|$!rLwWSf$b4NexAR)uTBgvUvCBJO=sfB6_1wOZtOXTj zc`5k{U1P}t$8tTmwm1Gq57=?FuXc|tkh+fj*LX~;FJx?f%NC4*45f)%IS75<;}ANX z;gHpyj8K*dUZi4hTt8$GpexJ4q}CPXVyW%DV;NflfVk+qu7f_9k z*}8EIodV}*+31PZmwxv(r&~BEn9C$YJ9U6zg!~5>d$_Pa8+ad7I91;c_0IOtEQZJv zWv~YzHgi=b!-mWfXtn|_JkoD5oK-0qxdz=bc;8A)h$8Ki7uj*~)FIoxTCmM)Lkx$^ zDAapMq>9(D*y56Y3)j_pPZhR{lBnF6$6?8nU&c%yomL(4$90sL@mADWR@cgG>br4< zm7f(4kA&8Grlx|Pqa>B}@VHOlNlK;+Bw%8XPl;5YrIxrI!FgaD+MM$T3TD9_g?p$n0Z^z z(ZK~3V;*H`@3>UjK<`U8)$c<0O1ic7Ev6ocyuLu$qCG4Y{bp{Y=5PB;{k{&5MvzIV zqrB@hYXOE@LmvV6T#B|X4dE6jY+>wEAHh2P=EcesGcpX)dv1+PVs{Q^sw4rG+6 zIMNJ)vc{%SR$PJ)BEf_u+O<&U!M5VQ%rC4^x?<;d{RR~!z6NtUq3;)^4s7W1#)j^v zagl`{s8YEpK6_jhO$@_^<2ryqkqSlOyMV|^!)TC@2*LI`^CDdG%EMG3N_}|VeMXsg zreLRr}}fkU0|;F z*7Y@d*Xq264ee>$vQAr(zQG}~k1UIKZbPoo zBq4|^xF`pLiPaELV00X>9O?5D3Lo=a4w3a>7DQFw_SB8SWLAZInMO&pQ4!LSj~YD6 z@OBztL*L8Ob`EK5=<7MJK_T?^rLFqqOeZgHg&A?6PjVts8H}BcoI;mGT&hNI$*O+_n?-TzQ=5&@FU+ z8%JCG;=yD5GrXl(p=k!g0{xS2uj3r!y6+pk&uJG6J=Xz^8H=fHEN`Geyfj0EZ=)FZ zy@n~1956HJK-yv(s;r3#B|r&&i8b$4=&<8A?%_Ig;+gcpy^8a?q58J3buP@kLYeB# zuvJF4c@1BKR_u&3Y};O=+1J~;*T6d6N2fErzRvXb@UVNhXB&bjsk}B6yjIvbbueQP zP_b352q{pB@qe)PPPC;?V+3uRSYKh6Wh-G{U!Yyu2MUFQ#d`*N-+5JeEfd?K^}L)s zf!p!b7#;VQb6lcB|I})~eU0;~5--2s&h1c7E$a&)Ds*<-L~vtY9Bo zkapu+;9@BYMXVY#B)(0sTH}^k>s8%(pgI{Xf(haf_V8hgi`#C?Ct4y|0|!+}!f3DH z+7lPAq<`@md>3KNVE+qD(Zi^+g|6Fue3yRaI^D*%0Okp7ODn37mjONA%=wvO%5xVQ zTLN#vEcl-WuJzOXZ*iUv#jn9!=WG1ER=&-j$2yn2*1lnGH$&%rZA`Dxw@t4VG%`~H zf9Y}|9;`TQTK9mS3;I0H&4~Yo49$KP^r%W)`Y{~?48zu$u*+BI`E4V#7j8e-FPMdy zlv}aA@EU9d+kG}};U%9{-@sDA#eUW{uhD8bEb>B1V&8Xp-q{fYW8z=#H*jr$*E;_$ z@M<5gC_cd5Lp9u}jyf=BwmQi6V+=lfOKvJ=X!Iyx9EQ#c)`b4 zKvDGyx4pWr^=v#+VuYs=Vk6@e7u4d1!Kpb%RZKw6E3Qj(?^v^!=Q7Om@wg(g?zN8j&sMIKz9iV4 zc4x~y!k!I8Fuzx!iz65Z7T|G~b`%6DdXCfb5(*ml-~nmlifY7JlTJMQPa*T6b2Jn|a6Da6sHJDjm$zW)COz7Nma z@m_;#<#XO^G&--#XB5;;-!C3HD{Omx?S7m8{~l__aQ@jdxtjJ|GzXroXKu&PLYf6O zL+8I%{xz6AQnDcGd_$FMLthRI;Udw+8<#Aotm2N-r zn4jnMT(+Iln*YY{3tt;|=YLVISAuh&+d6O2oXfmkV-9ew;oRt2c{B3U2;nXGKJ=PL z+kCBE*O}|i*TS`N3fp=@=WX+a*XUe>ZQUNzwfq_SemU6@Yx6j~5$H6 zu;u5q_CIgf^3gE!x&`ZZ`D@tq7DaaE&kp4gtA`ZK9SgCgo-bd)9K39^W)8b2Ztif?dvTxo*6ccMW}uCEo;sUVl;Jz`QTk8!jk$#usgAFpX;qo!2ti%EoIA zMVkHHp}Jn%HeC1V*ZXeR_Pxc17mAz<8oHy`I-B#ioy<6wZ?7A!-EZ?6s*Jud5+Ofi zIg%24U0|46NB&xI&1(x=cx_w_ua#fptNCrb2GV;C--2uPXMCZ^x#0Uk%@ZZm8Rh{s z-PZ;=LkmNth%>xspLc-rszbie_3ri@yg8q_KP}()(Q~#Qp0=~MZm{Ry`TmPM=t#Hu zU489s=>2TBdoiZ(0o@KhSeOi}UO~Y%z6~{qQjicKF%WU@&%XNl>2bmm0DGU|9UYQJ zIt}Xefv!Av8x{BN=Cu2Gd$W6gd)&P{lSi}qb$lsPMF`*5ShqX{&_quc4bAJjc<3)rwKDgfRl=YcS(%!j2KHR5(iWb-9aNb?G8LMhadSeDH|Knt=S;nP8H(1& zN0fWH?9K@C{rR-JHUE6v-J*beX^Zyjd}Ckm_f&JNh4UUTNPeCzQt$ckVfXZSzuQ0F z?M}PP?%nZu_k;K6-M6U5)#_s_`j&(uhmE4I^64=5C9bsBI*N}K zw?J1f&}WF>1^N|_l7A5nA3*ZB4$aOKR8BM8isEME=#g#m6;6TbY37x^mW zNFDJ8A-+5BP?n+ZxO@NZu=@ypxZMvV|NN9X@6h&p@CH}PH}L3Hpz z&-EizlqsKw{Ud!pVH_A1bZ*ZY%=kzmdCjL3TR;Ux|Laio?6+n1U0|;JU3!VK27hn$ zvH!)t`Y)fYsGw9{#|fW6=j6i_!N{-zRd9lBtmA9`2@{mm&%C&!9Tt*Q4>++32{U+v zB%SljvqQa3kjcDxE;SV7k9_>u-sgLNNQ77V%WB%@)e}ick3Qwuc`$P!%F}4{?pqXQ zG-%rWD=>c&7=`;wvE)M~E>v|}XfxQpvzf7nK;_d>mvJ|I*}mlUni3KXg*>TQ;Wa+C zP`sf(U*pK5AL`ijs3n63tQnb9xEsH3uNR(H3-O33t3(M!Ies$K*BOeD`ZQ?gt5E94 zLr~XIkGbqlq&LS-@gUL@DQbkt&*=VvP)WEX_2vC+H%P@33eYf`p9-<03Y$FjbI|iZ z4eSPtcQT%AS!knA)wFV5&_dJibO!Tg{66qj{jJhoGlZt$TP)ltSZ@3d)&T)4WbmLs zQ9@TnE!@|KAJPCZs6;;ndgeY$eg$iZ`BAPm9E(X=0-^nhC2|_z%``IH=}`&EdlkoA zy1zuh@0ssz4-dOr^Pf@f<@0X$@CiBedVLOFdCy#x#TG*7fZRPb3MQM-7R0^ zIAS!<`Ito5u8`=*;L(jC@)OF6Dv_#f_5S=Mn=#qfE%V|5Bd`w_4ld@@fc5>3!5`i| zjxS2qn8pZ7QSjG-;%;2qRt}9&UQg?Wt1#$YF^X!l%Cw;BH$B_UZMXe&YvfrLoi94# z4f!&pF?A@XeuG#9wA?J^VE%@7?{LhI?^wv(x=3+RgSCrzkQRTU&XKyu=L_u^u!DxF zClztw8qaw~F=9Q{M+x*HPbWQ)MURo;MCiSRt_z~~w~xDT-|u#R_lJ~bkhZr?L(h4vO)QenY#q;#a8k38h2fY2B{L6z2Ir%cc(bpF`eBC1}zo5tV zI+VvX%5*{vC<^%JS)?IE*KY)t_ zR*T>b!uY_F@jXg>cSgJ}He5gu3f-Tn+?(tf*)O`$_ZqxmrJAh)p7)M2Qw8ka?o1oE z3wn)VzC?=B481U_K;_AK^PaGrh=Cjwf;=5rpxvGf_0WQcY&(WmM)A0=3UW?#zR%Cw zAwUmR$55|!6K+c(j(Zk<(Rv#jS|M+>|E}=0Hr>y`c}T&l2sh9yYiP}im3G-yAXL%$ z&N>R~9oCI5m*w&{{bBdb$K&qXZ*F!UKim>3&zbu?r@TebClppzZ(6Iu ztTLhRH*)S>^|5L1&zRL-lWmH@?+SCtOMZole100m-HU|s&tN`5rWb;toyE#JDARZ) zs39p2w?5AC<=OJN3QDLpt%RWv(g<D^bECi1RPoG4Aau1p0ZiEPC`7 z7}Byu>xh?Z)Gt|(++}OvHD1Wv>}Szz-{0Ud%_n1^LzP142Bl@ai${5sdz6P(pU|?N z<^1b-GF>=l#=}-2Mi6jj{l0fxef|FeX2taNtoY8~qHuUbkXa2Pz&*kdJ?*(+nC=BV zRk?Mcf>)|^agT!AL=On86pJ@q?oi5S6mpM3?h!Z(C-SobrjNTQ>mi|2L?63Hl31ETM82B?t`DXxdR_il|rO35ANsgesKzBF}xG z)tSpwoQfL85d#^*dP1QIhj{YbPXsxwRem4omNA*`GjY}dcJkXN>rul z<$l#NG~r#y0mCE&SE`1}s8(a)+OE2e_e$n%!A$}#c3;4?wk?OouR+s)4b}sLqIY=4 zqQzxph@kWN=OgP>LK0ILgHuz2D^uqg!WF5jPnYh_hR#jy2eT)%je?gR0`__t0N2%C zZ*h+Y(}Z>kVh}#dJbJ{(>e-VT)-G9e-RS)&d{2KWhoq*CHkRFO`C3<0Z^zwynhlbLzWyESf&- z-oJm3m)45avsP0VNI5;imA#fvQS(@Yfuejel4C;VV)vG{FBK2jTDbpoK6fGG9~6Xv z@ZvY=+H+T-d%*9h2+Gp)90RCfx`VmEfL_Uv($2E2!djr6Hbho0vlf`!{j6}U-{x@z zl}g>e^0$9mwNlI7hyyF-sdNWyh%?;zSJOPk^MG8>v6gUy^z+9;voE9q@cHvkvUo9n zh6rE?Osu!12P5`H^V5;px#DUDl9j5x(QuhpDbA4~*M5;wWL@fUwfTru;$x|%6#c12u{xgy;ej~ zAnd5T(9k0>iZe7t-@Ung=esx_j*nwOSJAf~4<2%Qz!0+f_h8d=fTU~zpEFj3Q-{FDp=l%Bf%-+|742%r=bPa8yh&yDAbTV$4Ql$@p(dIdll&zTs(nREi}B!XgNaT+|Tzzd8TRFma?|cb^E%(>x0Ux zeH(KlxL7NLJs^eIt1EC?r1z)<2qX9qLK%XB@mfz6TVd^$Z3K%Ts+D!Fl=J znXrz+d{gg(NcjDLBBNMCZo=(YES-oFj3cXSJuLhv0qDb@s#{K;49(;SEiAz{jY8T7 zE&u7UJzIsiHEQg>XCAJBW!693-=jE|a(O}^G8oYc$ZX72&RZ%(_Dji)4$QeVtH;bw zWdLHAi|J4=1I-ttS0TGXZF{SWmAd!uh@jL6&v3X7%Egy|iarPMu5w*Dv%1Y&dU~!4 zvz%19Kw}&Swn=Vl=u-m}3_RXl7!|X52~ma0d&=!ssAw}om;5}T$0xSjgig26vJehg z)qy$BbXZ!h+XP(3aCSVgUnG=yJwsl$BFRNgyj)>ZS3y?D)e!31#a8n4)+sDHR=v)rE+1GJeN>@z|DFw} zZ!vfu&!mN3N!0@C#~YxZg^=Efnp_!+E~R^c;T(`>LJ#Cup2~IU3{e{n(GVqt8$C&Mbz4y%4(bPNIj; zKSOWyw}dw`>@R@Aw%}oa(7b#XyascA%c1ctnCW)?X+!AMnEJUZXv9eFE&|4@7AEOUf; zBei?;QpYscqQ<3$S79)cacx9#To@(;(n!mQpa(ieI0z3k8R&>BjnR$!gjvvBL67!Y zyp5|^e!(`cky2kG`tdGkTNIwUV%7EC=; zJ)e{|3)+W#P_O!fZY$C$g#Qeu?p-D9+k7gnIFb{+K;FE{i20|kg|$wy19THugnI=A z>xnU!k(Y9a=PvuyqTNaqayjZyJ7aqR(xlPx7yi^=_+i2e<>hq_%jG!t(2mek+4&QT zHUvZ65GRowvU5RGa>#(&c$4#^UaLUOla_)Ve3ai8dr^wz)FVisz~Utf5IvMOX-mEl zAWBkMv<{ysAE^ooP1=Vh=zUUprArm*7`kqZEdr{s)>ZSzzY5%fApcuo0IXEmE3mX3 z(4N`QLotVz>X5U;j}?Cv#R<37h8|=U6dg%9DtkV_MPBhJ^9ZIzT9) z*hcHlUZ;dF-41w}*_(SBDGj~YW;86FKueUjW+kZ_J z)fczpe(-4<>S=7BamfGm`Dyowh4<&IxKTKvcKLCTQZf%7Bqxp1I(-g)t=Ew933^OI zr{)RHi2*(F3JmtsuG`FDdk;5yD|h^bU;Nb{Qr#9{q(h=W3_0BDf&7<8ClLgQd1o$F znkWQzDU+P_@Su33ir}7(iVv<+Zs(wkAcQQ6L}^m)>5`tLH|Bf|7-u`=(I^KOws$VJ zjd=>mJnKo9lnVzLy70P$W}`#~Pn*n-C-UjTr#aG+R7!^;%}^$zKrtzqMKRp~*eX&m zZ$?2w47jC8mx&8O%*c^uRXxm!I^$8{-h&s+ko06qo=%lIfA(+uE_W}%0jNGfT|MVF zkT9U0{cT9{eG?8L42w`(SrszxcvvnIf_V-gYz^Vc`qC*@RTft{EsACEWa|+D7;9l9 zrO+P$Wsswv#{4!y=7IJMaoyxg&Xza3&v%#I|NeYO`ndBCu*EC=l6|M00ok^Y`Wwa75C&bU)X|^(4cbGA z{RgO9SZ>&937TK+t!J->lwQDCUccm86=`{ut$k+9%*_= zQd3ZMl0KCM(~*(OsVUm{mB0Qw7%7zuGlKg(nbq_F%VcI@WJue@A?o589SY;~ufB?DLtP)KdH!i1z3Ro2)J`AVh_tfA*Zs|>nLsuZU1f?T&Ziz@ND zH?FYMy#h^x|MMJHCsBF5KUUEiLOGAuYN0UmD`_OWf7l)WYXO*9(-^0n|J5k z4?f=RzWs2M^T@LvNu`s>@DzojTu`ZxP^)Le)4)8n2VQ*U_i;hbwd#YKo|E7n!4bS}`*<4ol?7`j7&-a+HVn7(mGavG}_} ze_-QJ1m55Hkp`a}obm+0$3YRVzYu=>%=JU|lL>sDiugtV9VX0?TUcHoMmPvBFE4Y= zW$LOR>vE~hk)j|`MUi&-OS*cYb+F#NxlnOquH$w0VQ5zIqSy68^C%;&YZnTxO6w4U zDqx4%#`1`UR)hk~b_nRahP7?wn_|mX!?4@2Qew%-F}nThXr=$nW6ShKD9I~1W7_yk z9yR>YDeio^k2rj~{>}Sa@TMNt-X8H%9|8HxsT1h|WOaqt=2uSwofhK?ri5A+RUNnB z%u`9#gz$@}8Fsm=fzmF35x{rqI-Pq>AKAF*@~0U_6r)^C z31y6~SY1PW@}1r%+V~EuA<>nWMB9Dc+qfLgYZE9>Wj5a8(xQyHniBdsVKZ!JdQT1v zWH3ywLW;uIagjIX9OqUI1g0ZYm=y&FFMr}9FzIVRqfh6$STL#ghE3BhH=HUA@6%4B zBNao7xwqy^1UL9=1<7}VO3;s4_pfs4#w)@hfmC2qyjR;O3Q55`KxOWk! zGBb~(%)GnHwJ&3TW=;ADEq}Uqn%M7td=Kk}KDAqJ?4a}l2Mx0$9?Resi}@N{Gimy= ze8t71ydKckb6&%?t}xdRs^m#fWenC?@2h^L=6{iDI3%qsafUL`rnlle#)i49vGY4^ z6jWx63O-_lbnSE9`lI8{=_;lccwxery@0I`m!31QgcixkNHD{SYF+LpkC;F5f99KR2C#Ur#LZZ;4FUXsdfp3$uk%R z!R#d`;m}~@AcMvb^*h|l!d<%&$sCE?2ba`#LSB>GN9ZG z86mGru+Z_%wlFtVdOeVZ;R&{RbKPt8g>9W{IM?H!<@y@F3E5UK-T~@sUa&F9%J-h@ z&cBAQMW#+??7F7ql`$E_KH9>AkX3CCEL^zNw#cni=2Koi6oHr(7@fy@DAJl17}mX}G77^A=8ACI@@vmHp@RzzX-Y#{Z?qq< z&7bRvgNv#&!>C^oXn58&S4vs+GegsV4Hw0itpr>=W~fBA?n=kXt1l`K%=*A>l*qM? z<$Jz|`dXuJZhP{M;v`lo0qdu8IS9ux@-PpmMNX%3vI>;kfdw?JGSUc)yc~B~CNAw7 zir#C`^|#nZX!aqraytDI5s0OxV?0W)%WbEyg>}5pp0LbSBhN*Z4`@1HgRWO-lq;-o zs?ciHEYu^fQJ10)-STP%FJt(tDBtR4&H8xnRy&Vdd~}kpcnB_z zT-q{_7f4t>9z2LA1do+vj+5++8vQq`uqEijq+vXvd>Dn-wi{?oae?6}Ma&)&A%n_b6hhS(ns%pxit^s9ykF#) zY150JzLy7k?Uv>j!ifT;jyNl(1wTXAQ+RVK3JXnPEcQCx?z0;@Z;Ju>9{iOu=@TbV zuKfcle{&N)7+n2o8P5Oa-~YGB#RU&HqmijD+yac7BeZ+=IBq>$_PV!mS?pKo+<)3e z%n43fQHG-YyB0Zlc^$xZ%^5Pj@3vh72I3bb$oFZ-lW zS!Y}jt*k+_@0wrzWCpwHviu8AaFFh>F?z=!7-Lmg+uC12kAbTqRyPB@Yx)7MjcCzL zIIelrsOFtqesb|l5TepR zqNz_?SGhv0oIEFLA@$a=BxJWD`w&{NwRIgtXsSr_#-Qq&aG$j57Fb^6QOR9bC=;7H zhi}Vmzp<|vm_UutDUJ%H9d8)ktsil&s?jx zW-+X0e3ysa0loN}m;K-QC;u*8SUHM>PPwlNEg`lrvX?=ipD(@^amfk8kMHWiu0M$N zs~vtnN14kaeWcAkkD@fA@|GxErlIXiM#)1c-Ukd#T&C~J2}I}!!hC~f>c?P8IH{j` zrJxibR3BQj|1SLiDqY#Ff^L`v4(M(J=JxrnI;u=LW6)FVuOmy#ZZ(v(|1vbL!Ik1P zO;FG2%iC6@KP~k4Ev{9bk@so;xO;zlv)li@fBx^8vPy|!QD6?l(rS@Xie&;!`1O#$ z(|WfUK0ADPERXc9IX}Jf8BeV`dN1=JiZ%55WvuLnkfm=N2=Ve&)VgN9S4h^fB2*S zm{t*1^Y6!SwE#Vo?o^~5((Txwj*9y;0<{|l?CB5+L~%Y*$@k?@n2PXq3Kg7lLE^ef z5OUh{aEah$K2HorD2>NLTZ2%roF9IYg=FQt*B!E9RaGJq%G7jHFU(t7?VNY$r*gjAb-%-l+KXx zeI9oc39;N8JwJXt@BBdH{0T;dvjY~_sCbRsQCH5l&CVK?{QQ5jdV&W^~B#Xm(fIV9wIXr`^sVtk(r}0v9yWt z?dsdE0?kSZj&Tsd5cg1>k5mU*P^s(Sg$64UMtm$H7u`kl$@#e+c`FT49{HE zIQQ!agbOXZ6;8b9KAcGrMH-{Fb=4ByYS`R3jJpZ(r{roEjFMfNqGmlGZor^PSt ztmp|4($o66U@Ir9RO+1Qq(2CuvhN=5cXxPXg*;FA^&;DVdh(!?&;_#^hV4|QiqY${ zu=-SwZJejAqY(7JwBssglPFq`wY`RNII~&OU@$zIq~E1)$JwE8)kgBe4?P&#k_R_> zRoWy1R6S2t>|1438~Z3T>U-%d;kuy}X#|4To*}|OBtAlH31KLbaT#Wp0f2gv&_6pDLJROKAzruA zrF9|CA$v$1ATP8LZ@g6j5mF7+KAFkMKP#)BxX{8dKHuN(PB*u522I1S{TYId4$weI zF2bZ4<eWjRP5I!zpm_2VZSqUnHo%~8_AkN zw`yec z-0dDE`am`B-K3t6bwI*zy(2{3bVc9tspU6K^2(?~l5LRoL?7qAcwLV-!Y{ zQ9ry#uk8ykl+F zH2dHB(SM+i@;ZM*XvYejUgD8jn(dA-ZJLuA$|4-=NRU)8q&Q#?+w%un08i%y72=$! zcU=gr$zwozmoE|BUG7S0iy#Y5^sC@y*pf&1QGoR>P#sbvjH0z{jqX6^W4%|g9B*8Z z=~=9vt(QK^8zX#$5O0Hi#;75UF{&;U--_u}$gv^@AiYwSWrpHf{d->#Yi$#C8LDZk z0n~wqio}SimeVrBCL;44DL>uz0~a%7I7j;N#b*rOMUK>@?T0c#>o@+DiiC&)$^q@< z>MACRbgr~4PFw^arE6Qy19b-z64db>pS+lrc4UrD_0%4u;DYBTK0tLr#Ga_<%0|J^ zgT!)`k4?aAA_8gZ&`&-_L8gkj__hNVhCJky@M<0F#{2PP2b@C>`RVb{RykN-#T%0I zeAX!;yp)1grEyK8=g0fJmugx5P8h~2UB}|upp|Bm@T^!EQ}~K%H7p&*#f&ew)n``y zA}5hFUYR!+@kTvNnOk2k*NC1FqS0pm8$bF39X||aB{*WX;HotW(&eM5QbKu1mD!?x zuMTH_w`*L-hZ^}VA4_q0C{nr+u zX!;X)j}2>|dd^VcqUK5Rtm7CRxb&p!t0#`fgAX4QMJS3%<-tt8{Dm^xgRLvyLS#U` zio8Vu9|(J%Gxz6b>`x=mXbwyZ@}*(ql}B#m#fJ`2DssqQ3POqgjgt2$k#$V|V2$V6 z{<#fz4bLuqY?smTFMUNmdIKf<-~8SGlI=%ec;mREm@HjRX*f(66cBMz?@ylE&?bsh z@s#R?ew0BbZQ+kp`U46IM6|5~Ez2ZdkB^+RYy~d!Wyw(lOy$cVp#7IeiW&lCzEKw8 zGhArebA>XW(l}@Ks0#88AM#=p=?4tAHNMUh>^}zRVgblcD*zuJeB%NHxA8~7&3F3K zAYd$S$x+vP6FXyZt}- z{r}3!ysV$w#X1$JZl72G@wkTCr@<`VBT++f{`d+4%SsK_oWS!)h$X)7Iw5YwMUI%|DP($<}KZ+-u>XG?b9I5f47B0;%?P3__l;YH& z`92CVO`RCVP#y-H@nJZgr1<2a{xBQ-lIK~pAH?^`km{I01IzdD7@r|t*_4y`9@NA5 zq$<1;c6}R8!%NJeZ{_C?c;3;(Bhvgl9`1TUrhJs+)3eHTVN^Wtf9v1;w`bk-!U80# zPb4Nai`;Q4VyWJmBm(HGVb%x!$o9g(m z@BNm8)L5LW41ks^%nDsO9dc#n{!ihj%?OK8jS5s)q|ox6AsyuMaEws?(61<4>Dl&% z(AowWE}sZbd2$Fpd3X!W{44-|eRU%5z)~*gA?R**Vyu2$E5~BWM~PgBBq$=kqGE67 z`@|=dDkKs@MXyRk(q=Sb__5!7i&kaqd|~>q`yW64akf!;YC=W70<8l5tW13-+~|Y; zkOj7m+O z!5pPf&u5hW8I_=fD zD*;20N{)BIOQ{tj;NRl5w-|ch2}M5c{wK!f>CfqKoBq&WEM66PqkaN5`Y)t8TRI`--F?$f7FyF2*vpx(dgmuRWV_Q&1- Y0jIQKqpXab7ytkO07*qoM6N<$f;yQ2zW@LL diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/resources/base/profile/main_pages.json deleted file mode 100644 index 6898b31d2..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/entry/src/main/resources/base/profile/main_pages.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "src": [ - "pages/index/index", - "pages/second/second" - ] -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/signature/openharmony_sx.p7b b/ability/ability_runtime/zidltest/actsamszidlclienttest/signature/openharmony_sx.p7b deleted file mode 100755 index dcec6c9615032c1b48bf185e839d9720dd68aab0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3820 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 - map.set("voidOutMapStringInt", 1); - callback(SUCCESS, map); - } - - voidOutStringArray(callback :voidOutStringArrayCallback){ - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_1700 called'); - var strarray = ["aa", "dd"]; - callback(SUCCESS, strarray); - } - - voidInOutMapStringInt(mapIn, callback: voidInOutMapStringIntCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_1800 called'); - var errCode = FAIL; - if ((mapIn.get("voidInOutMapStringInt1") == 1801) && - (mapIn.get("voidInOutMapStringInt2") == 1802)) { - mapIn.set("voidInOutMapStringInt1", 1802); - mapIn.set("voidInOutMapStringInt2", 1801); - errCode = SUCCESS; - } - callback(errCode, mapIn); - } - - voidInOutStringArray(strArrayIn, callback: voidInOutStringArrayCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_1800 called'); - var errCode = FAIL; - if ((strArrayIn[0] == "ddd") && - (strArrayIn[1] == "ccc")) { - strArrayIn[0] = "aaa"; - strArrayIn[1] = "bbb"; - errCode = SUCCESS; - } - callback(errCode, strArrayIn); - } - - voidInInt(number, callback : voidInIntCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_1900 called:'+ JSON.stringify(number)); - if(number == 8888){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidInString(string, callback : voidInStringCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_1900 called:'+ JSON.stringify(string)); - if(string == "voidInString"){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidOutInt(callback : voidOutIntCallback){ - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_2000 called'); - var number = 123; - callback(SUCCESS, number); - } - - voidOutString(callback : voidOutStringCallback){ - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_2000 called'); - var string = "voidOutString"; - callback(SUCCESS, string); - } - - voidInOutInt(number, callback: voidInOutIntCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_2100_1 called:'+ JSON.stringify(number)); - var num = 456789; - if(number == 123456){ - callback(SUCCESS, num); - }else{ - callback(FAIL, number); - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_2100_1 Call_Fail') - } - } - voidInOutString(strinput, callback: voidInOutStringCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_2100_2 called:'+ JSON.stringify(strinput)); - var str = "456789"; - if(strinput == "voidInOutString"){ - callback(SUCCESS, str); - }else{ - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_2100_2 Call_Fail'); - callback(FAIL, strinput); - } - } - - voidParameterTypeBoolean(oBooleanTrue, callback : voidParameterTypeBooleanCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_2200 called:'+ JSON.stringify(oBooleanTrue)); - if(oBooleanTrue == true){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeByte(number, callback : voidParameterTypeByteCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_2300 called:'+ JSON.stringify(number)); - if(number == 1111){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeShort(number, callback : voidParameterTypeShortCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_2400 called:'+ JSON.stringify(number)); - if(number == 2222){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeInt(number, callback : voidParameterTypeIntCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_2500 called:'+ JSON.stringify(number)); - if(number == 3333){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeLong(number, callback : voidParameterTypeLongCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_2600 called:'+ JSON.stringify(number)); - if(number == 4444){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeFloat(number, callback : voidParameterTypeFloatCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_2700 called:'+ JSON.stringify(number)); - if(number == 5555.1){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeDouble(number, callback : voidParameterTypeDoubleCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_2800 called:'+ JSON.stringify(number)); - if(number == 6666.1){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeString(string, callback : voidParameterTypeStringCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_2900 called:'+ JSON.stringify(string)); - if(string == "voidParameterTypeString"){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeSequenceable(MySequenceable, callback : voidParameterTypeSequenceableCallback) { - console.log('ZidlTest Process Server ACTS_Zidl_Js2JsMulti_3000 called:'+ JSON.stringify(MySequenceable)); - if((MySequenceable != null) && (MySequenceable.getNum() == 32) && (MySequenceable.getString() == "nihao")){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeInterface(param: InterfaceDeclareProxy, callback : voidParameterTypeInterfaceCallback) { - console.log("ZidlTest Server ACTS_Zidl_Js2JsMulti_3100 called"); - let proxy = new InterfaceDeclareProxy(param); - proxy.testInterface(3300, (errCode)=>{ - if (errCode == SUCCESS) { - console.log("ZidlTest Server ACTS_Zidl_Js2JsMulti_3100 callback SUCCESS"); - callback(SUCCESS); - } else { - console.log("ZidlTest Server ACTS_Zidl_Js2JsMulti_3100 callback FAIL"); - callback(FAIL); - } - }); - - } - - voidParameterTypeMapStringString(map, callback : voidParameterTypeMapStringStringCallback) { - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_3200 called:'+ map.get("voidParameterTypeMapStringString")); - if(map.get("voidParameterTypeMapStringString") == "fdhatdh"){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidParameterTypeDoubleArray(array, callback : voidParameterTypeDoubleArrayCallback){ - console.log('ZidlTest Server ACTS_Zidl_Js2JsMulti_3300 called:'+ JSON.stringify(array)); - if(array.length == 2 && array[0] == 1.1 && array[1] == 2.1){ - callback(SUCCESS); - }else{ - callback(FAIL); - } - } - - voidOrderOutIn(paramI, callback: voidOrderOutInCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsMulti_3400 called" + paramI); - var mystring = "hello world"; - callback(SUCCESS, mystring); - } - - voidOrderInOutIn(paramI, paramS, callback: voidOrderInOutInCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsMulti_3500 called" + paramI + " " + paramS); - var mynumber = 6; - callback(SUCCESS, mynumber); - } - - voidOrderOutInOut(paramS, callback: voidOrderOutInOutCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsMulti_3600 called" + paramS); - var mynumber = 3; - var mystring = "paramcallback"; - callback(SUCCESS, mynumber, mystring); - } - - voidOrderInInOutOut(paramS, paramI, callback: voidOrderInInOutOutCallback){ - console.log("ZidlTest Server ACTS_Zidl_Js2JsMulti_3700 called" + paramS + " " + paramI); - var mystring = "callback"; - var mynumber = 4; - callback(SUCCESS, mynumber, mystring); - } -} - -export default class ServiceAbility extends ServiceExtension { - onCreate(want: Want) { - globalThis.abilityWant = want; - console.log('ZidlService ServiceAbility onCreate, want: ' + want.abilityName); - } - - onRequest(want, startId) { - console.log('ZidlService ServiceAbility onRequest, want: ' + want.abilityName - + ', startId: ' + startId); - } - - onConnect(want) { - console.log('ZidlService ServiceAbility onConnect, want:' + want.abilityName); - return new ZidlTestImp('connect'); - } - - onDisconnect(want) { - console.log('ZidlService ServiceAbility onDisconnect, want:' + want.abilityName); - } - - onDestroy() { - console.log('AZidlService ServiceAbility onDestroy'); - } -}; diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/interfaceDeclare/i_interface_declare.ts b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/interfaceDeclare/i_interface_declare.ts deleted file mode 100644 index a9469ce4d..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/interfaceDeclare/i_interface_declare.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2021 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. - */ - - -export default interface IInterfaceDeclare { - testInterface(data: number, callback: testInterfaceCallback): void; -} -export type testInterfaceCallback = (errCode: number) => void; - diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_proxy.ts b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_proxy.ts deleted file mode 100644 index 9f9cc9c43..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_proxy.ts +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2021 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 {testInterfaceCallback} from "./i_interface_declare"; -import IInterfaceDeclare from "./i_interface_declare"; -import rpc from "@ohos.rpc"; - -export default class InterfaceDeclareProxy implements IInterfaceDeclare { - constructor(proxy) { - this.proxy = proxy; - } - - testInterface(data: number, callback: testInterfaceCallback): void - { - let _option = new rpc.MessageOption(rpc.MessageOption.TF_SYNC); - let _data = new rpc.MessageParcel(); - let _reply = new rpc.MessageParcel(); - _data.writeInt(data); - this.proxy.sendRequest(InterfaceDeclareProxy.COMMAND_TEST_INTERFACE, _data, _reply, _option).then(function(result) { - if (result.errCode === 0) { - let _errCode = result.reply.readInt(); - callback(_errCode); - } else { - console.log("sendRequest failed, errCode: " + result.errCode); - } - }) - } - - static readonly COMMAND_TEST_INTERFACE = 1; - private proxy -} - diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_stub.ts b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_stub.ts deleted file mode 100644 index 1606f77b4..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/interfaceDeclare/interface_declare_stub.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2021 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 {testInterfaceCallback} from "./i_interface_declare"; -import IInterfaceDeclare from "./i_interface_declare"; -import rpc from "@ohos.rpc"; - -export default class InterfaceDeclareStub extends rpc.RemoteObject implements IInterfaceDeclare { - constructor(des: string) { - super(des); - } - - onRemoteRequest(code: number, data, reply, option): boolean { - console.log("onRemoteRequest called, code = " + code); - switch(code) { - case InterfaceDeclareStub.COMMAND_TEST_INTERFACE: { - let _data = data.readInt(); - this.testInterface(_data, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - default: { - console.log("invalid request code" + code); - break; - } - } - return false; - } - - testInterface(data: number, callback: testInterfaceCallback): void{} - - static readonly COMMAND_TEST_INTERFACE = 1; -} - diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/service.ts deleted file mode 100644 index b49731a41..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/service.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* -* 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. -*/ -export default { - onStart() { - console.info('ServiceAbility onStart'); - }, - onStop() { - console.info('ServiceAbility onStop'); - }, - onCommand(want, startId) { - console.info('ServiceAbility onCommand'); - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/zidlTool/i_zidl_tool_test.ts b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/zidlTool/i_zidl_tool_test.ts deleted file mode 100644 index ac9da6352..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/zidlTool/i_zidl_tool_test.ts +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (C) 2021 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 MySequenceable from "./my_sequenceable"; -import IInterfaceDeclare from "../interfaceDeclare/i_interface_declare"; - -export default interface IZidlToolTest { - onewayVoidVoid(callback: onewayVoidVoidCallback): void; - voidVoid(callback: voidVoidCallback): void; - booleanVoid(callback: booleanVoidCallback): void; - byteVoid(callback: byteVoidCallback): void; - shortVoid(callback: shortVoidCallback): void; - intVoid(callback: intVoidCallback): void; - longVoid(callback: longVoidCallback): void; - floatVoid(callback: floatVoidCallback): void; - doubleVoid(callback: doubleVoidCallback): void; - stringVoid(callback: stringVoidCallback): void; - sequenceableVoid(callback: sequenceableVoidCallback): void; - interfaceVoid(callback: interfaceVoidCallback): void; - mapStringStringVoid(callback: mapStringStringVoidCallback): void; - doubleArrayVoid(callback: doubleArrayVoidCallback): void; - voidInMapStringInt(param: Map, callback: voidInMapStringIntCallback): void; - voidInStringArray(param: string[], callback: voidInStringArrayCallback): void; - voidOutMapStringInt(callback: voidOutMapStringIntCallback): void; - voidOutStringArray(callback: voidOutStringArrayCallback): void; - voidInOutMapStringInt(param: Map, callback: voidInOutMapStringIntCallback): void; - voidInOutStringArray(param: string[], callback: voidInOutStringArrayCallback): void; - voidInInt(param: number, callback: voidInIntCallback): void; - voidInString(param: string, callback: voidInStringCallback): void; - voidOutInt(callback: voidOutIntCallback): void; - voidOutString(callback: voidOutStringCallback): void; - voidInOutInt(param: number, callback: voidInOutIntCallback): void; - voidInOutString(param: string, callback: voidInOutStringCallback): void; - voidParameterTypeBoolean(param: boolean, callback: voidParameterTypeBooleanCallback): void; - voidParameterTypeByte(param: number, callback: voidParameterTypeByteCallback): void; - voidParameterTypeShort(param: number, callback: voidParameterTypeShortCallback): void; - voidParameterTypeInt(param: number, callback: voidParameterTypeIntCallback): void; - voidParameterTypeLong(param: number, callback: voidParameterTypeLongCallback): void; - voidParameterTypeFloat(param: number, callback: voidParameterTypeFloatCallback): void; - voidParameterTypeDouble(param: number, callback: voidParameterTypeDoubleCallback): void; - voidParameterTypeString(param: string, callback: voidParameterTypeStringCallback): void; - voidParameterTypeSequenceable(param: MySequenceable, callback: voidParameterTypeSequenceableCallback): void; - voidParameterTypeInterface(param: IInterfaceDeclare, callback: voidParameterTypeInterfaceCallback): void; - voidParameterTypeMapStringString(param: Map, callback: voidParameterTypeMapStringStringCallback): void; - voidParameterTypeDoubleArray(param: number[], callback: voidParameterTypeDoubleArrayCallback): void; - voidOrderOutIn(paramI: number, callback: voidOrderOutInCallback): void; - voidOrderInOutIn(paramI: number, paramS: string, callback: voidOrderInOutInCallback): void; - voidOrderOutInOut(paramS: string, callback: voidOrderOutInOutCallback): void; - voidOrderInInOutOut(paramS: string, paramI: number, callback: voidOrderInInOutOutCallback): void; -} -export type onewayVoidVoidCallback = (errCode: number) => void; -export type voidVoidCallback = (errCode: number) => void; -export type booleanVoidCallback = (errCode: number, returnValue: boolean) => void; -export type byteVoidCallback = (errCode: number, returnValue: number) => void; -export type shortVoidCallback = (errCode: number, returnValue: number) => void; -export type intVoidCallback = (errCode: number, returnValue: number) => void; -export type longVoidCallback = (errCode: number, returnValue: number) => void; -export type floatVoidCallback = (errCode: number, returnValue: number) => void; -export type doubleVoidCallback = (errCode: number, returnValue: number) => void; -export type stringVoidCallback = (errCode: number, returnValue: string) => void; -export type sequenceableVoidCallback = (errCode: number, returnValue: MySequenceable) => void; -export type interfaceVoidCallback = (errCode: number, returnValue: IInterfaceDeclare) => void; -export type mapStringStringVoidCallback = (errCode: number, returnValue: Map) => void; -export type doubleArrayVoidCallback = (errCode: number, returnValue: number[]) => void; -export type voidInMapStringIntCallback = (errCode: number) => void; -export type voidInStringArrayCallback = (errCode: number) => void; -export type voidOutMapStringIntCallback = (errCode: number, param: Map) => void; -export type voidOutStringArrayCallback = (errCode: number, param: string[]) => void; -export type voidInOutMapStringIntCallback = (errCode: number, param: Map) => void; -export type voidInOutStringArrayCallback = (errCode: number, param: string[]) => void; -export type voidInIntCallback = (errCode: number) => void; -export type voidInStringCallback = (errCode: number) => void; -export type voidOutIntCallback = (errCode: number, param: number) => void; -export type voidOutStringCallback = (errCode: number, param: string) => void; -export type voidInOutIntCallback = (errCode: number, param: number) => void; -export type voidInOutStringCallback = (errCode: number, param: string) => void; -export type voidParameterTypeBooleanCallback = (errCode: number) => void; -export type voidParameterTypeByteCallback = (errCode: number) => void; -export type voidParameterTypeShortCallback = (errCode: number) => void; -export type voidParameterTypeIntCallback = (errCode: number) => void; -export type voidParameterTypeLongCallback = (errCode: number) => void; -export type voidParameterTypeFloatCallback = (errCode: number) => void; -export type voidParameterTypeDoubleCallback = (errCode: number) => void; -export type voidParameterTypeStringCallback = (errCode: number) => void; -export type voidParameterTypeSequenceableCallback = (errCode: number) => void; -export type voidParameterTypeInterfaceCallback = (errCode: number) => void; -export type voidParameterTypeMapStringStringCallback = (errCode: number) => void; -export type voidParameterTypeDoubleArrayCallback = (errCode: number) => void; -export type voidOrderOutInCallback = (errCode: number, paramS: string) => void; -export type voidOrderInOutInCallback = (errCode: number, paramI: number) => void; -export type voidOrderOutInOutCallback = (errCode: number, paramI: number, paramS: string) => void; -export type voidOrderInInOutOutCallback = (errCode: number, paramI: number, paramS2: string) => void; - diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/zidlTool/my_sequenceable.ts b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/zidlTool/my_sequenceable.ts deleted file mode 100644 index bef9dcbe2..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/zidlTool/my_sequenceable.ts +++ /dev/null @@ -1,28 +0,0 @@ -export default class MySequenceable { - constructor() { - this.num = 14; - this.str = "hello"; - } - getNum() : number { - return this.num; - } - - getString() : string { - return this.str; - } - - marshalling(messageParcel) { - console.info('marshalling++++'); - messageParcel.writeInt(this.num); - messageParcel.writeString(this.str); - return true; - } - unmarshalling(messageParcel) { - console.info('unmarshalling++++'); - this.num = messageParcel.readInt(); - this.str = messageParcel.readString(); - return true; - } - private num; - private str; -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/zidlTool/zidl_tool_test_stub.ts b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/zidlTool/zidl_tool_test_stub.ts deleted file mode 100644 index 466bc3d60..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility/zidlTool/zidl_tool_test_stub.ts +++ /dev/null @@ -1,549 +0,0 @@ -/* - * Copyright (C) 2021 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 {onewayVoidVoidCallback} from "./i_zidl_tool_test"; -import {voidVoidCallback} from "./i_zidl_tool_test"; -import {booleanVoidCallback} from "./i_zidl_tool_test"; -import {byteVoidCallback} from "./i_zidl_tool_test"; -import {shortVoidCallback} from "./i_zidl_tool_test"; -import {intVoidCallback} from "./i_zidl_tool_test"; -import {longVoidCallback} from "./i_zidl_tool_test"; -import {floatVoidCallback} from "./i_zidl_tool_test"; -import {doubleVoidCallback} from "./i_zidl_tool_test"; -import {stringVoidCallback} from "./i_zidl_tool_test"; -import {sequenceableVoidCallback} from "./i_zidl_tool_test"; -import {interfaceVoidCallback} from "./i_zidl_tool_test"; -import {mapStringStringVoidCallback} from "./i_zidl_tool_test"; -import {doubleArrayVoidCallback} from "./i_zidl_tool_test"; -import {voidInMapStringIntCallback} from "./i_zidl_tool_test"; -import {voidInStringArrayCallback} from "./i_zidl_tool_test"; -import {voidOutMapStringIntCallback} from "./i_zidl_tool_test"; -import {voidOutStringArrayCallback} from "./i_zidl_tool_test"; -import {voidInOutMapStringIntCallback} from "./i_zidl_tool_test"; -import {voidInOutStringArrayCallback} from "./i_zidl_tool_test"; -import {voidInIntCallback} from "./i_zidl_tool_test"; -import {voidInStringCallback} from "./i_zidl_tool_test"; -import {voidOutIntCallback} from "./i_zidl_tool_test"; -import {voidOutStringCallback} from "./i_zidl_tool_test"; -import {voidInOutIntCallback} from "./i_zidl_tool_test"; -import {voidInOutStringCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeBooleanCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeByteCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeShortCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeIntCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeLongCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeFloatCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeDoubleCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeStringCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeSequenceableCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeInterfaceCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeMapStringStringCallback} from "./i_zidl_tool_test"; -import {voidParameterTypeDoubleArrayCallback} from "./i_zidl_tool_test"; -import {voidOrderOutInCallback} from "./i_zidl_tool_test"; -import {voidOrderInOutInCallback} from "./i_zidl_tool_test"; -import {voidOrderOutInOutCallback} from "./i_zidl_tool_test"; -import {voidOrderInInOutOutCallback} from "./i_zidl_tool_test"; -import IZidlToolTest from "./i_zidl_tool_test"; -import rpc from "@ohos.rpc"; -import MySequenceable from "./my_sequenceable"; -import IInterfaceDeclare from "../interfaceDeclare/i_interface_declare"; -import InterfaceDeclareStub from "../interfaceDeclare/interface_declare_stub"; - -export default class ZidlToolTestStub extends rpc.RemoteObject implements IZidlToolTest { - constructor(des: string) { - super(des); - } - - onRemoteRequest(code: number, data, reply, option): boolean { - console.log("onRemoteRequest called, code = " + code); - switch(code) { - case ZidlToolTestStub.COMMAND_ONEWAY_VOID_VOID: { - this.onewayVoidVoid((errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_VOID: { - this.voidVoid((errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_BOOLEAN_VOID: { - this.booleanVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(returnValue ? 1 : 0); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_BYTE_VOID: { - this.byteVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_SHORT_VOID: { - this.shortVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_INT_VOID: { - this.intVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_LONG_VOID: { - this.longVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeLong(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_FLOAT_VOID: { - this.floatVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeFloat(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_DOUBLE_VOID: { - this.doubleVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeDouble(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_STRING_VOID: { - this.stringVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeString(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_SEQUENCEABLE_VOID: { - this.sequenceableVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeSequenceable(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_INTERFACE_VOID: { - this.interfaceVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeRemoteObject(returnValue as InterfaceDeclareStub); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_MAP_STRING_STRING_VOID: { - this.mapStringStringVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(returnValue.size); - for (let [key, value] of returnValue) { - reply.writeString(key); - reply.writeString(value); - } - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_DOUBLE_ARRAY_VOID: { - this.doubleArrayVoid((errCode, returnValue) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeDoubleArray(returnValue); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_MAP_STRING_INT: { - let _param = new Map(); - let _paramSize = data.readInt(); - for (let i = 0; i < _paramSize; ++i) { - let key = data.readString(); - let value = data.readInt(); - _param.set(key, value); - } - this.voidInMapStringInt(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_STRING_ARRAY: { - let _param = data.readStringArray(); - this.voidInStringArray(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_OUT_MAP_STRING_INT: { - this.voidOutMapStringInt((errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(param.size); - for (let [key, value] of param) { - reply.writeString(key); - reply.writeInt(value); - } - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_OUT_STRING_ARRAY: { - this.voidOutStringArray((errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeStringArray(param); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_OUT_MAP_STRING_INT: { - let _param = new Map(); - let _paramSize = data.readInt(); - for (let i = 0; i < _paramSize; ++i) { - let key = data.readString(); - let value = data.readInt(); - _param.set(key, value); - } - this.voidInOutMapStringInt(_param, (errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(param.size); - for (let [key, value] of param) { - reply.writeString(key); - reply.writeInt(value); - } - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_OUT_STRING_ARRAY: { - let _param = data.readStringArray(); - this.voidInOutStringArray(_param, (errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeStringArray(param); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_INT: { - let _param = data.readInt(); - this.voidInInt(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_STRING: { - let _param = data.readString(); - this.voidInString(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_OUT_INT: { - this.voidOutInt((errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(param); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_OUT_STRING: { - this.voidOutString((errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeString(param); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_OUT_INT: { - let _param = data.readInt(); - this.voidInOutInt(_param, (errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(param); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_IN_OUT_STRING: { - let _param = data.readString(); - this.voidInOutString(_param, (errCode, param) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeString(param); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_BOOLEAN: { - let _param = data.readInt() == 1 ? true : false; - this.voidParameterTypeBoolean(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_BYTE: { - let _param = data.readInt(); - this.voidParameterTypeByte(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_SHORT: { - let _param = data.readInt(); - this.voidParameterTypeShort(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_INT: { - let _param = data.readInt(); - this.voidParameterTypeInt(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_LONG: { - let _param = data.readLong(); - this.voidParameterTypeLong(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_FLOAT: { - let _param = data.readFloat(); - this.voidParameterTypeFloat(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_DOUBLE: { - let _param = data.readDouble(); - this.voidParameterTypeDouble(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_STRING: { - let _param = data.readString(); - this.voidParameterTypeString(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_SEQUENCEABLE: { - let _param = new MySequenceable(); - data.readSequenceable(_param); - this.voidParameterTypeSequenceable(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_INTERFACE: { - let _param = data.readRemoteObject(); - this.voidParameterTypeInterface(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_MAP_STRING_STRING: { - let _param = new Map(); - let _paramSize = data.readInt(); - for (let i = 0; i < _paramSize; ++i) { - let key = data.readString(); - let value = data.readString(); - _param.set(key, value); - } - this.voidParameterTypeMapStringString(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_PARAMETER_TYPE_DOUBLE_ARRAY: { - let _param = data.readDoubleArray(); - this.voidParameterTypeDoubleArray(_param, (errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_ORDER_OUT_IN: { - let _paramI = data.readInt(); - this.voidOrderOutIn(_paramI, (errCode, paramS) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeString(paramS); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_ORDER_IN_OUT_IN: { - let _paramI = data.readInt(); - let _paramS = data.readString(); - this.voidOrderInOutIn(_paramI, _paramS, (errCode, paramI) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(paramI); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_ORDER_OUT_IN_OUT: { - let _paramS = data.readString(); - this.voidOrderOutInOut(_paramS, (errCode, paramI, paramS) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(paramI); - reply.writeString(paramS); - } - }); - return true; - } - case ZidlToolTestStub.COMMAND_VOID_ORDER_IN_IN_OUT_OUT: { - let _paramS = data.readString(); - let _paramI = data.readInt(); - this.voidOrderInInOutOut(_paramS, _paramI, (errCode, paramI, paramS2) => { - reply.writeInt(errCode); - if (errCode == 0) { - reply.writeInt(paramI); - reply.writeString(paramS2); - } - }); - return true; - } - default: { - console.log("invalid request code" + code); - break; - } - } - return false; - } - - onewayVoidVoid(callback: onewayVoidVoidCallback): void{} - voidVoid(callback: voidVoidCallback): void{} - booleanVoid(callback: booleanVoidCallback): void{} - byteVoid(callback: byteVoidCallback): void{} - shortVoid(callback: shortVoidCallback): void{} - intVoid(callback: intVoidCallback): void{} - longVoid(callback: longVoidCallback): void{} - floatVoid(callback: floatVoidCallback): void{} - doubleVoid(callback: doubleVoidCallback): void{} - stringVoid(callback: stringVoidCallback): void{} - sequenceableVoid(callback: sequenceableVoidCallback): void{} - interfaceVoid(callback: interfaceVoidCallback): void{} - mapStringStringVoid(callback: mapStringStringVoidCallback): void{} - doubleArrayVoid(callback: doubleArrayVoidCallback): void{} - voidInMapStringInt(param: Map, callback: voidInMapStringIntCallback): void{} - voidInStringArray(param: string[], callback: voidInStringArrayCallback): void{} - voidOutMapStringInt(callback: voidOutMapStringIntCallback): void{} - voidOutStringArray(callback: voidOutStringArrayCallback): void{} - voidInOutMapStringInt(param: Map, callback: voidInOutMapStringIntCallback): void{} - voidInOutStringArray(param: string[], callback: voidInOutStringArrayCallback): void{} - voidInInt(param: number, callback: voidInIntCallback): void{} - voidInString(param: string, callback: voidInStringCallback): void{} - voidOutInt(callback: voidOutIntCallback): void{} - voidOutString(callback: voidOutStringCallback): void{} - voidInOutInt(param: number, callback: voidInOutIntCallback): void{} - voidInOutString(param: string, callback: voidInOutStringCallback): void{} - voidParameterTypeBoolean(param: boolean, callback: voidParameterTypeBooleanCallback): void{} - voidParameterTypeByte(param: number, callback: voidParameterTypeByteCallback): void{} - voidParameterTypeShort(param: number, callback: voidParameterTypeShortCallback): void{} - voidParameterTypeInt(param: number, callback: voidParameterTypeIntCallback): void{} - voidParameterTypeLong(param: number, callback: voidParameterTypeLongCallback): void{} - voidParameterTypeFloat(param: number, callback: voidParameterTypeFloatCallback): void{} - voidParameterTypeDouble(param: number, callback: voidParameterTypeDoubleCallback): void{} - voidParameterTypeString(param: string, callback: voidParameterTypeStringCallback): void{} - voidParameterTypeSequenceable(param: MySequenceable, callback: voidParameterTypeSequenceableCallback): void{} - voidParameterTypeInterface(param: IInterfaceDeclare, callback: voidParameterTypeInterfaceCallback): void{} - voidParameterTypeMapStringString(param: Map, callback: voidParameterTypeMapStringStringCallback): void{} - voidParameterTypeDoubleArray(param: number[], callback: voidParameterTypeDoubleArrayCallback): void{} - voidOrderOutIn(paramI: number, callback: voidOrderOutInCallback): void{} - voidOrderInOutIn(paramI: number, paramS: string, callback: voidOrderInOutInCallback): void{} - voidOrderOutInOut(paramS: string, callback: voidOrderOutInOutCallback): void{} - voidOrderInInOutOut(paramS: string, paramI: number, callback: voidOrderInInOutOutCallback): void{} - - static readonly COMMAND_ONEWAY_VOID_VOID = 1; - static readonly COMMAND_VOID_VOID = 2; - static readonly COMMAND_BOOLEAN_VOID = 3; - static readonly COMMAND_BYTE_VOID = 4; - static readonly COMMAND_SHORT_VOID = 5; - static readonly COMMAND_INT_VOID = 6; - static readonly COMMAND_LONG_VOID = 7; - static readonly COMMAND_FLOAT_VOID = 8; - static readonly COMMAND_DOUBLE_VOID = 9; - static readonly COMMAND_STRING_VOID = 10; - static readonly COMMAND_SEQUENCEABLE_VOID = 11; - static readonly COMMAND_INTERFACE_VOID = 12; - static readonly COMMAND_MAP_STRING_STRING_VOID = 13; - static readonly COMMAND_DOUBLE_ARRAY_VOID = 14; - static readonly COMMAND_VOID_IN_MAP_STRING_INT = 15; - static readonly COMMAND_VOID_IN_STRING_ARRAY = 16; - static readonly COMMAND_VOID_OUT_MAP_STRING_INT = 17; - static readonly COMMAND_VOID_OUT_STRING_ARRAY = 18; - static readonly COMMAND_VOID_IN_OUT_MAP_STRING_INT = 19; - static readonly COMMAND_VOID_IN_OUT_STRING_ARRAY = 20; - static readonly COMMAND_VOID_IN_INT = 21; - static readonly COMMAND_VOID_IN_STRING = 22; - static readonly COMMAND_VOID_OUT_INT = 23; - static readonly COMMAND_VOID_OUT_STRING = 24; - static readonly COMMAND_VOID_IN_OUT_INT = 25; - static readonly COMMAND_VOID_IN_OUT_STRING = 26; - static readonly COMMAND_VOID_PARAMETER_TYPE_BOOLEAN = 27; - static readonly COMMAND_VOID_PARAMETER_TYPE_BYTE = 28; - static readonly COMMAND_VOID_PARAMETER_TYPE_SHORT = 29; - static readonly COMMAND_VOID_PARAMETER_TYPE_INT = 30; - static readonly COMMAND_VOID_PARAMETER_TYPE_LONG = 31; - static readonly COMMAND_VOID_PARAMETER_TYPE_FLOAT = 32; - static readonly COMMAND_VOID_PARAMETER_TYPE_DOUBLE = 33; - static readonly COMMAND_VOID_PARAMETER_TYPE_STRING = 34; - static readonly COMMAND_VOID_PARAMETER_TYPE_SEQUENCEABLE = 35; - static readonly COMMAND_VOID_PARAMETER_TYPE_INTERFACE = 36; - static readonly COMMAND_VOID_PARAMETER_TYPE_MAP_STRING_STRING = 37; - static readonly COMMAND_VOID_PARAMETER_TYPE_DOUBLE_ARRAY = 38; - static readonly COMMAND_VOID_ORDER_OUT_IN = 39; - static readonly COMMAND_VOID_ORDER_IN_OUT_IN = 40; - static readonly COMMAND_VOID_ORDER_OUT_IN_OUT = 41; - static readonly COMMAND_VOID_ORDER_IN_IN_OUT_OUT = 42; -} - diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts deleted file mode 100644 index 77d68a9d2..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts +++ /dev/null @@ -1,65 +0,0 @@ -/* -* 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 ServiceExtension from '@ohos.application.ServiceExtensionAbility' -import Want from '@ohos.application.Want'; -import ZidlTestServiceStubOneway from './zidlToolOneWay/interface_attribute_declaratoin_oneway_stub'; -import {voidVoidFirstCallback} from './zidlToolOneWay/i_interface_attribute_declaratoin_oneway' -import {voidVoidSecondCallback} from './zidlToolOneWay/i_interface_attribute_declaratoin_oneway' -import {voidVoidThirdCallback} from './zidlToolOneWay/i_interface_attribute_declaratoin_oneway' - -const SUCCESS = 0; -const FAIL = 1; - -class ZidlTestImpOneway extends ZidlTestServiceStubOneway { - voidVoidFirst(callback: voidVoidFirstCallback) { - console.log("ZidlTest Server ACTS_Zidl_Js2JsMulti_0100_1 called"); - callback(SUCCESS); - } - - voidVoidSecond(callback: voidVoidSecondCallback) { - console.log("ZidlTest Server ACTS_Zidl_Js2JsMulti_0100_2 called"); - callback(SUCCESS); - } - - voidVoidThird(callback: voidVoidThirdCallback) { - console.log("ZidlTest Server ACTS_Zidl_Js2JsMulti_0100_3 called"); - callback(SUCCESS); - } -} - -export default class ServiceAbility2 extends ServiceExtension { - onCreate(want: Want) { - globalThis.abilityWant = want; - console.log('ZidlService ServiceAbility2 onCreate, want: ' + want.abilityName); - } - - onRequest(want, startId) { - console.log('ZidlService ServiceAbility2 onRequest, want: ' + want.abilityName - + ', startId: ' + startId); - } - - onConnect(want) { - console.log('ZidlService ServiceAbility2 onConnect, want:' + want.abilityName); - return new ZidlTestImpOneway('connect'); - } - - onDisconnect(want) { - console.log('ZidlService ServiceAbility2 onDisconnect, want:' + want.abilityName); - } - - onDestroy() { - console.log('AZidlService ServiceAbility2 onDestroy'); - } -}; diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/service.ts b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/service.ts deleted file mode 100644 index b49731a41..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/service.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* -* 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. -*/ -export default { - onStart() { - console.info('ServiceAbility onStart'); - }, - onStop() { - console.info('ServiceAbility onStop'); - }, - onCommand(want, startId) { - console.info('ServiceAbility onCommand'); - } -}; \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/i_interface_attribute_declaratoin_oneway.ts b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/i_interface_attribute_declaratoin_oneway.ts deleted file mode 100644 index a17db0f5d..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/i_interface_attribute_declaratoin_oneway.ts +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2021 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. - */ - - -export default interface IInterfaceAttributeDeclaratoinOneway { - voidVoidFirst(callback: voidVoidFirstCallback): void; - voidVoidSecond(callback: voidVoidSecondCallback): void; - voidVoidThird(callback: voidVoidThirdCallback): void; -} -export type voidVoidFirstCallback = (errCode: number) => void; -export type voidVoidSecondCallback = (errCode: number) => void; -export type voidVoidThirdCallback = (errCode: number) => void; - diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/interface_attribute_declaratoin_oneway_stub.ts b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/interface_attribute_declaratoin_oneway_stub.ts deleted file mode 100644 index 016f352bd..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/ServiceAbility2/zidlToolOneWay/interface_attribute_declaratoin_oneway_stub.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2021 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 {voidVoidFirstCallback} from "./i_interface_attribute_declaratoin_oneway"; -import {voidVoidSecondCallback} from "./i_interface_attribute_declaratoin_oneway"; -import {voidVoidThirdCallback} from "./i_interface_attribute_declaratoin_oneway"; -import IInterfaceAttributeDeclaratoinOneway from "./i_interface_attribute_declaratoin_oneway"; -import rpc from "@ohos.rpc"; - -export default class InterfaceAttributeDeclaratoinOnewayStub extends rpc.RemoteObject implements IInterfaceAttributeDeclaratoinOneway { - constructor(des: string) { - super(des); - } - - onRemoteRequest(code: number, data, reply, option): boolean { - console.log("onRemoteRequest called, code = " + code); - switch(code) { - case InterfaceAttributeDeclaratoinOnewayStub.COMMAND_VOID_VOID_FIRST: { - this.voidVoidFirst((errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case InterfaceAttributeDeclaratoinOnewayStub.COMMAND_VOID_VOID_SECOND: { - this.voidVoidSecond((errCode) => { - reply.writeInt(errCode); - }); - return true; - } - case InterfaceAttributeDeclaratoinOnewayStub.COMMAND_VOID_VOID_THIRD: { - this.voidVoidThird((errCode) => { - reply.writeInt(errCode); - }); - return true; - } - default: { - console.log("invalid request code" + code); - break; - } - } - return false; - } - - voidVoidFirst(callback: voidVoidFirstCallback): void{} - voidVoidSecond(callback: voidVoidSecondCallback): void{} - voidVoidThird(callback: voidVoidThirdCallback): void{} - - static readonly COMMAND_VOID_VOID_FIRST = 1; - static readonly COMMAND_VOID_VOID_SECOND = 2; - static readonly COMMAND_VOID_VOID_THIRD = 3; -} - diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/pages/index/index.ets b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/pages/index/index.ets deleted file mode 100644 index 16e1531e4..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/pages/index/index.ets +++ /dev/null @@ -1,37 +0,0 @@ -/* -* 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 file from '@system.file'; - -@Entry -@Component -struct Index { - - aboutToAppear() { - console.info("start run testcase!!!!") - } - - build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text('pmsystemappa') - .fontSize(50) - .fontWeight(FontWeight.Bold) - .margin({ - top: 20 - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/pages/second/second.ets b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/pages/second/second.ets deleted file mode 100644 index 2c768edb9..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/ets/pages/second/second.ets +++ /dev/null @@ -1,43 +0,0 @@ -/* -* 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 router from '@system.router'; - -@Entry -@Component -struct Second { - private content: string = "Second Page" - - build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text(`${this.content}`) - .fontSize(50) - .fontWeight(FontWeight.Bold) - Button() { - Text('back to index') - .fontSize(20) - .fontWeight(FontWeight.Bold) - }.type(ButtonType.Capsule) - .margin({ - top: 20 - }) - .backgroundColor('#0D9FFB') - .onClick(() => { - router.back() - }) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/module.json b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/module.json deleted file mode 100644 index e2a079837..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/module.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "default", - "tablet" - ], - "deliveryWithInstall": true, - "installationFree": false, - "uiSyntax": "ets", - "pages": "$profile:main_pages", - "abilities": [ - { - "name": "com.example.zidlservice.MainAbility", - "srcEntrance": "./ets/MainAbility/MainAbility.ts", - "description": "$string:phone_entry_main", - "icon": "$media:icon", - "label": "$string:entry_label", - "visible": true, - "orientation": "portrait", - "skills": [ - { - "actions": [ - "action.system.home" - ], - "entities": [ - "entity.system.home" - ] - } - ] - } - ], - "extensionAbilities": [ - { - "srcEntrance": "./ets/ServiceAbility/ServiceAbility.ts", - "name": "com.example.zidlservice.ServiceAbility", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - }, - { - "srcEntrance": "./ets/ServiceAbility2/ServiceAbility2.ts", - "name": "com.example.zidlservice.ServiceAbility2", - "icon": "$media:icon", - "srcLanguage": "ets", - "description": "$string:phone_entry_main", - "type": "service", - "visible": true - } - ], - "requestPermissions": [ - { - "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", - "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" - }, - { - "name":"ohos.permission.GET_BUNDLE_INFO", - "reason":"need use ohos.permission.GET_BUNDLE_INFO" - }, - { - "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", - "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" - }, - { - "name":"ohos.permission.REMOVE_CACHE_FILES", - "reason":"need use ohos.permission.REMOVE_CACHE_FILES" - }, - { - "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", - "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" - }, - { - "name":"ohos.permission.INSTALL_BUNDLE", - "reason":"need use ohos.permission.INSTALL_BUNDLE" - }, - { - "name":"ohos.permission.MANAGE_MISSIONS", - "reason":"need use ohos.permission.MANAGE_MISSIONS" - }, - { - "name":"ohos.permission.GET_RUNNING_INFO", - "reason":"need use ohos.permission.GET_RUNNING_INFO" - }, - { - "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", - "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" - }, - { - "name":"ohos.permission.CLEAN_APPLICATION_DATA", - "reason":"need use ohos.permission.CLEAN_APPLICATION_DATA" - } - ] - } -} diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/resources/base/element/string.json deleted file mode 100644 index d75325f3c..000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/resources/base/element/string.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "string": [ - { - "name": "phone_entry_dsc", - "value": "i am an entry for phone" - }, - { - "name": "phone_entry_main", - "value": "the phone entry ability" - }, - { - "name": "entry_label", - "value": "ActsContextTest" - }, - { - "name": "form_description", - "value": "my form" - }, - { - "name": "serviceability_description", - "value": "my whether" - }, - { - "name": "description_application", - "value": "demo for test" - }, - { - "name": "app_name", - "value": "Demo" - } - ] -} \ No newline at end of file diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/zidltest/actsamszidlservice/entry/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6790 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 -- GitLab