diff --git a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAbilityInfoJsunit.test.ets b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAbilityInfoJsunit.test.ets index 8524cc72d011647fb5474475e51f362797d7b779..a19602275ba7929208eb82dc9d599402e54f91af 100644 --- a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAbilityInfoJsunit.test.ets +++ b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAbilityInfoJsunit.test.ets @@ -210,7 +210,7 @@ export default function getHapModuleInfoJsunit() { expect(data.descriptionId > 0).assertTrue(); expect(data.iconId > 0).assertTrue(); expect(data.moduleName).assertEqual("entry"); - expect(data.process).assertEqual(""); + expect(data.process).assertEqual("com.ohos.acecollaboration"); expect(data.targetAbility).assertEqual(""); expect(data.backgroundModes).assertEqual(0); expect(data.isVisible).assertEqual(true); @@ -283,13 +283,13 @@ export default function getHapModuleInfoJsunit() { expect(typeof (info.entryDir)).assertEqual("string"); expect(info.name).assertEqual("com.ohos.acecollaboration"); - expect(info.description).assertEqual("$string:mainability_description"); - expect(info.descriptionId > 0).assertTrue(); + expect(info.description).assertEqual(""); + expect(info.descriptionId).assertEqual(0); expect(info.systemApp).assertEqual(true); expect(info.enabled).assertEqual(true); expect(info.label).assertEqual("$string:entry_MainAbility"); expect(info.icon).assertEqual("$media:icon"); - expect(info.process).assertEqual(""); + expect(info.process).assertEqual("com.ohos.acecollaboration"); expect(info.supportedModes).assertEqual(0); expect(info.entryDir).assertEqual("/data/app/el1/bundle/public/" + "com.ohos.acecollaboration/com.ohos.acecollaboration"); @@ -330,4 +330,4 @@ export default function getHapModuleInfoJsunit() { } }) -} \ No newline at end of file +} diff --git a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getHapModuleInfoJsunit.test.ets b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getHapModuleInfoJsunit.test.ets index b84d2beaf39ea8ab59266f1b2611492208b462a1..3b2e6e7c047251bffaed8ca23d1a1b2c0965870e 100644 --- a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getHapModuleInfoJsunit.test.ets +++ b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getHapModuleInfoJsunit.test.ets @@ -211,7 +211,7 @@ export default function getHapModuleInfoJsunit() { expect(data.description).assertEqual("$string:TestAbility_desc"); expect(data.icon).assertEqual("$media:icon"); expect(data.moduleName).assertEqual("entry"); - expect(data.process).assertEqual(""); + expect(data.process).assertEqual("com.ohos.acecollaboration"); expect(data.targetAbility).assertEqual(""); expect(data.backgroundModes).assertEqual(0); expect(data.isVisible).assertEqual(true); diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts index d95cb378ecd52cdc8d75ed6aea3df800c04f851e..e59a8552d67443ce8bf1a8b05f82ffa7c38dd358 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts @@ -13,7 +13,7 @@ * limitations under the License. */ import rpc from "@ohos.rpc"; -import particleAbility from '@ohos.ability.particleability' +import particleAbility from '@ohos.ability.particleAbility' import featureAbility from '@ohos.ability.featureAbility' import commonEvent from '@ohos.commonEvent' var serversecond_bundleName = "com.amsst.stserviceabilityserversecond"; diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts index 37400d20917cc2a91452680a541c0328ef8c97bf..fde7bee833d25cafa64044e7775f472338b4f7d3 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts @@ -13,7 +13,7 @@ * limitations under the License. */ import rpc from "@ohos.rpc"; -import particleAbility from '@ohos.ability.particleability' +import particleAbility from '@ohos.ability.particleAbility' import featureAbility from '@ohos.ability.featureAbility' import commonEvent from '@ohos.commonEvent' var server_bundleName = "com.amsst.stserviceabilityserver"; 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 ac69de9d75e0483c9d396bd8c06ecc7e6996bb4c..0000000000000000000000000000000000000000 --- 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 be09cccde1bc7369ef47a5cd45d2b06884c88602..0000000000000000000000000000000000000000 --- 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 Binary files a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/AppScope/resources/base/media/app_icon.png and /dev/null differ diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/BUILD.gn deleted file mode 100644 index 15d4b2e77dfb614049f28e46bc4e5b28c4a1baf1..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/BUILD.gn +++ /dev/null @@ -1,41 +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("ActsAmsUsersExtensionSystemTest") { - hap_profile = "entry/src/main/module.json" - js_build_mode = "debug" - deps = [ - ":actsamsusersextensionsystemtest_js_assets", - ":actsamsusersextensionsystemtest_resources", - ] - ets2abc = true - certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAmsUsersExtensionSystemTest" -} - -ohos_app_scope("actsamsusersextensionsystemtest_app_profile") { - app_profile = "AppScope/app.json" - sources = [ "AppScope/resources" ] -} - -ohos_js_assets("actsamsusersextensionsystemtest_js_assets") { - source_dir = "entry/src/main/ets" -} - -ohos_resources("actsamsusersextensionsystemtest_resources") { - sources = [ "entry/src/main/resources" ] - deps = [ ":actsamsusersextensionsystemtest_app_profile" ] - hap_profile = "entry/src/main/module.json" -} diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/Test.json b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/Test.json deleted file mode 100644 index 4517a84f854cca81e865ac735997b12e3439d526..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/Test.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "300000", - "package": "com.acts.actsinterfacemultiusersextensiontest", - "shell-timeout": "300000" - }, - "kits": [ - { - "type": "ShellKit", - "run-command": [ - "acm create -n user101 -t normal", - "acm switch -i 101" - ] - }, - { - "test-file-name": [ - "ActsAmsUsersExtensionSystemTest.hap", - "ActsAmsUsersApi7AppA.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/Application/AbilityStage.ts deleted file mode 100644 index 5e2915fe4fc033cd5c9bd579dc08fe7369e51016..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/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.application.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/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/MainAbility/MainAbility.ts deleted file mode 100644 index 10dd9a1eaff7ad67843219facba7f8aea7b5a1a5..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/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.application.Ability' - -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, "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/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 69bd30f43010522ddda8fc48abb21c69d9936d2c..0000000000000000000000000000000000000000 --- 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.application.Ability' -import commonEvent from "@ohos.commonEvent" - -export default class MainAbility2 extends Ability { - - onCreate(want, launchParam) { - console.log("MainAbility2 onCreate"); - globalThis.abilityContext = this.context - } - - onDestroy() { - console.log("MainAbility2 onDestroy"); - } - - onWindowStageCreate(windowStage) { - console.log("MainAbility2 onWindowStageCreate"); - windowStage.setUIContent(this.context, "pages/index/second", null); - commonEvent.publish("ACTS_InterfaceMultiUsersExtension_CommonEvent", () => { - console.log("publish Publish ACTS_InterfaceMultiUsersExtension_CommonEvent callback") - globalThis.abilityContext.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 e154f799ab6c4946ecae578febfd3e63dc49d165..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts +++ /dev/null @@ -1,229 +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)); - }) - 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("====>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 - },() => { - 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' - },() => { - 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' - },() => { - 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' - },() => { - 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' - },() => { - console.debug("====>startAbility end====>" ); - }) - var myStub10 = new Stub("com.acts.actsinterfacemultiusersextensiontest.MainAbility"); - console.log('ThirdAbility onConnect before return:') - return myStub10; - break; - default: - break; - } - } - - 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 9d589e3d095c8c8899b9f412478a188b0bb20651..0000000000000000000000000000000000000000 --- 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/pages/index/index.ets b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/pages/index/index.ets deleted file mode 100644 index fd39208788d8fdb66d3c7fbff8afefb2763dda90..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/pages/index/index.ets +++ /dev/null @@ -1,50 +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 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) - console.info("subscribeEvent run !!!!") - const configService = core.getDefaultService('config') - globalThis.abilityWant.parameters['timeout'] = 10000 - console.info('parameters---->' + JSON.stringify(globalThis.abilityWant.parameters)) - configService.setConfig(globalThis.abilityWant.parameters) - testsuite(globalThis.abilityContext) - core.execute() - } - build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text('MainAbility') - .fontSize(50) - .fontWeight(FontWeight.Bold) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/pages/second/second.ets b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/pages/second/second.ets deleted file mode 100644 index f9009a3e8567d1f4557ebc11dded54c7e27c0b0d..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/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/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 2bb0df57e996dbcb344945d19e75b84d5ed6b2a4..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/ets/test/Ability.test.ets +++ /dev/null @@ -1,974 +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 "deccjsunit/index" -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(abilityContext) { - console.debug("====>in function abilityTest====>"); - describe('ActsInterfaceMultiUsersExtensionTest', function () { - afterAll(function() { - osAccountManager = osaccount.getAccountManager(); - console.debug("====>get AccountManager finish===="); - osAccountManager.activateOsAccount(100, (err)=>{ - console.debug("====>activateOsAccount localId: 100 err:" + JSON.stringify(err)); - osAccountManager.removeOsAccount(101, (err)=>{ - console.debug("====>remove localId: 101" + " err:" + JSON.stringify(err)); - }) - }) - }) - 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 - } - abilityContext.disconnectAbility(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 abilityContext.connectAbility( - { - 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); - abilityContext.disconnectAbility(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 abilityContext.connectAbility( - { - 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 - } - abilityContext.disconnectAbility(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 abilityContext.connectAbility( - { - 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); - abilityContext.disconnectAbility(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 abilityContext.connectAbility( - { - 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 - } - abilityContext.disconnectAbility(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 abilityContext.connectAbility( - { - 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); - abilityContext.disconnectAbility(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 abilityContext.connectAbility( - { - 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 - } - abilityContext.disconnectAbility(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 abilityContext.connectAbility( - { - 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); - abilityContext.disconnectAbility(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 abilityContext.connectAbility( - { - 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 - } - abilityContext.disconnectAbility(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 abilityContext.connectAbility( - { - 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 - } - abilityContext.disconnectAbility(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 abilityContext.connectAbility( - { - 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 - } - abilityContext.disconnectAbility(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 abilityContext.connectAbility( - { - 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); - abilityContext.disconnectAbility(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 abilityContext.connectAbility( - { - 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 - } - abilityContext.disconnectAbility(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 abilityContext.connectAbility( - { - 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); - abilityContext.disconnectAbility(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 abilityContext.connectAbility( - { - 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 f4e1c2a61d343de3599bfc16768af46c3df792b0..0000000000000000000000000000000000000000 --- 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(context) { - console.debug("====>in list.test====>"); - abilityTest(context) -} \ 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 44fb329d102294cbc0c065ed70a99d2a454bb082..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/module.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "phone" - ], - "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" - } - ] - } -} 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 d75325f3cf0a50c1dfe4dbc5162c8737276c3dd9..0000000000000000000000000000000000000000 --- 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 Binary files a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/entry/src/main/resources/base/profile/main_pages.json deleted file mode 100644 index 6898b31d2085f478ee1ed9d933a5910cbf901d92..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/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/actsusers/ActsAmsUsersExtensionSystemTest/signature/openharmony_sx.p7b b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/signature/openharmony_sx.p7b deleted file mode 100644 index cc53179a48f88f20acc379c138a001e9a15838f6..0000000000000000000000000000000000000000 Binary files a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/signature/openharmony_sx.p7b and /dev/null differ diff --git a/ability/ability_runtime/actsusers/BUILD.gn b/ability/ability_runtime/actsusers/BUILD.gn index 88ebe65f3a549074bc35da6a9e0a1b6557f99a50..09d4ac72b697d9f8ee93da7d1f1d7ce0a5bb5b6a 100644 --- a/ability/ability_runtime/actsusers/BUILD.gn +++ b/ability/ability_runtime/actsusers/BUILD.gn @@ -18,12 +18,10 @@ group("actsusers") { if (is_standard_system) { deps = [ "ActsAmsUsersApi7AppA:ActsAmsUsersApi7AppA", - "ActsAmsUsersExtensionSystemTest:ActsAmsUsersExtensionSystemTest", "ActsAmsUsersKillProcessAppA:ActsAmsUsersKillProcessAppA", "ActsAmsUsersKillProcessAppB:ActsAmsUsersKillProcessAppB", "ActsAmsUsersKillProcessAppC:ActsAmsUsersKillProcessAppC", "ActsAmsUsersSystemTest:ActsAmsUsersSystemTest", - "actsconnectabilitysystemabilitytest:ActsConnectAbilitySystemAbilityTest", "actsextensionconnectabilitytest:ActsExtensionConnectAbilityTest", "actsserviceabilityrelytest:actsServiceAbilityRelyHap", ] 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 6ff764e5d925141247e1b2aeba1f4acfd38467fb..0000000000000000000000000000000000000000 --- 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 be09cccde1bc7369ef47a5cd45d2b06884c88602..0000000000000000000000000000000000000000 --- 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 Binary files a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/AppScope/resources/base/media/app_icon.png and /dev/null differ diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/BUILD.gn b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/BUILD.gn deleted file mode 100644 index 7b34a3e395e9737e939c409672237dd8e21db872..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/BUILD.gn +++ /dev/null @@ -1,41 +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("ActsConnectAbilitySystemAbilityTest") { - hap_profile = "entry/src/main/module.json" - js_build_mode = "debug" - deps = [ - ":actsconnectabilitysystemabilitytest_js_assets", - ":actsconnectabilitysystemabilitytest_resources", - ] - ets2abc = true - certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsConnectAbilitySystemAbilityTest" -} - -ohos_app_scope("actsconnectabilitysystemabilitytest_app_profile") { - app_profile = "AppScope/app.json" - sources = [ "AppScope/resources" ] -} - -ohos_js_assets("actsconnectabilitysystemabilitytest_js_assets") { - source_dir = "entry/src/main/ets" -} - -ohos_resources("actsconnectabilitysystemabilitytest_resources") { - sources = [ "entry/src/main/resources" ] - deps = [ ":actsconnectabilitysystemabilitytest_app_profile" ] - hap_profile = "entry/src/main/module.json" -} diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/Test.json b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/Test.json deleted file mode 100644 index 9af58d08c9fc540c0af0f7a3b97dfca6cabe4ba6..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/Test.json +++ /dev/null @@ -1,31 +0,0 @@ - -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "120000", - "package": "com.example.actsconnectabilitysystemabilitytest", - "shell-timeout": "60000" - }, - "kits": [ - { - "type": "ShellKit", - "run-command": [ - "acm create -n 101 -t normal", - "acm switch -i 101" - ], - "teardown-command":[ - "acm delete -i 101" - ] - }, - { - "test-file-name": [ - "ActsConnectAbilitySystemAbilityTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - - ] -} - diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/Application/AbilityStage.ts deleted file mode 100644 index 98eb012db14b28a1f92522e305b9d4538e496dd3..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/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.application.AbilityStage" - -export default class MyAbilityStage extends AbilityStage { - onCreate() { - console.log("MyAbilityStage onCreate") - globalThis.stageOnCreateRun = 1; - globalThis.stageContext = this.context; - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts deleted file mode 100644 index f1ff325c560d0a7bcd46ca7ec852ddebfd7fb86e..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/MainAbility/MainAbility.ts +++ /dev/null @@ -1,42 +0,0 @@ -import Ability from '@ohos.application.Ability' -// import commonEvent from '@ohos.commonEvent' - -export default class MainAbility extends Ability { - - onCreate(want, launchParam) { - // Ability is creating, initialize resources for this ability - console.log("AbilityMultiInstanceTest onCreate") - globalThis.abilityWant = want; - } - - onDestroy() { - // Ability is destroying, release resources for this ability - console.log("AbilityMultiInstanceTest onDestroy") - } - - onWindowStageCreate(windowStage) { - // Main window is created, set main page for this ability - console.log("AbilityMultiInstanceTest onWindowStageCreate") - globalThis.abilityContext = this.context - windowStage.setUIContent(this.context, "pages/index/index", null) - } - - - - onWindowStageDestroy() { - // Main window is destroyed, release UI related resources - console.log("AbilityMultiInstanceTest onWindowStageDestroy") - } - - - onForeground() { - // Ability has brought to foreground - console.log("AbilityMultiInstanceTest onForeground") - } - - onBackground() { - // Ability has back to background - console.log("AbilityMultiInstanceTest onBackground") - } - -}; 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 8fecdd4113bf546cbec432e67c90078f297b88bd..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts +++ /dev/null @@ -1,256 +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 Want from '@ohos.application.Want'; -import rpc from '@ohos.rpc'; -import ServiceExtensionAbility from '@ohos.application.ServiceExtensionAbility' - -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========"); -} - -class Stub extends rpc.RemoteObject { - constructor(des) { - super(des); - } - onRemoteRequest(code, data, reply, option) { - reply.writeNoException(); - reply.writeString("success"); - return true; - } -} - -function onConnectCallback(element) { - console.log('ACTS_ConnectAbility_0100 ConnectAbility onConnect element.bundleName : ' + element.bundleName) - console.log('ACTS_ConnectAbility_0100 ConnectAbility onConnect element.abilityName : ' + element.abilityName) -} - -function onDisconnectCallback1(element) { - console.log('ACTS_ConnectAbility_0100 ConnectAbility onDisconnect element.bundleName : ' + element.bundleName) - console.log('ACTS_ConnectAbility_0100 ConnectAbility onDisconnect element.abilityName : ' + element.abilityName) -} -function onDisconnectCallback2(element) { - console.log('ACTS_ConnectAbility_0100 ConnectAbility onDisconnect element.bundleName : ' + element.bundleName) - console.log('ACTS_ConnectAbility_0100 ConnectAbility onDisconnect element.abilityName : ' + element.abilityName) -} -function onDisconnectCallback3(element) { - console.log('ACTS_ConnectAbility_0100 ConnectAbility onDisconnect element.bundleName : ' + element.bundleName) - console.log('ACTS_ConnectAbility_0100 ConnectAbility onDisconnect element.abilityName : ' + element.abilityName) -} -function onDisconnectCallback4(element) { - console.log('ACTS_ConnectAbility_0100 ConnectAbility onDisconnect element.bundleName : ' + element.bundleName) - console.log('ACTS_ConnectAbility_0100 ConnectAbility onDisconnect element.abilityName : ' + element.abilityName) -} -function onDisconnectCallback5(element) { - console.log('ACTS_ConnectAbility_0100 ConnectAbility onDisconnect element.bundleName : ' + element.bundleName) - console.log('ACTS_ConnectAbility_0100 ConnectAbility onDisconnect element.abilityName : ' + element.abilityName) -} -function onDisconnectCallback6(element) { - console.log('ACTS_ConnectAbility_0100 ConnectAbility onDisconnect element.bundleName : ' + element.bundleName) - console.log('ACTS_ConnectAbility_0100 ConnectAbility onDisconnect element.abilityName : ' + element.abilityName) -} -function onFailedCallback(code) { - console.log('ACTS_ConnectAbility_0100 ConnectAbility onFailed errCode : ' + code) -} - - -export default class ServiceAbility extends ServiceExtensionAbility { - 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: onDisconnectCallback1, - onFailed: onFailedCallback, - }, - ); - var myStub4 = new Stub("com.example.actsconnectabilitysystemabilitytest.MainAbility"); - return myStub4; - }; - if (want.action == "Eight") { - extensionContext.connectAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility3", - }, - { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback6, - onFailed: onFailedCallback, - }, - ); - var myStub1 = new Stub("com.example.actsconnectabilitysystemabilitytest.MainAbility"); - return myStub1; - }; - if (want.action == "Nine") { - console.log('connectAbility 111'); - let num = extensionContext.connectAbility( - { - bundleName: 'com.example.actsconnectabilitysystemabilitytest', - abilityName: 'com.example.actsconnectabilitysystemabilitytest.ServiceAbility2' - }, - { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback2, - onFailed: onFailedCallback, - },) - setTimeout(()=>{ - extensionContext.disconnectAbility(num).then(()=>{ - console.log('in disconnectAbility'); - }) - },1000) - var myStub2 = new Stub("com.example.actsconnectabilitysystemabilitytest.MainAbility"); - return myStub2; - - }; - if (want.action == "Ten") { - console.log('connectAbility 222'); - let num = extensionContext.connectAbility( - { - bundleName: 'com.example.actsconnectabilitysystemabilitytest', - abilityName: 'com.example.actsconnectabilitysystemabilitytest.ServiceAbility2' - }, - { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback3, - onFailed: onFailedCallback, - },) - setTimeout(()=>{ - extensionContext.disconnectAbility(num).then(()=>{ - console.log('in disconnectAbility2'); - }) - },1000) - var myStub3 = new Stub("com.example.actsconnectabilitysystemabilitytest.MainAbility"); - return myStub3; - - }; - 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: onDisconnectCallback4, - onFailed: onFailedCallback, - },) - setTimeout(()=>{ - extensionContext.disconnectAbility(2222).then(()=>{ - console.log('in disconnectAbility3'); - }) - },1000) - var myStub5 = new Stub("com.example.actsconnectabilitysystemabilitytest.MainAbility"); - return myStub5; - - }; - 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: onDisconnectCallback5, - onFailed: onFailedCallback, - },) - setTimeout(()=>{ - extensionContext.disconnectAbility(2222).then(()=>{ - console.log('in disconnectAbility4'); - }) - },1000) - var myStub6 = new Stub("com.example.actsconnectabilitysystemabilitytest.MainAbility"); - return myStub6; - - }; - } - - 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 b49731a414958a281c2f0c4eab0e7fb408eb2c2f..0000000000000000000000000000000000000000 --- 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 8ebb5e216cd8deddbdaee6c0312790c587da09cd..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/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 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) { - console.log('ServiceAbility2 onCreate'); - globalThis.abilityWant = want; - } - - onDestory(){ - console.log('ServiceAbility2 onDestory'); - } - - onRequest(want,startId) { - console.log('ServiceAbility2 onRequest'); - } - - onConnect(want: 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 340a610cb718c70c98add0b5d052bb4589185174..0000000000000000000000000000000000000000 --- 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/pages/index/index.ets b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/pages/index/index.ets deleted file mode 100644 index c5de5b34c1ed7e59bd2e0a1505c1d26a173947f9..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/pages/index/index.ets +++ /dev/null @@ -1,28 +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. - */ - -@Entry -@Component -struct MyComponent { - build() { - Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text('Hello World1111111') - .fontSize(50) - .fontWeight(FontWeight.Bold) - } - .width('100%') - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/pages/second/second.ets b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/pages/second/second.ets deleted file mode 100644 index 2c768edb999b1b54fef3268922817734b1f1c954..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/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/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 f5923665570101769b9a6aff451f7c50cc3f6e52..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/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(context) { - - abilityTest(context) -} \ 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 5090612999c8d0cd7eb37205f3d3978596a2b075..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/ets/test/manyusersabilitytest.test.ets +++ /dev/null @@ -1,814 +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 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(abilityContext) { - describe('ActssystemabilityTest', function () { - function onFailedCallBack(code) { - console.log('ACTS_ConnectAbility_0200 Connectability errcode:' + code); - } - - /* - * @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 "); - abilityContext.disconnectAbility( - 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) - abilityContext.disconnectAbility( - connId, - (error, data) => { - console.log('featureAbilityTest DisconnectAbility result errCode : ' + error.code + " data: " + data) - }); - } - - id = setTimeout(timeout, START_ABILITY_TIMEOUT); - console.debug("====>ACTS_ConnectAbility_0100 3 "); - connId = await abilityContext.connectAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "one", - }, - ); - 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 abilityContext.connectAbility( - { - 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====>"); - abilityContext.disconnectAbility( - 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) - abilityContext.disconnectAbility( - 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 abilityContext.connectAbility( - { - 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====>"); - abilityContext.disconnectAbility( - 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') - abilityContext.disconnectAbility( - 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 abilityContext.connectAbility( - { - 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"); - abilityContext.disconnectAbility( - 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) - abilityContext.disconnectAbility( - 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 abilityContext.connectAbility( - { - 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====>"); - abilityContext.disconnectAbility( - 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') - abilityContext.disconnectAbility( - 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 abilityContext.connectAbility( - { - 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: DisConnects a service ability - * @tc.desc: DisConnects 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 "); - abilityContext.disconnectAbility( - 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) - abilityContext.disconnectAbility( - 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 abilityContext.connectAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "Seven", - }, - ); - console.debug("====>ACTS_ExtensionConnectAbility_0100 4 "); - }) - - /* - * @tc.number: ACTS_ExtensionConnectAbility_0200 - * @tc.name: DisConnects a service ability - * @tc.desc: DisConnects 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 "); - abilityContext.disconnectAbility( - 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) - abilityContext.disconnectAbility( - 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 abilityContext.connectAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "Eight", - }, - ); - console.debug("====>ACTS_ExtensionConnectAbility_0200 4 "); - }) - - /* - * @tc.number: ACTS_ExtensionDisconnectAbility_0100 - * @tc.name: DisConnects a service ability - * @tc.desc: 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 "); - abilityContext.disconnectAbility( - 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) - abilityContext.disconnectAbility( - 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 abilityContext.connectAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "Nine", - }, - ); - console.debug("====>ACTS_ExtensionDisconnectAbility_0100 4 "); - }) - - /* - * @tc.number: ACTS_ExtensionDisconnectAbility_0200 - * @tc.name: DisConnects a service ability - * @tc.desc: 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 "); - abilityContext.disconnectAbility( - 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) - abilityContext.disconnectAbility( - 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 abilityContext.connectAbility( - { - bundleName: "com.example.actsconnectabilitysystemabilitytest", - abilityName: "com.example.actsconnectabilitysystemabilitytest.ServiceAbility", - action: "Ten", - }, - ); - console.debug("====>ACTS_ExtensionDisconnectAbility_0200 4 "); - }) - - /* - * @tc.number: ACTS_ExtensionDisconnectAbility_0300 - * @tc.name: DisConnects a service ability - * @tc.desc: 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 "); - abilityContext.disconnectAbility( - 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) - abilityContext.disconnectAbility( - 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 abilityContext.connectAbility( - { - 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: DisConnects a service ability - * @tc.desc: 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 "); - abilityContext.disconnectAbility( - 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) - abilityContext.disconnectAbility( - 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 abilityContext.connectAbility( - { - 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 cf31417fde889f687cecc5ab74df3202b33a80a0..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/module.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "module": { - "name": "phone", - "type": "entry", - "srcEntrance": "./ets/Application/AbilityStage.ts", - "description": "$string:phone_entry_dsc", - "mainElement": "MainAbility", - "deviceTypes": [ - "phone" - ], - "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 d75325f3cf0a50c1dfe4dbc5162c8737276c3dd9..0000000000000000000000000000000000000000 --- 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 Binary files a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/entry/src/main/resources/base/profile/main_pages.json deleted file mode 100644 index 6898b31d2085f478ee1ed9d933a5910cbf901d92..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/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/actsusers/actsconnectabilitysystemabilitytest/signature/openharmony_sx.p7b b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/signature/openharmony_sx.p7b deleted file mode 100644 index cc53179a48f88f20acc379c138a001e9a15838f6..0000000000000000000000000000000000000000 Binary files a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/signature/openharmony_sx.p7b and /dev/null differ diff --git a/ability/ability_runtime/actsusers/actsserviceabilityrelytest/entry/src/main/ets/pages/index/index.ets b/ability/ability_runtime/actsusers/actsserviceabilityrelytest/entry/src/main/ets/pages/index/index.ets index 3decc40b0d4eb50669faaf4eae22ef13156b4a4e..69c07eb11c8e08a10c8377085e96916868439d9d 100644 --- a/ability/ability_runtime/actsusers/actsserviceabilityrelytest/entry/src/main/ets/pages/index/index.ets +++ b/ability/ability_runtime/actsusers/actsserviceabilityrelytest/entry/src/main/ets/pages/index/index.ets @@ -23,22 +23,6 @@ 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() { diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/test/Ability.test.ets index 687680f6768e14fa170ce670db9edc8217c3f3a4..8e331646182f3e82fe2e366436b1f7fff1771d92 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/test/Ability.test.ets @@ -28,7 +28,7 @@ const MAX_MISSION_NUM = 1024; function sleep(time) { return new Promise((resove, reject) => { setTimeout(() => { - resove(); + resove("time arrived"); }, time) }) } diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/ets/MainAbility/pages/index.ets index 4cdbaedb327bc51f3282ea81d8135eec31eaa9c3..54eeee8755a15da27ec0ddc4df67305983859383 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/ets/MainAbility/pages/index.ets @@ -75,7 +75,7 @@ struct Index { console.info("!!!====>formsystemhost deleteCallBack end ====>"); } - private aboutToAppear() { + aboutToAppear() { commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { console.info("====>formsystemhost Subscriber FormDelete data:====>", JSON.stringify(data)); this.subscriberDel = data; diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/ets/MainAbility/pages/index.ets index a53162bb5afe3bc80e9e4c834b7e38176ea06d1d..010c8e164b692d160c4511f2f113d55d43712b7d 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/ets/MainAbility/pages/index.ets @@ -70,7 +70,7 @@ struct Index { console.info("!!!====>formsystemhost deleteCallBack end ====>"); } - private aboutToAppear() { + aboutToAppear() { commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { console.info("====>formsystemhost Subscriber FormDelete data:====>", JSON.stringify(data)); this.subscriberDle = data; diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/pages/index.ets index 53e70af0509205329d499f84cf1d5211e84354ac..969c4c1bdade76fd48a6870ac3a622aefd99b4bf 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/pages/index.ets @@ -124,7 +124,7 @@ struct Index { private fill(value: number): string { return (value > 9 ? "" : "0") + value; } - private aboutToAppear() { + aboutToAppear() { commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { console.info("====>[FormComponent] Subscriber FormDelete data:====>", JSON.stringify(data)); this.subscriberDel = data; @@ -191,7 +191,7 @@ struct Index { console.log("[FormComponent.host] sendCastForm start"); setTimeout(() => { let commonEventPublishData = { - data: sendCastFormMsg, + data: this.sendCastFormMsg, parameters: { "formId" : "" } diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/entry/src/main/ets/MainAbility/pages/index.ets index 146fd62ef31f39bdd79e437c97176914165f048d..2668b47ef158158999edb38e16d6243cdbadd8d7 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostd/entry/src/main/ets/MainAbility/pages/index.ets @@ -83,7 +83,7 @@ struct Index { console.info("!!!====>formsystemhost deleteCallBack end ====>"); } - private aboutToAppear() { + aboutToAppear() { commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { console.info("====>formsystemhost Subscriber FormDelete data:====>", JSON.stringify(data)); this.subscriberDel = data; diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/entry/src/main/ets/MainAbility/pages/index.ets index 5ff6d96e86a21bd572fd04545d452305a89cbd92..98e1ed889caa21abd651ba0aa80ef309090258f8 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/entry/src/main/ets/MainAbility/pages/index.ets @@ -89,7 +89,7 @@ struct Index { console.info("!!!====>formsystemhost deleteCallBack end ====>"); } - private aboutToAppear() { + aboutToAppear() { commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { console.info("====>formsystemhost Subscriber FormDelete data:====>", JSON.stringify(data)); this.subscriberDel = data; diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/pages/index.ets index 4581aaedcbf7ba19ce0e7bec776b95e1f6044e1f..2b576e3c1c8fd2ac95832e110cf3e7a1b70c5860 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/pages/index.ets @@ -90,7 +90,7 @@ struct Index { console.info("!!!====>formsystemhost deleteCallBack end ====>"); } - private aboutToAppear() { + aboutToAppear() { commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { console.info("====>formsystemhost Subscriber FormDelete data:====>", JSON.stringify(data)); this.subscriberDel = data; diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/pages/index.ets index 29c50881b4fa14c77e09ceef9b06493392e8c034..e037471b283e4bfed89a387b6d3f24cdb9df772a 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/pages/index.ets @@ -78,7 +78,7 @@ struct Index { console.info("!!!====>[FormComponent.host] deleteCallBack end ====>"); } - private aboutToAppear() { + aboutToAppear() { commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { console.info("====>[FormComponent.host] Subscriber FormDelete data:====>", JSON.stringify(data)); this.subscriberDel = data; diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/ets/MainAbility/pages/index.ets index 5c438bcde4a36ce97884e5f9f39bd7c64ebc10b5..732bbe9e396cfb0b15ace9d91a050d0bf90c2cb3 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/ets/MainAbility/pages/index.ets @@ -70,7 +70,7 @@ struct Index { console.info("!!!====>formsystemhost deleteCallBack end ====>"); } - private aboutToAppear() { + aboutToAppear() { commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { console.info("====>formsystemhost Subscriber FormDelete data:====>", JSON.stringify(data)); this.subscriberDel = data; diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/ets/MainAbility/pages/index.ets index 0c610edc27fddeea49c9093b4b525a3146417225..f86495a3e4b1953adef5d3b64c2a9dfcbc5200e3 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/ets/MainAbility/pages/index.ets @@ -70,7 +70,7 @@ struct Index { console.info("!!!====>formsystemhostj deleteCallBack end ====>"); } - private aboutToAppear() { + aboutToAppear() { commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { console.info("====>formsystemhostj Subscriber FormDelete data:====>", JSON.stringify(data)); this.subscriberDel = data; diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/pages/index.ets index 92ebdbbfb93c3aa69c8b97584409bd22ccdbc2ea..c970518070b5892e9160114c7f6ea6a1cb588ea6 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/pages/index.ets @@ -87,7 +87,7 @@ struct Index { console.info(`${this.TAG} unSubscribeDeleteCallback`); } - private async aboutToAppear() { + async aboutToAppear() { const onDeleteEventSubscriber = await commonEvent.createSubscriber(this.subscriberFormDeleteEvent); const onTerminateEventSubscriber = await commonEvent.createSubscriber(this.subscriberFormTerminateEvent); commonEvent.subscribe(onDeleteEventSubscriber, async (err, data) => { diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/pages/index.ets index 3ffec1f6182deed7844ecacb92f446e0881ea180..c900acdf69687d0e5cbc835fc4c87757e23fbc1e 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/pages/index.ets @@ -54,7 +54,7 @@ struct Index { console.info(`${this.TAG} unSubscribeDeleteCallback====>`); } - private async aboutToAppear() { + async aboutToAppear() { const onDeleteEventSubscriber = await commonEvent.createSubscriber(this.subscriberFormDeleteEvent); commonEvent.subscribe(onDeleteEventSubscriber, async (err, data) => { console.info(`${this.TAG} deleteCallBack start:====> ${JSON.stringify(data)}`); diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/ets/MainAbility/pages/index.ets index 3b7da67abaf38532116e58733ad582cc60891306..d817ce5dff32550ae22b0dacc791a22af401b67a 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/ets/MainAbility/pages/index.ets @@ -153,7 +153,7 @@ struct Index { console.debug("====> [FormComponent] formsystemhostn optType unSubscribeCastFormCallback CallBack====>"); } - private aboutToAppear() { + aboutToAppear() { commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { console.info("====>[FormComponent] formsystemhostn Subscriber FormDelete data:====>", JSON.stringify(data)); this.subscriberDel = data; diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/pages/index.ets index 82197c8dcfe64fd2a8c42cb30422c070abb57782..891b96832546dc14795b7b3afe11d329f6c3ae7e 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/pages/index.ets @@ -52,7 +52,7 @@ struct Index { console.debug("====>formOnErrorEvent Publish CallBack ====>"); } - private aboutToAppear() { + aboutToAppear() { console.error('[FormComponent] getWant'); featureAbility.getWant() .then((want: any) => { diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/ets/MainAbility/pages/index.ets index 760a86f18f03597fb28588e0e4b3e31edb0dbc18..106620bdcd49785749d3bf5426131ff9f38aab33 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/ets/MainAbility/pages/index.ets @@ -152,7 +152,7 @@ struct Index { console.debug("====> [FormComponent] formsystemhosto optType unSubscribeCastFormCallback CallBack====>"); } - private aboutToAppear() { + aboutToAppear() { const TAG = "[FormComponent.hosto]"; commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { diff --git a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/ets/MainAbility/pages/index.ets index f9f267f07a4b71d176caa75bf7e79adddb92c1ef..e80f8668f82b88bb3689ebf3798e021c3e60ffef 100644 --- a/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/ets/MainAbility/pages/index.ets @@ -144,7 +144,7 @@ struct Index { console.info("!!!====> [FormComponent] formsystemhostp optType deleteCallBack end ====>"); } - private aboutToAppear() { + aboutToAppear() { commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { console.info("====>[FormComponent] formsystemhostp Subscriber FormDelete data:====>", JSON.stringify(data)); this.subscriberDel = data; diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/MainAbility/pages/index.ets index a56d6b68bd9528f0b746eb67f936020556a14bf8..c334e67901de6e83217003360bfa1a55b2686719 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/MainAbility/pages/index.ets @@ -15,13 +15,13 @@ import featureAbility from "@ohos.ability.featureAbility"; import formBindingData from "@ohos.application.formBindingData"; -import formManager from '@ohos.ability.formManager'; +import formManager from '@ohos.application.formProvider'; import commonEvent from '@ohos.commonEvent'; @Entry @Component struct Index { - @State formId: number = 0; + @State formId: string = "0"; @State opt : string = "updateForm"; @State formData: {[key: string]: any} = {temperature: "14c", "time": "12:00"}; @State nextTime: number = 5; @@ -36,12 +36,12 @@ struct Index { console.debug("====>formsystemhostc formOnDynamicRefreshEventk ====>"); } - private aboutToAppear() { + aboutToAppear() { console.log(`form supply B aboutToAppear start`); console.error('form supply B getWant'); featureAbility.getWant() .then((want: any) => { - this.formId = parseInt(want.parameters.formId); + this.formId = want.parameters.formId; this.opt = want.parameters.opt; if(want.parameters.formData) { this.formData = want.parameters.formData; @@ -64,9 +64,9 @@ struct Index { .then((data) => { console.info('form supply B updateForm result:' + data); let commonEventPublishData = { - data: data.toString(), + data: JSON.stringify(data), parameters: { - "formId" : this.formId.toString() + "formId" : this.formId } }; commonEvent.publish(this.formUpdateFormEvent, commonEventPublishData, this.publishUpdateFormCallBack); @@ -81,9 +81,9 @@ struct Index { .then((data) => { console.info('form supply B setNextRefreshTime result:' + data); let commonEventPublishData = { - data: data.toString(), + data: JSON.stringify(data), parameters: { - "formId" : this.formId.toString() + "formId" : this.formId } }; commonEvent.publish(this.formOnDynamicRefreshEvent, commonEventPublishData, this.formOnDynamicRefreshCallBack); diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/entry/src/main/ets/MainAbility/pages/index.ets index a56d6b68bd9528f0b746eb67f936020556a14bf8..c334e67901de6e83217003360bfa1a55b2686719 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationC/entry/src/main/ets/MainAbility/pages/index.ets @@ -15,13 +15,13 @@ import featureAbility from "@ohos.ability.featureAbility"; import formBindingData from "@ohos.application.formBindingData"; -import formManager from '@ohos.ability.formManager'; +import formManager from '@ohos.application.formProvider'; import commonEvent from '@ohos.commonEvent'; @Entry @Component struct Index { - @State formId: number = 0; + @State formId: string = "0"; @State opt : string = "updateForm"; @State formData: {[key: string]: any} = {temperature: "14c", "time": "12:00"}; @State nextTime: number = 5; @@ -36,12 +36,12 @@ struct Index { console.debug("====>formsystemhostc formOnDynamicRefreshEventk ====>"); } - private aboutToAppear() { + aboutToAppear() { console.log(`form supply B aboutToAppear start`); console.error('form supply B getWant'); featureAbility.getWant() .then((want: any) => { - this.formId = parseInt(want.parameters.formId); + this.formId = want.parameters.formId; this.opt = want.parameters.opt; if(want.parameters.formData) { this.formData = want.parameters.formData; @@ -64,9 +64,9 @@ struct Index { .then((data) => { console.info('form supply B updateForm result:' + data); let commonEventPublishData = { - data: data.toString(), + data: JSON.stringify(data), parameters: { - "formId" : this.formId.toString() + "formId" : this.formId } }; commonEvent.publish(this.formUpdateFormEvent, commonEventPublishData, this.publishUpdateFormCallBack); @@ -81,9 +81,9 @@ struct Index { .then((data) => { console.info('form supply B setNextRefreshTime result:' + data); let commonEventPublishData = { - data: data.toString(), + data: JSON.stringify(data), parameters: { - "formId" : this.formId.toString() + "formId" : this.formId } }; commonEvent.publish(this.formOnDynamicRefreshEvent, commonEventPublishData, this.formOnDynamicRefreshCallBack); diff --git a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/MainAbility/pages/index.ets index a56d6b68bd9528f0b746eb67f936020556a14bf8..c334e67901de6e83217003360bfa1a55b2686719 100644 --- a/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/MainAbility/pages/index.ets @@ -15,13 +15,13 @@ import featureAbility from "@ohos.ability.featureAbility"; import formBindingData from "@ohos.application.formBindingData"; -import formManager from '@ohos.ability.formManager'; +import formManager from '@ohos.application.formProvider'; import commonEvent from '@ohos.commonEvent'; @Entry @Component struct Index { - @State formId: number = 0; + @State formId: string = "0"; @State opt : string = "updateForm"; @State formData: {[key: string]: any} = {temperature: "14c", "time": "12:00"}; @State nextTime: number = 5; @@ -36,12 +36,12 @@ struct Index { console.debug("====>formsystemhostc formOnDynamicRefreshEventk ====>"); } - private aboutToAppear() { + aboutToAppear() { console.log(`form supply B aboutToAppear start`); console.error('form supply B getWant'); featureAbility.getWant() .then((want: any) => { - this.formId = parseInt(want.parameters.formId); + this.formId = want.parameters.formId; this.opt = want.parameters.opt; if(want.parameters.formData) { this.formData = want.parameters.formData; @@ -64,9 +64,9 @@ struct Index { .then((data) => { console.info('form supply B updateForm result:' + data); let commonEventPublishData = { - data: data.toString(), + data: JSON.stringify(data), parameters: { - "formId" : this.formId.toString() + "formId" : this.formId } }; commonEvent.publish(this.formUpdateFormEvent, commonEventPublishData, this.publishUpdateFormCallBack); @@ -81,9 +81,9 @@ struct Index { .then((data) => { console.info('form supply B setNextRefreshTime result:' + data); let commonEventPublishData = { - data: data.toString(), + data: JSON.stringify(data), parameters: { - "formId" : this.formId.toString() + "formId" : this.formId } }; commonEvent.publish(this.formOnDynamicRefreshEvent, commonEventPublishData, this.formOnDynamicRefreshCallBack); diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/test/FmsAcquireForm.test.ets b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/test/FmsAcquireForm.test.ets index 86f326f33e8dcd1bc0b0efacc0282aaa9a4da22d..cfd337ca1c1dd5a3eec304f568ef4c71f7781c62 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/test/FmsAcquireForm.test.ets +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/test/FmsAcquireForm.test.ets @@ -1541,27 +1541,8 @@ export default function test() { console.info(`FMS_acquireForm_2600 featureAbility.startAbility again end`); } - function onSupplyCallBack(_, data) { - if (data.parameters.kind == "onCastToNormal") { - console.info("====>FMS_acquireForm_2600 onSupplyCallBack====>" + JSON.stringify(data)); - commonEvent.unsubscribe(subscriberSupply, () => unsubscribeSupplyCallback("FMS_acquireForm_2600")); - formId2 = data.parameters.parameters; - - if (formId1 && formId2) { - expect(formId1).assertEqual(formId2); - let commonEventPublishData = { - data: formId1 - }; - commonEvent.publish(deleteForm_Event, commonEventPublishData, () => - publishCallback1("FMS_acquireForm_2600")); - done() - } - } - } - commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack); commonEvent.subscribe(subscriberCast, onCastCallBack); - commonEvent.subscribe(subscriberSupply, onSupplyCallBack); console.info(`FMS_acquireForm_2600 featureAbility.startAbility start`); await featureAbility.startAbility({ diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/entry/src/main/ets/MainAbility/test/FmsDeleteForm.test.ets b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/entry/src/main/ets/MainAbility/test/FmsDeleteForm.test.ets index 09f8642cc87b888eeef99a6b36795fc8a9e23b24..91077a27afcc0f5a485fe645b9d177006db056a9 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/entry/src/main/ets/MainAbility/test/FmsDeleteForm.test.ets +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/entry/src/main/ets/MainAbility/test/FmsDeleteForm.test.ets @@ -1134,7 +1134,7 @@ const changeTime = async (hour, min, second) => { console.info(`FMS_deleteForm changeTime s: ${s}`); try { - await systemTiem.setTime(s); + await systemTime.setTime(s); console.info(`FMS_deleteForm set time success: ${formatTime}`); } catch (error) { console.info(`FMS_deleteForm set time failure: ${error}`); diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets index 07139019e97f33bcf6b0198b7212806a5f8d393d..5110b70acf00e50af48b324741c917cd905e3efe 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets @@ -15,6 +15,11 @@ import formHost from '@ohos.application.formHost'; import { describe, expect, it } from 'deccjsunit/index'; +import FormInfo from '@ohos.application.formInfo'; + +function sleep(time) { + return new Promise((resolve)=>setTimeout(resolve,time)); +} export const getAllFormsInfoTest = (describeName, filterParameter) => { const ERR_OK_CODE = 0; @@ -23,48 +28,8 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { describe(`${describeName}`, () => { const callbackName = `FMS_getFormsInfo_0500 callback`; const promiseName = `FMS_getFormsInfo_0500 promise`; - - const expectDataB = { - bundleName: 'com.ohos.st.formsystemproviderb', - moduleName: 'form_module_b', - abilityName: 'com.ohos.st.formsystemproviderb.MainAbility', - name: 'FormB_Js001', - description: 'form_description_FormB_Js001', - descriptionId: 20, - type: 1, - jsComponentName: 'card_b', - colorMode: -1, - isDefault: 1, - updateEnabled: 1, - formVisibleNotify: 1, - formConfigAbility: 'abilityb', - updateDuration: 3, - scheduledUpdateTime: '10:30', - defaultDimension: 2, - supportDimensions: [1, 2], - metaData: { customizeData: [{ name: 'originWidgetNameB', value: 'valueB' }] }, - }; - - const expectDataC = { - bundleName: 'com.ohos.st.formsystemproviderc', - moduleName: 'form_module_c', - abilityName: 'com.ohos.st.formsystemproviderc.MainAbility', - name: 'FormC_Js001', - description: 'form_description_FormC_Js001', - descriptionId: 30, - type: 1, - jsComponentName: 'card_c', - colorMode: 1, - isDefault: 1, - updateEnabled: 1, - formVisibleNotify: 1, - formConfigAbility: 'abilityc', - updateDuration: 4, - scheduledUpdateTime: '15:30', - defaultDimension: 3, - supportDimensions: [3, 4], - metaData: { customizeData: [{ name: 'originWidgetNameC', value: 'valueC' }] }, - }; + var tempDataB = undefined; + var tempDataC = undefined; /** * @tc.name: getFormsInfo @@ -92,13 +57,17 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect(dataB.length).assertEqual(1); expect(dataC.length).assertEqual(1); - expect(JSON.stringify(dataB[0])).assertEqual(JSON.stringify(expectDataB)); - expect(JSON.stringify(dataC[0])).assertEqual(JSON.stringify(expectDataC)); + + tempDataB = dataB[0]; + tempDataC = dataC[0]; expect(error.code).assertEqual(ERR_OK_CODE); expect(error.message).assertEqual(ERR_OK); done(); console.log(`==========${callbackName} ${describeName} end==========`); }); + await sleep(2000) + checkDataB(tempDataB) + checkDataC(tempDataC) } catch (error) { console.log(`${callbackName} exception caught: ${JSON.stringify(error)})`); console.log(`${callbackName} should not reach here`); @@ -132,8 +101,9 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect(dataB.length).assertEqual(1); expect(dataC.length).assertEqual(1); - expect(JSON.stringify(dataB[0])).assertEqual(JSON.stringify(expectDataB)); - expect(JSON.stringify(dataC[0])).assertEqual(JSON.stringify(expectDataC)); + tempDataB = dataB[0]; + tempDataC = dataC[0]; + done(); console.log(`==========${promiseName} ${describeName} end==========`); } catch (error) { @@ -142,5 +112,49 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect().assertFail(); } }); + function checkDataB(formInfo){ + expect("com.ohos.st.formsystemproviderb").assertEqual(formInfo.bundleName) + expect("form_module_b").assertEqual(formInfo.moduleName) + expect("com.ohos.st.formsystemproviderb.MainAbility").assertEqual(formInfo.abilityName) + expect("FormB_Js001").assertEqual(formInfo.name) + expect("form_description_FormB_Js001").assertEqual(formInfo.description) + expect(FormInfo.FormType.JS).assertEqual(formInfo.type) + expect('card_b').assertEqual(formInfo.jsComponentName) + expect(FormInfo.ColorMode.MODE_AUTO).assertEqual(formInfo.colorMode) + expect(1).assertEqual(formInfo.isDefault) + expect(1).assertEqual(formInfo.updateEnabled) + expect(1).assertEqual(formInfo.formVisibleNotify) + expect(undefined).assertEqual(formInfo.relatedBundleName) + expect("abilityb").assertEqual(formInfo.formConfigAbility) + expect(3).assertEqual(formInfo.updateDuration) + expect(2).assertEqual(formInfo.defaultDimension) + expect('10:30').assertEqual(formInfo.scheduledUpdateTime) + expect(1).assertEqual(formInfo.supportDimensions[0]) + expect(2).assertEqual(formInfo.supportDimensions[1]) + expect('originWidgetNameB').assertEqual(formInfo.metaData.customizeData[0].name) + expect('valueB').assertEqual(formInfo.metaData.customizeData[0].value) + } + function checkDataC(formInfo){ + expect("com.ohos.st.formsystemproviderc").assertEqual(formInfo.bundleName) + expect("form_module_c").assertEqual(formInfo.moduleName) + expect("com.ohos.st.formsystemproviderc.MainAbility").assertEqual(formInfo.abilityName) + expect("FormC_Js001").assertEqual(formInfo.name) + expect("form_description_FormC_Js001").assertEqual(formInfo.description) + expect(FormInfo.FormType.JS).assertEqual(formInfo.type) + expect('card_c').assertEqual(formInfo.jsComponentName) + expect(FormInfo.ColorMode.MODE_LIGHT).assertEqual(formInfo.colorMode) + expect(1).assertEqual(formInfo.isDefault) + expect(1).assertEqual(formInfo.updateEnabled) + expect(1).assertEqual(formInfo.formVisibleNotify) + expect(undefined).assertEqual(formInfo.relatedBundleName) + expect("abilityc").assertEqual(formInfo.formConfigAbility) + expect(4).assertEqual(formInfo.updateDuration) + expect('15:30').assertEqual(formInfo.scheduledUpdateTime) + expect(3).assertEqual(formInfo.defaultDimension) + expect(3).assertEqual(formInfo.supportDimensions[0]) + expect(4).assertEqual(formInfo.supportDimensions[1]) + expect('originWidgetNameC').assertEqual(formInfo.metaData.customizeData[0].name) + expect('valueC').assertEqual(formInfo.metaData.customizeData[0].value) + } }); }; diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetFormsInfo.test.ets b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetFormsInfo.test.ets index f44d4bc068cb149fb7c2a113a083bc1a6ec6ae3d..eb26beb6127dfbe8f90f951907c099175595f791 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetFormsInfo.test.ets +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetFormsInfo.test.ets @@ -15,6 +15,7 @@ import formHost from '@ohos.application.formHost'; import { describe, expect, it } from 'deccjsunit/index'; +import FormInfo from '@ohos.application.formInfo'; export const getFormsInfoTest = (describeName, filterParameter) => { const ERR_OK_CODE = 0; @@ -23,6 +24,9 @@ export const getFormsInfoTest = (describeName, filterParameter) => { const ERR_GET_BUNDLE_FAILED = `failed to obtain the bundle information`; const ERR_ADD_INVALID_PARAM_CODE = 7; const ERR_ADD_INVALID_PARAM = `invalid input parameter during form operation`; + function sleep(time) { + return new Promise((resolve)=>setTimeout(resolve,time)); + } describe(`${describeName}`, () => { const callbackName = `FMS_getFormsInfo_0900 callback`; @@ -130,27 +134,7 @@ export const getFormsInfoTest = (describeName, filterParameter) => { const callbackName = `FMS_getFormsInfo_1100 callback`; const promiseName = `FMS_getFormsInfo_1100 promise`; const bundleName = `com.ohos.st.formsystemproviderb`; - - const expectDataB = { - bundleName: 'com.ohos.st.formsystemproviderb', - moduleName: 'form_module_b', - abilityName: 'com.ohos.st.formsystemproviderb.MainAbility', - name: 'FormB_Js001', - description: 'form_description_FormB_Js001', - descriptionId: 20, - type: 1, - jsComponentName: 'card_b', - colorMode: -1, - isDefault: 1, - updateEnabled: 1, - formVisibleNotify: 1, - formConfigAbility: 'abilityb', - updateDuration: 3, - scheduledUpdateTime: '10:30', - defaultDimension: 2, - supportDimensions: [1, 2], - metaData: { customizeData: [{ name: 'originWidgetNameB', value: 'valueB' }] }, - }; + var tempDataB = undefined; /** * @tc.name: getFormsInfo @@ -173,12 +157,15 @@ export const getFormsInfoTest = (describeName, filterParameter) => { expect(data.length).assertEqual(1); expect(dataB.length).assertEqual(1); - expect(JSON.stringify(dataB[0])).assertEqual(JSON.stringify(expectDataB)); + tempDataB = dataB[0] expect(error.code).assertEqual(ERR_OK_CODE); expect(error.message).assertEqual(ERR_OK); done(); console.log(`==========${callbackName} ${describeName} end==========`); }); + await sleep(2000) + checkDataB(tempDataB) + done() } catch (error) { console.log(`${callbackName} exception caught: ${JSON.stringify(error)})`); console.log(`${callbackName} should not reach here`); @@ -207,7 +194,8 @@ export const getFormsInfoTest = (describeName, filterParameter) => { expect(data.length).assertEqual(1); expect(dataB.length).assertEqual(1); - expect(JSON.stringify(dataB[0])).assertEqual(JSON.stringify(expectDataB)); + tempDataB = dataB[0] + checkDataB(tempDataB) done(); console.log(`==========${promiseName} ${describeName} end==========`); } catch (error) { @@ -216,6 +204,28 @@ export const getFormsInfoTest = (describeName, filterParameter) => { expect().assertFail(); } }); + function checkDataB(formInfo){ + expect("com.ohos.st.formsystemproviderb").assertEqual(formInfo.bundleName) + expect("form_module_b").assertEqual(formInfo.moduleName) + expect("com.ohos.st.formsystemproviderb.MainAbility").assertEqual(formInfo.abilityName) + expect("FormB_Js001").assertEqual(formInfo.name) + expect("form_description_FormB_Js001").assertEqual(formInfo.description) + expect(FormInfo.FormType.JS).assertEqual(formInfo.type) + expect('card_b').assertEqual(formInfo.jsComponentName) + expect(FormInfo.ColorMode.MODE_AUTO).assertEqual(formInfo.colorMode) + expect(1).assertEqual(formInfo.isDefault) + expect(1).assertEqual(formInfo.updateEnabled) + expect(1).assertEqual(formInfo.formVisibleNotify) + expect(undefined).assertEqual(formInfo.relatedBundleName) + expect("abilityb").assertEqual(formInfo.formConfigAbility) + expect(3).assertEqual(formInfo.updateDuration) + expect(2).assertEqual(formInfo.defaultDimension) + expect('10:30').assertEqual(formInfo.scheduledUpdateTime) + expect(1).assertEqual(formInfo.supportDimensions[0]) + expect(2).assertEqual(formInfo.supportDimensions[1]) + expect('originWidgetNameB').assertEqual(formInfo.metaData.customizeData[0].name) + expect('valueB').assertEqual(formInfo.metaData.customizeData[0].value) + } }); describe(`${describeName}`, () => { @@ -431,6 +441,7 @@ export const getFormsInfoTest = (describeName, filterParameter) => { const promiseName = `FMS_getFormsInfo_1800 promise`; const bundleName = `com.ohos.st.formsystemproviderc`; const moduleName = `form_module_c`; + var tempDataC = undefined; const expectDataC = { bundleName: 'com.ohos.st.formsystemproviderc', @@ -444,6 +455,8 @@ export const getFormsInfoTest = (describeName, filterParameter) => { colorMode: 1, isDefault: 1, updateEnabled: 1, + isStatic:true, + window:{"autoDesignWidth":false,"designWidth":720}, formVisibleNotify: 1, formConfigAbility: 'abilityc', updateDuration: 4, @@ -471,15 +484,18 @@ export const getFormsInfoTest = (describeName, filterParameter) => { }); console.log(`${callbackName} form dataC: ${JSON.stringify(dataC)}`); console.log(`${callbackName} formC amount: ${dataC.length}`); - + tempDataC = dataC[0]; expect(data.length).assertEqual(1); expect(dataC.length).assertEqual(1); - expect(JSON.stringify(dataC[0])).assertEqual(JSON.stringify(expectDataC)); + //expect(JSON.stringify(dataC[0])).assertEqual(JSON.stringify(expectDataC)); expect(error.code).assertEqual(ERR_OK_CODE); expect(error.message).assertEqual(ERR_OK); - done(); console.log(`==========${callbackName} ${describeName} end==========`); }); + await sleep(2000) + checkDataC(tempDataC) + tempDataC = undefined; + done(); } catch (error) { console.log(`${callbackName} exception caught: ${JSON.stringify(error)})`); console.log(`${callbackName} should not reach here`); @@ -508,14 +524,38 @@ export const getFormsInfoTest = (describeName, filterParameter) => { expect(data.length).assertEqual(1); expect(dataC.length).assertEqual(1); - expect(JSON.stringify(dataC[0])).assertEqual(JSON.stringify(expectDataC)); - done(); + //expect(JSON.stringify(dataC[0])).assertEqual(JSON.stringify(expectDataC)); + tempDataC = dataC[0]; console.log(`==========${promiseName} ${describeName} end==========`); + checkDataC(tempDataC) + done() } catch (error) { console.log(`${promiseName} exception caught: ${JSON.stringify(error)})`); console.log(`${promiseName} should not reach here`); expect().assertFail(); } }); + + function checkDataC(formInfo){ + expect("com.ohos.st.formsystemproviderc").assertEqual(formInfo.bundleName) + expect("form_module_c").assertEqual(formInfo.moduleName) + expect("com.ohos.st.formsystemproviderc.MainAbility").assertEqual(formInfo.abilityName) + expect("FormC_Js001").assertEqual(formInfo.name) + expect("form_description_FormC_Js001").assertEqual(formInfo.description) + expect(FormInfo.FormType.JS).assertEqual(formInfo.type) + expect('card_c').assertEqual(formInfo.jsComponentName) + expect(FormInfo.ColorMode.MODE_LIGHT).assertEqual(formInfo.colorMode) + expect(1).assertEqual(formInfo.isDefault) + expect(1).assertEqual(formInfo.updateEnabled) + expect(1).assertEqual(formInfo.formVisibleNotify) + expect(undefined).assertEqual(formInfo.relatedBundleName) + expect("abilityc").assertEqual(formInfo.formConfigAbility) + expect(4).assertEqual(formInfo.updateDuration) + expect(3).assertEqual(formInfo.defaultDimension) + expect(3).assertEqual(formInfo.supportDimensions[0]) + expect(4).assertEqual(formInfo.supportDimensions[1]) + expect('originWidgetNameC').assertEqual(formInfo.metaData.customizeData[0].name) + expect('valueC').assertEqual(formInfo.metaData.customizeData[0].value) + } }); }; diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets index f43e9af5e74e0f3d8d6727f6240b6407e5344fab..b73c8e8e9eea320a683867d97bc706a728cc8a87 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets @@ -15,7 +15,12 @@ import formHost from '@ohos.application.formHost'; import { describe, expect, it } from 'deccjsunit/index'; +import FormInfo from '@ohos.application.formInfo'; + +function sleep(time) { + return new Promise((resolve)=>setTimeout(resolve,time)); +} export const getAllFormsInfoTest = (describeName, filterParameter) => { const ERR_OK_CODE = 0; const ERR_OK = `success`; @@ -23,69 +28,9 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { describe(`${describeName}`, () => { const callbackName = `FMS_getFormsInfo_0600 callback`; const promiseName = `FMS_getFormsInfo_0600 promise`; - - const expectDataA01 = { - bundleName: 'com.ohos.st.formsystemprovidera', - moduleName: 'form_module_a', - abilityName: 'com.ohos.st.formsystemprovidera.MainAbility', - name: 'FormA_Js001', - description: 'form_description_FormA_Js001', - descriptionId: 0, - type: 1, - jsComponentName: 'card_a01', - colorMode: 0, - isDefault: 1, - updateEnabled: 1, - formVisibleNotify: 1, - formConfigAbility: 'abilitya01', - updateDuration: 1, - scheduledUpdateTime: '5:30', - defaultDimension: 1, - supportDimensions: [1, 3], - metaData: { customizeData: [{ name: 'originWidgetNameA01', value: 'valueA01' }] }, - }; - - const expectDataA02 = { - bundleName: 'com.ohos.st.formsystemprovidera', - moduleName: 'form_module_a', - abilityName: 'com.ohos.st.formsystemprovidera.MainAbility', - name: 'FormA_Js002', - description: 'form_description_FormA_Js002', - descriptionId: 10, - type: 1, - jsComponentName: 'card_a02', - colorMode: 1, - isDefault: 0, - updateEnabled: 0, - formVisibleNotify: 0, - formConfigAbility: 'abilitya02', - updateDuration: 2, - scheduledUpdateTime: '20:30', - defaultDimension: 4, - supportDimensions: [1, 2, 3, 4], - metaData: { customizeData: [{ name: 'originWidgetNameA02', value: 'valueA02' }] }, - }; - - const expectDataB = { - bundleName: 'com.ohos.st.formsystemproviderb', - moduleName: 'form_module_b', - abilityName: 'com.ohos.st.formsystemproviderb.MainAbility', - name: 'FormB_Js001', - description: 'form_description_FormB_Js001', - descriptionId: 20, - type: 1, - jsComponentName: 'card_b', - colorMode: -1, - isDefault: 1, - updateEnabled: 1, - formVisibleNotify: 1, - formConfigAbility: 'abilityb', - updateDuration: 3, - scheduledUpdateTime: '10:30', - defaultDimension: 2, - supportDimensions: [1, 2], - metaData: { customizeData: [{ name: 'originWidgetNameB', value: 'valueB' }] }, - }; + var tempDataA1 = undefined; + var tempDataA2 = undefined; + var tempDataB = undefined; /** * @tc.name: getFormsInfo @@ -113,14 +58,18 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect(dataA.length).assertEqual(2); expect(dataB.length).assertEqual(1); - expect(JSON.stringify(dataA[0])).assertEqual(JSON.stringify(expectDataA01)); - expect(JSON.stringify(dataA[1])).assertEqual(JSON.stringify(expectDataA02)); - expect(JSON.stringify(dataB[0])).assertEqual(JSON.stringify(expectDataB)); + tempDataA1 = dataA[0] + tempDataA2 = dataA[1] + tempDataB = dataB[0] expect(error.code).assertEqual(ERR_OK_CODE); expect(error.message).assertEqual(ERR_OK); - done(); console.log(`==========${callbackName} ${describeName} end==========`); }); + await sleep(2000) + checkDataA1(tempDataA1) + checkDataA2(tempDataA2) + checkDataB(tempDataB) + done() } catch (error) { console.log(`${callbackName} exception caught: ${JSON.stringify(error)})`); console.log(`${callbackName} should not reach here`); @@ -154,9 +103,12 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect(dataA.length).assertEqual(2); expect(dataB.length).assertEqual(1); - expect(JSON.stringify(dataA[0])).assertEqual(JSON.stringify(expectDataA01)); - expect(JSON.stringify(dataA[1])).assertEqual(JSON.stringify(expectDataA02)); - expect(JSON.stringify(dataB[0])).assertEqual(JSON.stringify(expectDataB)); + tempDataA1 = dataA[0] + tempDataA2 = dataA[1] + tempDataB = dataB[0] + checkDataA1(tempDataA1) + checkDataA2(tempDataA2) + checkDataB(tempDataB) done(); console.log(`==========${promiseName} ${describeName} end==========`); } catch (error) { @@ -165,5 +117,76 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect().assertFail(); } }); + + function checkDataB(formInfo){ + expect("com.ohos.st.formsystemproviderb").assertEqual(formInfo.bundleName) + expect("form_module_b").assertEqual(formInfo.moduleName) + expect("com.ohos.st.formsystemproviderb.MainAbility").assertEqual(formInfo.abilityName) + expect("FormB_Js001").assertEqual(formInfo.name) + expect("form_description_FormB_Js001").assertEqual(formInfo.description) + expect(FormInfo.FormType.JS).assertEqual(formInfo.type) + expect('card_b').assertEqual(formInfo.jsComponentName) + expect(FormInfo.ColorMode.MODE_AUTO).assertEqual(formInfo.colorMode) + expect(1).assertEqual(formInfo.isDefault) + expect(1).assertEqual(formInfo.updateEnabled) + expect(1).assertEqual(formInfo.formVisibleNotify) + expect(undefined).assertEqual(formInfo.relatedBundleName) + expect("abilityb").assertEqual(formInfo.formConfigAbility) + expect(3).assertEqual(formInfo.updateDuration) + expect(2).assertEqual(formInfo.defaultDimension) + expect('10:30').assertEqual(formInfo.scheduledUpdateTime) + expect(1).assertEqual(formInfo.supportDimensions[0]) + expect(2).assertEqual(formInfo.supportDimensions[1]) + expect('originWidgetNameB').assertEqual(formInfo.metaData.customizeData[0].name) + expect('valueB').assertEqual(formInfo.metaData.customizeData[0].value) + } + + function checkDataA1(formInfo){ + expect("com.ohos.st.formsystemprovidera").assertEqual(formInfo.bundleName) + expect("form_module_a").assertEqual(formInfo.moduleName) + expect("com.ohos.st.formsystemprovidera.MainAbility").assertEqual(formInfo.abilityName) + expect("FormA_Js001").assertEqual(formInfo.name) + expect("form_description_FormA_Js001").assertEqual(formInfo.description) + expect(FormInfo.FormType.JS).assertEqual(formInfo.type) + expect('card_a01').assertEqual(formInfo.jsComponentName) + expect(FormInfo.ColorMode.MODE_DARK).assertEqual(formInfo.colorMode) + expect(1).assertEqual(formInfo.isDefault) + expect(1).assertEqual(formInfo.updateEnabled) + expect(1).assertEqual(formInfo.formVisibleNotify) + expect(undefined).assertEqual(formInfo.relatedBundleName) + expect("abilitya01").assertEqual(formInfo.formConfigAbility) + expect(1).assertEqual(formInfo.updateDuration) + expect(1).assertEqual(formInfo.defaultDimension) + expect('5:30').assertEqual(formInfo.scheduledUpdateTime) + expect(1).assertEqual(formInfo.supportDimensions[0]) + expect(3).assertEqual(formInfo.supportDimensions[1]) + expect('originWidgetNameA01').assertEqual(formInfo.metaData.customizeData[0].name) + expect('valueA01').assertEqual(formInfo.metaData.customizeData[0].value) + } + + function checkDataA2(formInfo){ + expect("com.ohos.st.formsystemprovidera").assertEqual(formInfo.bundleName) + expect("form_module_a").assertEqual(formInfo.moduleName) + expect("com.ohos.st.formsystemprovidera.MainAbility").assertEqual(formInfo.abilityName) + expect("FormA_Js002").assertEqual(formInfo.name) + expect("form_description_FormA_Js002").assertEqual(formInfo.description) + expect(FormInfo.FormType.JS).assertEqual(formInfo.type) + expect('card_a02').assertEqual(formInfo.jsComponentName) + expect(FormInfo.ColorMode.MODE_LIGHT).assertEqual(formInfo.colorMode) + expect(0).assertEqual(formInfo.isDefault) + expect(0).assertEqual(formInfo.updateEnabled) + expect(0).assertEqual(formInfo.formVisibleNotify) + expect(undefined).assertEqual(formInfo.relatedBundleName) + expect("abilitya02").assertEqual(formInfo.formConfigAbility) + expect(2).assertEqual(formInfo.updateDuration) + expect(4).assertEqual(formInfo.defaultDimension) + expect('20:30').assertEqual(formInfo.scheduledUpdateTime) + expect(1).assertEqual(formInfo.supportDimensions[0]) + expect(2).assertEqual(formInfo.supportDimensions[1]) + expect(3).assertEqual(formInfo.supportDimensions[2]) + expect(4).assertEqual(formInfo.supportDimensions[3]) + expect('originWidgetNameA02').assertEqual(formInfo.metaData.customizeData[0].name) + expect('valueA02').assertEqual(formInfo.metaData.customizeData[0].value) + } }); }; diff --git a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets index 8f8e8d3779fb1fc4af101b0b80fbe260d6be72ae..f30de9acb1e54ad937e2f814856a5b3014c635f0 100644 --- a/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets +++ b/ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets @@ -15,6 +15,7 @@ import formHost from '@ohos.application.formHost'; import { describe, expect, it } from 'deccjsunit/index'; +import FormInfo from '@ohos.application.formInfo'; export const getAllFormsInfoTest = (describeName, filterParameter) => { const ERR_OK_CODE = 0; @@ -23,27 +24,7 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { describe(`${describeName}`, () => { const callbackName = `FMS_getFormsInfo_0400 callback`; const promiseName = `FMS_getFormsInfo_0400 promise`; - - const expectDataB = { - bundleName: 'com.ohos.st.formsystemproviderb', - moduleName: 'form_module_b', - abilityName: 'com.ohos.st.formsystemproviderb.MainAbility', - name: 'FormB_Js001', - description: 'form_description_FormB_Js001', - descriptionId: 20, - type: 1, - jsComponentName: 'card_b', - colorMode: -1, - isDefault: 1, - updateEnabled: 1, - formVisibleNotify: 1, - formConfigAbility: 'abilityb', - updateDuration: 3, - scheduledUpdateTime: '10:30', - defaultDimension: 2, - supportDimensions: [1, 2], - metaData: { customizeData: [{ name: 'originWidgetNameB', value: 'valueB' }] }, - }; + var tempDataB = undefined; /** * @tc.name: getFormsInfo @@ -71,13 +52,15 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect(dataB.length).assertEqual(1); expect(dataD.length).assertEqual(0); - expect(JSON.stringify(dataB[0])).assertEqual(JSON.stringify(expectDataB)); + tempDataB = dataB[0] expect(JSON.stringify(dataD)).assertEqual(`[]`); expect(error.code).assertEqual(ERR_OK_CODE); expect(error.message).assertEqual(ERR_OK); - done(); console.log(`==========${callbackName} ${describeName} end==========`); }); + await sleep(2000) + checkDataB(tempDataB) + done() } catch (error) { console.log(`${callbackName} exception caught: ${JSON.stringify(error)})`); console.log(`${callbackName} should not reach here`); @@ -111,7 +94,8 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect(dataB.length).assertEqual(1); expect(dataD.length).assertEqual(0); - expect(JSON.stringify(dataB[0])).assertEqual(JSON.stringify(expectDataB)); + tempDataB = dataB[0] + checkDataB(tempDataB) expect(JSON.stringify(dataD)).assertEqual(`[]`); done(); console.log(`==========${promiseName} ${describeName} end==========`); @@ -121,5 +105,27 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => { expect().assertFail(); } }); + function checkDataB(formInfo){ + expect("com.ohos.st.formsystemproviderb").assertEqual(formInfo.bundleName) + expect("form_module_b").assertEqual(formInfo.moduleName) + expect("com.ohos.st.formsystemproviderb.MainAbility").assertEqual(formInfo.abilityName) + expect("FormB_Js001").assertEqual(formInfo.name) + expect("form_description_FormB_Js001").assertEqual(formInfo.description) + expect(FormInfo.FormType.JS).assertEqual(formInfo.type) + expect('card_b').assertEqual(formInfo.jsComponentName) + expect(FormInfo.ColorMode.MODE_AUTO).assertEqual(formInfo.colorMode) + expect(1).assertEqual(formInfo.isDefault) + expect(1).assertEqual(formInfo.updateEnabled) + expect(1).assertEqual(formInfo.formVisibleNotify) + expect(undefined).assertEqual(formInfo.relatedBundleName) + expect("abilityb").assertEqual(formInfo.formConfigAbility) + expect(3).assertEqual(formInfo.updateDuration) + expect(2).assertEqual(formInfo.defaultDimension) + expect('10:30').assertEqual(formInfo.scheduledUpdateTime) + expect(1).assertEqual(formInfo.supportDimensions[0]) + expect(2).assertEqual(formInfo.supportDimensions[1]) + expect('originWidgetNameB').assertEqual(formInfo.metaData.customizeData[0].name) + expect('valueB').assertEqual(formInfo.metaData.customizeData[0].value) + } }); }; diff --git a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/test/Ability.test.ets index a9ab83a999dd4010c87024576d7bc318edfe7c39..02bd0aa38917e1b4769c6e87183169d9db10bcfb 100644 --- a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/entry/src/main/ets/test/Ability.test.ets @@ -14,7 +14,7 @@ */ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "deccjsunit/index" -import appManager from '@ohos.application.AppManager'; +import appManager from '@ohos.application.appManager'; import osaccount from '@ohos.account.osAccount' const NULL_ACCOUNT_ID = 102; diff --git a/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/test/Ability.test.ets b/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/test/Ability.test.ets index 532e88620a5ad6d7c8e45ded6d07753d614b6dbf..9b12b9c4f4f575ad71b887c2e95e2258e4d869b9 100644 --- a/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/test/Ability.test.ets +++ b/ability/ability_runtime/newwant/actsnewwanttest/entry/src/main/ets/test/Ability.test.ets @@ -636,374 +636,5 @@ export default function abilityTest(abilityContext) { done(); } }) - - - /* - * @tc.number SUB_AA_ABILITY_Extension_API_001 - * @tc.name StartServiceExtensionAbility with incorrect abilityName. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_ABILITY_Extension_API_001', 0, async function (done) { - await sleep(2000); - let want = { - bundleName: "com.example.extensionapitest", - abilityName: "FirstExtension1" - }; - await globalThis.AbilityContext.startServiceExtensionAbility(want).then((data) => { - console.log('Ability: startServiceExtensionAbility success:' + JSON.stringify(data)); - expect("case execute failed").assertEqual(data); - }).catch((error) => { - console.error(`Ability: startServiceExtensionAbility failed: ${JSON.stringify(error)}`); - expect(EXTENSION_INFO_ERR).assertEqual(error.code); - }) - done() - }) - - /* - * @tc.number SUB_AA_ABILITY_Extension_API_002 - * @tc.name StopServiceExtensionAbility with incorrect bundleName. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_ABILITY_Extension_API_002', 0, async function (done) { - await sleep(2000); - let want = { - bundleName: "com.example.extensionapitest1", - abilityName: "FirstExtension" - }; - await globalThis.AbilityContext.stopServiceExtensionAbility(want).then((data) => { - console.log(`Ability: stopServiceExtensionAbility success: ${JSON.stringify(data)}`); - expect("case execute failed").assertEqual(data); - }).catch((error) => { - console.error(`Ability: stopServiceExtensionAbility failed: ${JSON.stringify(error)}`); - expect(EXTENSION_INFO_ERR).assertEqual(error.code); - }) - done() - }) - - /* - * @tc.number SUB_AA_ABILITY_Extension_API_003 - * @tc.name startServiceExtensionAbilityWithAccount with incorrect userId. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_ABILITY_Extension_API_003', 0, async function (done) { - await sleep(2000); - let want = { - bundleName: "com.example.extensionapitest", - abilityName: "FirstExtension" - }; - await globalThis.AbilityContext.startServiceExtensionAbilityWithAccount(want, 999).then((data) => { - console.log(`Ability: startServiceExtensionAbilityWithAccount success: ${JSON.stringify(data)}`); - expect("case execute failed").assertEqual("data"); - }).catch((error) => { - console.error(`Ability: startServiceExtensionAbilityWithAccount failed: ${JSON.stringify(error)}`); - expect(USERID_ERR).assertEqual(error.code); - }) - done() - }) - - /* - * @tc.number SUB_AA_ABILITY_Extension_API_004 - * @tc.name stopServiceExtensionAbilityWithAccount with incorrect userId. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_ABILITY_Extension_API_004', 0, async function (done) { - await sleep(2000); - let want = { - bundleName: "com.example.extensionapitest", - abilityName: "FirstExtension" - }; - await globalThis.AbilityContext.stopServiceExtensionAbilityWithAccount(want, 999).then((data) => { - console.log(`Ability: stopServiceExtensionAbilityWithAccount success: ${JSON.stringify(data)}`); - expect("case execute failed").assertEqual(data); - }).catch((error) => { - console.error(`Ability: stopServiceExtensionAbilityWithAccount failed: ${JSON.stringify(error)}`); - expect(USERID_ERR).assertEqual(error.code); - }) - done() - }) - - /* - * @tc.number SUB_AA_ABILITY_Extension_API_005 - * @tc.name StartServiceExtensionAbility with incorrect abilityName. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_ABILITY_Extension_API_005', 0, async function (done) { - await sleep(2000); - let want = { - bundleName: "com.example.extensionapitest", - abilityName: "FirstExtension1" - } - await globalThis.AbilityContext.startServiceExtensionAbility(want, (err, data) => { - if (err.code) { - console.error(`Ability: startServiceExtensionAbility failed: ${JSON.stringify(err)}`); - expect(EXTENSION_INFO_ERR).assertEqual(err.code); - } else { - console.log(`Ability: startServiceExtensionAbility success: ${JSON.stringify(data)}`); - expect("case execute failed").assertEqual(data); - } - done() - }) - }) - - /* - * @tc.number SUB_AA_ABILITY_Extension_API_006 - * @tc.name StopServiceExtensionAbility with incorrect bundleName. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_ABILITY_Extension_API_006', 0, async function (done) { - await sleep(2000); - let want = { - bundleName: "com.example.extensionapitest1", - abilityName: "FirstExtension" - }; - await globalThis.AbilityContext.stopServiceExtensionAbility(want, (err, data) => { - if (err.code) { - console.error(`Ability: stopServiceExtensionAbility failed: ${JSON.stringify(err)}`); - expect(EXTENSION_INFO_ERR).assertEqual(err.code); - } else { - console.log(`Ability: stopServiceExtensionAbility success: ${JSON.stringify(data)}`); - expect("case execute failed").assertEqual(data); - } - done() - }) - done() - }) - - /* - * @tc.number SUB_AA_ABILITY_Extension_API_007 - * @tc.name startServiceExtensionAbilityWithAccount with incorrect userId. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_ABILITY_Extension_API_007', 0, async function (done) { - await sleep(2000); - let want = { - bundleName: "com.example.extensionapitest", - abilityName: "FirstExtension" - }; - await globalThis.AbilityContext.startServiceExtensionAbilityWithAccount(want, 999, (err, data) => { - if (err.code) { - console.error(`Ability: startServiceExtensionAbilityWithAccount failed: ${JSON.stringify(err)}`); - expect(USERID_ERR).assertEqual(err.code); - } else { - console.log(`Ability: startServiceExtensionAbilityWithAccount success: ${JSON.stringify(data)}`); - expect("case execute failed").assertEqual(data); - } - done() - }) - }) - - /* - * @tc.number SUB_AA_ABILITY_Extension_API_008 - * @tc.name stopServiceExtensionAbilityWithAccount with incorrect userId. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_ABILITY_Extension_API_008', 0, async function (done) { - await sleep(2000); - let want = { - bundleName: "com.example.extensionapitest", - abilityName: "FirstExtension" - }; - globalThis.AbilityContext.stopServiceExtensionAbilityWithAccount(want, 999, (err, data) => { - if (err.code) { - console.error(`Ability: stopServiceExtensionAbilityWithAccount failed: ${JSON.stringify(err)}`); - expect(USERID_ERR).assertEqual(err.code); - } else { - console.log(`Ability: stopServiceExtensionAbilityWithAccount success: ${JSON.stringify(data)}`); - expect("case execute failed").assertEqual(data); - } - done() - }) - }) - - /* - * @tc.number SUB_AA_AMS_Context_0100 - * @tc.name Get the resource and path of the context. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_AMS_Context_0100', 0, async function (done) { - expect("/data/storage/el2/base/haps/entry_test/cache").assertEqual(globalThis.AbilityContext.cacheDir) - expect("/data/storage/el2/base/haps/entry_test/temp").assertEqual(globalThis.AbilityContext.tempDir) - expect("/data/storage/el2/base/haps/entry_test/files").assertEqual(globalThis.AbilityContext.filesDir) - expect("/data/storage/el2/database/entry_test").assertEqual(globalThis.AbilityContext.databaseDir) - expect("/data/storage/el2/base/haps/entry_test/preferences").assertEqual(globalThis.AbilityContext.preferencesDir) - expect("/data/storage/el1/bundle").assertEqual(globalThis.AbilityContext.bundleCodeDir) - expect("/data/storage/el2/distributedfiles").assertEqual(globalThis.AbilityContext.distributedFilesDir) - expect(1).assertEqual(globalThis.AbilityContext.area) - globalThis.AbilityContext.resourceManager.getConfiguration((err, data) => { - if (err.code != 0 ) { - console.error(`Ability: getConfiguration failed: ${JSON.stringify(err)}`); - expect(USERID_ERR).assertEqual(err.code); - done() - } else { - console.log(`Ability: getConfiguration success: ${JSON.stringify(data)}`); - expect(1).assertEqual(data.direction) - done() - } - }) - let moduleContext = globalThis.AbilityContext.createModuleContext("module1") - expect("/data/storage/el2/base/cache").assertEqual(moduleContext.cacheDir) - done() - }) - - /* - * @tc.number SUB_AA_Form_provider_getFormsInfo_0100 - * @tc.name The provider calls the getFormsInfo interface to obtain form information. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_Form_provider_getFormsInfo_0100', 0, async function (done) { - console.info("SUB_AA_Form_provider_getFormsInfo_0100"); - formProvider.getFormsInfo((err, value) => { - console.info("formProvider::GetFormsInfoTest err: " + JSON.stringify(err)); - console.info("formProvider::GetFormsInfoTest value: " + JSON.stringify(value)); - if (err.code != 0) { - expect(0).assertEqual(2) - } else { - for(let i = 0; i < value.length; i++){ - if(value[i].bundleName == "com.example.extensionapitest" && value[i].name == "widget"){ - trueInfo = value[i] - console.info("formProvider::GetFormsInfoTest trueInfo: " + JSON.stringify(trueInfo)); - } - } - } - checkFormInfo(trueInfo) - done() - }) - done() - }) - - /* - * @tc.number SUB_AA_Form_provider_getFormsInfo_0200 - * @tc.name The provider calls the getFormsInfo interface to obtain form information in the module1. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_Form_provider_getFormsInfo_0200', 0, async function (done) { - console.info("SUB_AA_Form_provider_getFormsInfo_0200"); - const filter: formInfo.FormInfoFilter = { - moduleName: "module1" - }; - formProvider.getFormsInfo(filter, (err, value) => { - console.info("formProvider::GetFormsInfoTest err: " + JSON.stringify(err)); - console.info("formProvider::GetFormsInfoTest value: " + JSON.stringify(value)); - if (err.code != 0) { - expect(0).assertEqual(2) - } else { - if(value.length == 0){ - expect(1).assertEqual(0) - }else{ - for(let i = 0; i < value.length; i++){ - if(value[i].bundleName == "com.example.extensionapitest" && value[i].name == "widget1"){ - trueInfo = value[i] - console.info("formProvider::GetFormsInfoTest trueInfo: " + JSON.stringify(trueInfo)); - } - } - } - } - checkFormInfoModule1(trueInfo) - done(); - }) - done() - }) - - /* - * @tc.number SUB_AA_Form_provider_TestFormErr_0100 - * @tc.name Get all FormError types. - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_Form_provider_TestFormErr_0100', 0, async function (done) { - console.info("SUB_AA_Form_provider_TestFormErr_0100"); - expect(7).assertEqual(formError.FormError.ERR_ADD_INVALID_PARAM) - expect(10).assertEqual(formError.FormError.ERR_BIND_PROVIDER_FAILED) - expect(8).assertEqual(formError.FormError.ERR_CFG_NOT_MATCH_ID) - expect(1).assertEqual(formError.FormError.ERR_COMMON) - expect(31).assertEqual(formError.FormError.ERR_FORM_DUPLICATE_ADDED) - expect(20).assertEqual(formError.FormError.ERR_FORM_FA_NOT_INSTALLED) - expect(18).assertEqual(formError.FormError.ERR_FORM_NO_SUCH_ABILITY) - expect(19).assertEqual(formError.FormError.ERR_FORM_NO_SUCH_DIMENSION) - expect(17).assertEqual(formError.FormError.ERR_FORM_NO_SUCH_MODULE) - expect(5).assertEqual(formError.FormError.ERR_GET_BUNDLE_FAILED) - expect(4).assertEqual(formError.FormError.ERR_GET_INFO_FAILED) - expect(6).assertEqual(formError.FormError.ERR_GET_LAYOUT_FAILED) - expect(36).assertEqual(formError.FormError.ERR_IN_RECOVERY) - expect(15).assertEqual(formError.FormError.ERR_MAX_FORMS_PER_CLIENT) - expect(12).assertEqual(formError.FormError.ERR_MAX_INSTANCES_PER_FORM) - expect(11).assertEqual(formError.FormError.ERR_MAX_SYSTEM_FORMS) - expect(16).assertEqual(formError.FormError.ERR_MAX_SYSTEM_TEMP_FORMS) - expect(9).assertEqual(formError.FormError.ERR_NOT_EXIST_ID) - expect(13).assertEqual(formError.FormError.ERR_OPERATION_FORM_NOT_SELF) - expect(2).assertEqual(formError.FormError.ERR_PERMISSION_DENY) - expect(14).assertEqual(formError.FormError.ERR_PROVIDER_DEL_FAIL) - expect(30).assertEqual(formError.FormError.ERR_SYSTEM_RESPONSES_FAILED) - done() - }) - - /* - * @tc.number SUB_AA_Form_provider_TestFormInfo_0100 - * @tc.name Get all FormInfo types - * @tc.desc Function test - * @tc.level 3 - */ - it('SUB_AA_Form_provider_TestFormInfo_0100', 0, async function (done) { - console.info("SUB_AA_Form_provider_TestFormInfo_0100"); - expect("ohos.extra.param.key.form_dimension").assertEqual(FormInfo.FormParam.DIMENSION_KEY) - expect("ohos.extra.param.key.form_height").assertEqual(FormInfo.FormParam.HEIGHT_KEY) - expect("ohos.extra.param.key.module_name").assertEqual(FormInfo.FormParam.MODULE_NAME_KEY) - expect("ohos.extra.param.key.form_name").assertEqual(FormInfo.FormParam.NAME_KEY) - expect("ohos.extra.param.key.form_temporary").assertEqual(FormInfo.FormParam.TEMPORARY_KEY) - expect("ohos.extra.param.key.form_width").assertEqual(FormInfo.FormParam.WIDTH_KEY) - expect(0).assertEqual(FormInfo.FormState.DEFAULT) - expect(1).assertEqual(FormInfo.FormState.READY) - expect(-1).assertEqual(FormInfo.FormState.UNKNOWN) - expect(0).assertEqual(FormInfo.ColorMode.MODE_DARK) - expect(1).assertEqual(FormInfo.ColorMode.MODE_LIGHT) - done(); - }); }) -} -function checkFormInfoModule1(formInfo){ - console.info("formProvider::GetFormsInfoTest value: " + JSON.stringify(formInfo)); - expect("com.example.extensionapitest").assertEqual(formInfo.bundleName) - expect("module1").assertEqual(formInfo.moduleName) - expect("FormAbility").assertEqual(formInfo.abilityName) - expect("widget1").assertEqual(formInfo.name) - expect("This is a service widget.").assertEqual(formInfo.description) - expect(FormInfo.FormType.JS).assertEqual(formInfo.type) - expect(FormInfo.ColorMode.MODE_DARK).assertEqual(formInfo.colorMode) - expect(1).assertEqual(formInfo.isDefault) - expect(1).assertEqual(formInfo.updateEnabled) - expect(0).assertEqual(formInfo.formVisibleNotify) - expect(undefined).assertEqual(formInfo.relatedBundleName) - expect("ability://xxxxx").assertEqual(formInfo.formConfigAbility) - expect(1).assertEqual(formInfo.updateDuration) - expect(2).assertEqual(formInfo.defaultDimension) - expect(2).assertEqual(formInfo.supportDimensions[0]) -} -function checkFormInfo(formInfo){ - console.info("formProvider::GetFormsInfoTest formInfo: " + JSON.stringify(formInfo)); - expect("com.example.extensionapitest").assertEqual(formInfo.bundleName) - expect("entry").assertEqual(formInfo.moduleName) - expect("FormAbility").assertEqual(formInfo.abilityName) - expect("widget").assertEqual(formInfo.name) - expect("This is a service widget.").assertEqual(formInfo.description) - expect(FormInfo.FormType.JS).assertEqual(formInfo.type) - expect(FormInfo.ColorMode.MODE_AUTO).assertEqual(formInfo.colorMode) - expect(1).assertEqual(formInfo.isDefault) - expect(1).assertEqual(formInfo.updateEnabled) - expect(0).assertEqual(formInfo.formVisibleNotify) - expect(undefined).assertEqual(formInfo.relatedBundleName) - expect("ability://xxxxx").assertEqual(formInfo.formConfigAbility) - expect(1).assertEqual(formInfo.updateDuration) - expect(2).assertEqual(formInfo.defaultDimension) - expect(2).assertEqual(formInfo.supportDimensions[0]) } \ No newline at end of file