diff --git a/ability/ability_runtime/apprecovery/ActsAppRecoveryTestCaller/BUILD.gn b/ability/ability_runtime/apprecovery/ActsAppRecoveryTestCaller/BUILD.gn index 9b6c27f01f0c2014f7096b24ef585886a8610ba9..b651a07fc92d48cd3d59a39eadc926a0be6c5d1e 100644 --- a/ability/ability_runtime/apprecovery/ActsAppRecoveryTestCaller/BUILD.gn +++ b/ability/ability_runtime/apprecovery/ActsAppRecoveryTestCaller/BUILD.gn @@ -1,43 +1,43 @@ -# Copyright (c) 2023 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 +# Copyright (c) 2023 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("ActsAppRecoveryTestCaller") { - hap_profile = "entry/src/ohosTest/module.json" - js_build_mode = "debug" - deps = [ - ":actsapprecoverytestcaller_js_assets", - ":actsapprecoverytestcaller_resources", - ] - ets2abc = true - certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAppRecoveryTestCaller" - subsystem_name = "ability" - part_name = "ability_runtime" -} - -ohos_app_scope("actsapprecoverytestcaller_app_profile") { - app_profile = "AppScope/app.json" - sources = [ "AppScope/resources" ] -} - -ohos_js_assets("actsapprecoverytestcaller_js_assets") { - source_dir = "entry/src/ohosTest/ets" -} - -ohos_resources("actsapprecoverytestcaller_resources") { - sources = [ "entry/src/ohosTest/resources" ] - deps = [ ":actsapprecoverytestcaller_app_profile" ] - hap_profile = "entry/src/ohosTest/module.json" -} + +import("//test/xts/tools/build/suite.gni") + +ohos_js_hap_suite("ActsAppRecoveryTestCaller") { + hap_profile = "entry/src/ohosTest/module.json" + js_build_mode = "debug" + deps = [ + ":actsapprecoverytestcaller_js_assets", + ":actsapprecoverytestcaller_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "ActsAppRecoveryTestCaller" + subsystem_name = "ability" + part_name = "ability_runtime" +} + +ohos_app_scope("actsapprecoverytestcaller_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("actsapprecoverytestcaller_js_assets") { + source_dir = "entry/src/ohosTest/ets" +} + +ohos_resources("actsapprecoverytestcaller_resources") { + sources = [ "entry/src/ohosTest/resources" ] + deps = [ ":actsapprecoverytestcaller_app_profile" ] + hap_profile = "entry/src/ohosTest/module.json" +} diff --git a/ability/ability_runtime/apprecovery/ActsAppRecoveryTestCaller/entry/src/ohosTest/ets/test/Ability.test.ets b/ability/ability_runtime/apprecovery/ActsAppRecoveryTestCaller/entry/src/ohosTest/ets/test/Ability.test.ets index cb7151c4adf198947addb4c6d862920013ee0d11..2bf5a927cdc649a28006ee6cac77995a02648d10 100644 --- a/ability/ability_runtime/apprecovery/ActsAppRecoveryTestCaller/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/ability/ability_runtime/apprecovery/ActsAppRecoveryTestCaller/entry/src/ohosTest/ets/test/Ability.test.ets @@ -18,530 +18,6 @@ import commonEvent from '@ohos.commonEvent' import abilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'; import missionManager from '@ohos.application.missionManager'; - -const CASE_TIME_OUT=5000; -var ACTS_AppRecovery = { - events: ["ACTS_AppRecovery_First", "ACTS_AppRecovery_Second"] -}; - -export default function abilityTest() { - describe('ActsAbilityTest', function () { - beforeAll(function () {}) - beforeEach(function () {}) - afterEach(function () {}) - afterAll(function () {}) - - /* - * @tc.number: Acts_AppRecovery_0100 - * @tc.name: Fault recovery of multi-Ability application - * @tc.desc: When the application settings restart recovery status is valid, the pre-failure state of Ability - * application will not be restored after normal exit and restart. - */ - it('Acts_AppRecovery_0100',0, async function (done) { - let subscriber; - let flag = false; - console.info("Acts_AppRecovery_0100====> start") - commonEvent.createSubscriber(ACTS_AppRecovery).then(async (data) => { - console.debug("Acts_AppRecovery_0100====> Create Subscribe"); - subscriber = data; - commonEvent.subscribe(subscriber, subscribeCallBack); - globalThis.abilityContext.startAbility( - { - bundleName: "com.example.apprecoveryrely", - abilityName: "EntryAbility", - action: "Acts_AppRecovery_0100_once" - },(err)=>{ - console.debug("Acts_AppRecovery_0100====> startAbility err:"+JSON.stringify(err)); - expect(err.code).assertEqual(0); - }) - }) - - function subscribeCallBack(err, data) { - console.debug("Acts_AppRecovery_0100====> subscribeCallBack data:" + JSON.stringify(data)); - if(data.event == "ACTS_AppRecovery_First") { - if (data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"] == undefined) { - expect(true).assertTrue(); - } else { - expect(data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"]).assertFalse(); - } - setTimeout(() => { - commonEvent.subscribe(subscriber, subscribeCallBackSecond); - globalThis.abilityContext.startAbility( - { - bundleName: "com.example.apprecoveryrely", - abilityName: "EntryAbility", - action: "Acts_AppRecovery_0100_twice" - }, - (err) => { - console.debug("Acts_AppRecovery_0100====> second startAbility err:" + JSON.stringify(err)); - expect(err.code).assertEqual(0); - } - ); - }, 800); - } - } - - function subscribeCallBackSecond(err, data) { - console.debug("Acts_AppRecovery_0100====> second subscribeCallBack data:" + JSON.stringify(data)); - if(data.event == "ACTS_AppRecovery_Second") { - flag=true; - if (data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"] == undefined) { - expect(true).assertTrue(); - } else { - expect(data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"]).assertFalse(); - } - commonEvent.unsubscribe(subscriber, unSubscribeCallback); - } - } - - function unSubscribeCallback() { - setTimeout(() => { - console.debug("Acts_AppRecovery_0100====> unSubscribeCallback"); - done(); - }, 800); - } - - setTimeout(()=>{ - if(flag==false){ - expect().assertFail(); - commonEvent.unsubscribe(subscriber, unSubscribeCallback); - } - },CASE_TIME_OUT) - }) - - /* - * @tc.number: Acts_AppRecovery_0200 - * @tc.name: Fault recovery of multi-Ability application - * @tc.desc: When the application settings restart recovery status is valid, the pre-failure state of Ability - * application will not be restored after normal exit and restart. - */ - it('Acts_AppRecovery_0200',0, async function (done) { - let subscriber; - let flag = false; - let countFirst = 0; - let countSecond = 0; - console.info("Acts_AppRecovery_0200====> start") - commonEvent.createSubscriber(ACTS_AppRecovery).then(async (data) => { - console.debug("Acts_AppRecovery_0200====> Create Subscribe"); - subscriber = data; - commonEvent.subscribe(subscriber, subscribeCallBack); - globalThis.abilityContext.startAbility( - { - bundleName: "com.example.apprecoverysrely", - abilityName: "EntryAbility", - action: "Acts_AppRecovery_0200_once" - },(err)=>{ - console.debug("Acts_AppRecovery_0200====> startAbility err:"+JSON.stringify(err)); - expect(err.code).assertEqual(0); - }) - }) - - function subscribeCallBack(err, data) { - console.debug("Acts_AppRecovery_0200====> subscribeCallBack data:" + JSON.stringify(data)); - if(data.event == "ACTS_AppRecovery_First") { - countFirst++; - if (data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"] == undefined) { - expect(true).assertTrue(); - } else { - expect(data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"]).assertFalse(); - } - if (countFirst < 2) { - return; - } - setTimeout(() => { - commonEvent.subscribe(subscriber, subscribeCallBackSecond); - globalThis.abilityContext.startAbility( - { - bundleName: "com.example.apprecoverysrely", - abilityName: "EntryAbility", - action: "Acts_AppRecovery_0200_twice" - }, - (err) => { - console.debug("Acts_AppRecovery_0200====> second startAbility err:" + JSON.stringify(err)); - expect(err.code).assertEqual(0); - } - ); - }, 800); - } - } - - function subscribeCallBackSecond(err, data) { - console.debug("Acts_AppRecovery_0200====> second subscribeCallBack data:" + JSON.stringify(data)); - if(data.event == "ACTS_AppRecovery_Second") { - countSecond++; - flag=true; - if (data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"] == undefined) { - expect(true).assertTrue(); - } else { - expect(data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"]).assertFalse(); - } - if (countSecond == 2) { - commonEvent.unsubscribe(subscriber, unSubscribeCallback); - } - } - } - - function unSubscribeCallback() { - setTimeout(() => { - console.debug("Acts_AppRecovery_0200====> unSubscribeCallback"); - done(); - }, 800); - } - - setTimeout(()=>{ - if(flag==false){ - expect().assertFail(); - commonEvent.unsubscribe(subscriber, unSubscribeCallback); - } - },CASE_TIME_OUT) - }) - - /* - * @tc.number: Acts_AppRecovery_0300 - * @tc.name: Fault recovery of multi-Ability application - * @tc.desc: When the application setting restart recovery status is valid, exit the application by clearing the - * task list and do not restore the pre-failure state of the Ability application after the application - * restart. - */ - it('Acts_AppRecovery_0300',0, async function (done) { - let subscriber; - let flag = false; - console.info("Acts_AppRecovery_0300====> start") - commonEvent.createSubscriber(ACTS_AppRecovery).then(async (data) => { - console.debug("Acts_AppRecovery_0300====> Create Subscribe"); - subscriber = data; - commonEvent.subscribe(subscriber, subscribeCallBack); - globalThis.abilityContext.startAbility( - { - bundleName: "com.example.apprecoveryrely", - abilityName: "EntryAbility", - action: "Acts_AppRecovery_0300_once" - },(err)=>{ - console.debug("Acts_AppRecovery_0300====> startAbility err:"+JSON.stringify(err)); - expect(err.code).assertEqual(0); - }) - }) - function subscribeCallBack(err, data) { - console.debug("Acts_AppRecovery_0300====> subscribeCallBack data:" + JSON.stringify(data)); - if(data.event == "ACTS_AppRecovery_First") { - if (data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"] == undefined) { - expect(true).assertTrue(); - } else { - expect(data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"]).assertFalse(); - } - missionManager.getMissionInfos('', 1024, (err, missionInfos)=>{ - console.debug('Acts_AppRecovery_0300====> missionInfos: ' + JSON.stringify(missionInfos)); - console.debug('Acts_AppRecovery_0300====> missionInfos.length: ' + JSON.stringify(missionInfos.length)); - for (var i = 0; i < missionInfos.length; i++) { - if ((missionInfos[i].want.bundleName == "com.example.apprecoveryrely") - && (missionInfos[i].want.abilityName == "EntryAbility")) { - missionManager.clearMission(missionInfos[i].missionId, (err)=>{ - console.debug('Acts_AppRecovery_0300====> clearMission err: ' + JSON.stringify(err)); - }) - } - } - setTimeout(()=>{ - commonEvent.subscribe(subscriber, subscribeCallBackSecond); - globalThis.abilityContext.startAbility( - { - bundleName: "com.example.apprecoveryrely", - abilityName: "EntryAbility", - action: "Acts_AppRecovery_0300_twice" - }, (err) => { - console.debug("Acts_AppRecovery_0300====> second startAbility err:" + JSON.stringify(err)); - expect(err.code).assertEqual(0); - }) - }, 800) - }); - } - } - function subscribeCallBackSecond(err, data) { - console.debug("Acts_AppRecovery_0300====> second subscribeCallBack data:" + JSON.stringify(data)); - if(data.event == "ACTS_AppRecovery_Second") { - flag=true; - if (data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"] == undefined) { - expect(true).assertTrue(); - } else { - expect(data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"]).assertFalse(); - } - commonEvent.unsubscribe(subscriber, unSubscribeCallback); - } - } - function unSubscribeCallback() { - setTimeout(() => { - console.debug("Acts_AppRecovery_0300====> unSubscribeCallback"); - done(); - }, 800); - } - setTimeout(()=>{ - if(flag==false){ - expect().assertFail(); - commonEvent.unsubscribe(subscriber, unSubscribeCallback); - } - },CASE_TIME_OUT) - }) - - - /* - * @tc.number: Acts_AppRecovery_0400 - * @tc.name: Fault recovery of multi-Ability application - * @tc.desc: When the application setting restart recovery status is valid, exit the application by clearing the - * task list and do not restore the pre-failure state of the Ability application after the application - * restart. - */ - it('Acts_AppRecovery_0400',0, async function (done) { - let subscriber; - let flag = false; - let countFirst = 0; - let countSecond = 0; - console.info("Acts_AppRecovery_0400====> start") - commonEvent.createSubscriber(ACTS_AppRecovery).then(async (data) => { - console.debug("Acts_AppRecovery_0400====> Create Subscribe"); - subscriber = data; - commonEvent.subscribe(subscriber, subscribeCallBack); - globalThis.abilityContext.startAbility( - { - bundleName: "com.example.apprecoverysrely", - abilityName: "EntryAbility", - action: "Acts_AppRecovery_0400_once" - },(err)=>{ - console.debug("Acts_AppRecovery_0400====> startAbility err:"+JSON.stringify(err)); - expect(err.code).assertEqual(0); - }) - }) - function subscribeCallBack(err, data) { - console.debug("Acts_AppRecovery_0400====> subscribeCallBack data:" + JSON.stringify(data)); - if(data.event == "ACTS_AppRecovery_First") { - countFirst++; - if (data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"] == undefined) { - expect(true).assertTrue(); - } else { - expect(data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"]).assertFalse(); - } - if (countFirst < 2) { - return; - } - missionManager.getMissionInfos('', 1024, (err, missionInfos)=>{ - console.debug('Acts_AppRecovery_0400====> missionInfos: ' + JSON.stringify(missionInfos)); - console.debug('Acts_AppRecovery_0400====> missionInfos.length: ' + JSON.stringify(missionInfos.length)); - for (var i = 0; i < missionInfos.length; i++) { - if ((missionInfos[i].want.bundleName == "com.example.apprecoverysrely") - && ((missionInfos[i].want.abilityName == "EntryAbility") || - (missionInfos[i].want.abilityName == "EntryAbilitySec"))){ - missionManager.clearMission(missionInfos[i].missionId, (err)=>{ - console.debug('Acts_AppRecovery_0400====> clearMission err: ' + JSON.stringify(err)); - }) - } - } - setTimeout(()=>{ - commonEvent.subscribe(subscriber, subscribeCallBackSecond); - globalThis.abilityContext.startAbility( - { - bundleName: "com.example.apprecoverysrely", - abilityName: "EntryAbility", - action: "Acts_AppRecovery_0400_twice" - }, (err) => { - console.debug("Acts_AppRecovery_0400====> second startAbility err:" + JSON.stringify(err)); - expect(err.code).assertEqual(0); - }) - },800) - }); - } - } - function subscribeCallBackSecond(err, data) { - console.debug("Acts_AppRecovery_0400====> second subscribeCallBack data:" + JSON.stringify(data)); - if(data.event == "ACTS_AppRecovery_Second") { - countSecond++; - flag=true; - if (data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"] == undefined) { - expect(true).assertTrue(); - } else { - expect(data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"]).assertFalse(); - } - if (countSecond < 2) { - return; - } - commonEvent.unsubscribe(subscriber, unSubscribeCallback); - } - } - function unSubscribeCallback() { - setTimeout(() => { - console.debug("Acts_AppRecovery_0400====> unSubscribeCallback"); - done(); - }, 800); - } - setTimeout(()=>{ - if(flag==false){ - expect().assertFail(); - commonEvent.unsubscribe(subscriber, unSubscribeCallback); - } - },CASE_TIME_OUT) - }) - - /* - * @tc.number: Acts_AppRecovery_0700 - * @tc.name: Fault recovery of multi-Ability application - * @tc.desc: If the restart recovery status is not set, the Ability application pre-failure state will not be - * restored after the application exits abnormally and restarts. - */ - it('Acts_AppRecovery_0700',0, async function (done) { - let subscriber; - let flag = false; - console.info("Acts_AppRecovery_0700====> start") - commonEvent.createSubscriber(ACTS_AppRecovery).then(async (data) => { - console.debug("Acts_AppRecovery_0700====> Create Subscribe"); - subscriber = data; - commonEvent.subscribe(subscriber, subscribeCallBack); - globalThis.abilityContext.startAbility( - { - bundleName: "com.example.apprecoveryrely", - abilityName: "EntryAbility", - action: "Acts_AppRecovery_0700_once" - },(err)=>{ - console.debug("Acts_AppRecovery_0700====> startAbility err:"+JSON.stringify(err)); - expect(err.code).assertEqual(0); - }) - }) - - function subscribeCallBack(err, data) { - console.debug("Acts_AppRecovery_0700====> subscribeCallBack data:" + JSON.stringify(data)); - if(data.event == "ACTS_AppRecovery_First") { - if (data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"] == undefined) { - expect(true).assertTrue(); - } else { - expect(data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"]).assertFalse(); - } - setTimeout(()=>{ - commonEvent.subscribe(subscriber, subscribeCallBackSecond); - globalThis.abilityContext.startAbility( - { - bundleName: "com.example.apprecoveryrely", - abilityName: "EntryAbility", - action: "Acts_AppRecovery_0700_twice" - }, (err) => { - console.debug("Acts_AppRecovery_0700====> second startAbility err:" + JSON.stringify(err)); - expect(err.code).assertEqual(0); - }) - },800) - } - } - - function subscribeCallBackSecond(err, data) { - console.debug("Acts_AppRecovery_0700====> second subscribeCallBack data:" + JSON.stringify(data)); - if(data.event == "ACTS_AppRecovery_Second") { - flag=true; - if (data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"] == undefined) { - expect(true).assertTrue(); - } else { - expect(data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"]).assertFalse(); - } - commonEvent.unsubscribe(subscriber, unSubscribeCallback); - } - } - - function unSubscribeCallback() { - setTimeout(() => { - console.debug("Acts_AppRecovery_0700====> unSubscribeCallback"); - done(); - }, 800); - } - - setTimeout(()=>{ - if(flag==false){ - expect().assertFail(); - commonEvent.unsubscribe(subscriber, unSubscribeCallback); - } - },CASE_TIME_OUT) - }) - - /* - * @tc.number: Acts_AppRecovery_0800 - * @tc.name: Fault recovery of multi-Ability application - * @tc.desc: If the restart recovery status is not set, the Ability application pre-failure state will not be - * restored after the application exits abnormally and restarts. - */ - it('Acts_AppRecovery_0800',0, async function (done) { - let subscriber; - let flag = false; - let countFirst = 0; - let countSecond = 0; - console.info("Acts_AppRecovery_0800====> start") - commonEvent.createSubscriber(ACTS_AppRecovery).then(async (data) => { - console.debug("Acts_AppRecovery_0800====> Create Subscribe"); - subscriber = data; - commonEvent.subscribe(subscriber, subscribeCallBack); - globalThis.abilityContext.startAbility( - { - bundleName: "com.example.apprecoverysrely", - abilityName: "EntryAbility", - action: "Acts_AppRecovery_0800_once" - },(err)=>{ - console.debug("Acts_AppRecovery_0800====> startAbility err:"+JSON.stringify(err)); - expect(err.code).assertEqual(0); - }) - }) - - function subscribeCallBack(err, data) { - console.debug("Acts_AppRecovery_0800====> subscribeCallBack data:" + JSON.stringify(data)); - if(data.event == "ACTS_AppRecovery_First") { - countFirst++; - if (data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"] == undefined) { - expect(true).assertTrue(); - } else { - expect(data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"]).assertFalse(); - } - if (countFirst < 2) { - return; - } - setTimeout(() => { - commonEvent.subscribe(subscriber, subscribeCallBackSecond); - globalThis.abilityContext.startAbility( - { - bundleName: "com.example.apprecoverysrely", - abilityName: "EntryAbility", - action: "Acts_AppRecovery_0800_twice" - }, - (err) => { - console.debug("Acts_AppRecovery_0800====> second startAbility err:" + JSON.stringify(err)); - expect(err.code).assertEqual(0); - } - ); - }, 800); - } - } - - function subscribeCallBackSecond(err, data) { - console.debug("Acts_AppRecovery_0800====> second subscribeCallBack data:" + JSON.stringify(data)); - if(data.event == "ACTS_AppRecovery_Second") { - countSecond++; - flag=true; - if (data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"] == undefined) { - expect(true).assertTrue(); - } else { - expect(data.parameters.message["ohos.aafwk.param.AbilityRecoveryRestart"]).assertFalse(); - } - if (countSecond < 2) { - return; - } - commonEvent.unsubscribe(subscriber, unSubscribeCallback); - } - } - - function unSubscribeCallback() { - setTimeout(() => { - console.debug("Acts_AppRecovery_0800====> unSubscribeCallback"); - done(); - }, 800); - } - - setTimeout(()=>{ - if(flag==false){ - expect().assertFail(); - commonEvent.unsubscribe(subscriber, unSubscribeCallback); - } - },CASE_TIME_OUT) - }) - /* * @tc.number: Acts_AppRecovery_0900 * @tc.name: Fault recovery of multi-Ability application diff --git a/ability/ability_runtime/apprecovery/AppRecoveryRely/BUILD.gn b/ability/ability_runtime/apprecovery/AppRecoveryRely/BUILD.gn index 8883579348af26f8ae54854796fb997693973eaa..b9d8c2505d54997ee68f583fdfe1ff573c60bfbf 100644 --- a/ability/ability_runtime/apprecovery/AppRecoveryRely/BUILD.gn +++ b/ability/ability_runtime/apprecovery/AppRecoveryRely/BUILD.gn @@ -1,43 +1,43 @@ -# Copyright (c) 2023 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 +# Copyright (c) 2023 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_hap_assist_suite("AppRecoveryRely") { - hap_profile = "entry/src/main/module.json" - js_build_mode = "debug" - deps = [ - ":apprecoveryrely_js_assets", - ":apprecoveryrely_resources", - ] - ets2abc = true - certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "AppRecoveryRely" - subsystem_name = "ability" - part_name = "ability_runtime" -} - -ohos_app_scope("apprecoveryrely_app_profile") { - app_profile = "AppScope/app.json" - sources = [ "AppScope/resources" ] -} - -ohos_js_assets("apprecoveryrely_js_assets") { - source_dir = "entry/src/main/ets" -} - -ohos_resources("apprecoveryrely_resources") { - sources = [ "entry/src/main/resources" ] - deps = [ ":apprecoveryrely_app_profile" ] - hap_profile = "entry/src/main/module.json" -} + +import("//test/xts/tools/build/suite.gni") + +ohos_hap_assist_suite("AppRecoveryRely") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":apprecoveryrely_js_assets", + ":apprecoveryrely_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "AppRecoveryRely" + subsystem_name = "ability" + part_name = "ability_runtime" +} + +ohos_app_scope("apprecoveryrely_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("apprecoveryrely_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("apprecoveryrely_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":apprecoveryrely_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/ability/ability_runtime/apprecovery/AppRecoverysRely/BUILD.gn b/ability/ability_runtime/apprecovery/AppRecoverysRely/BUILD.gn index fc1998248a40f1fedacade2d9d40400d1b94582c..1ba1513ad43639dd71cb7f5164dd0e12ee34e798 100644 --- a/ability/ability_runtime/apprecovery/AppRecoverysRely/BUILD.gn +++ b/ability/ability_runtime/apprecovery/AppRecoverysRely/BUILD.gn @@ -1,42 +1,42 @@ -# Copyright (c) 2023 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_hap_assist_suite("AppRecoverysRely") { - hap_profile = "entry/src/main/module.json" - js_build_mode = "debug" - deps = [ - ":apprecoverysrely_js_assets", - ":apprecoverysrely_resources", - ] - ets2abc = true - certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "AppRecoverysRely" - subsystem_name = "ability" - part_name = "ability_runtime" -} - -ohos_app_scope("apprecoverysrely_app_profile") { - app_profile = "AppScope/app.json" - sources = [ "AppScope/resources" ] -} - -ohos_js_assets("apprecoverysrely_js_assets") { - source_dir = "entry/src/main/ets" -} - -ohos_resources("apprecoverysrely_resources") { - sources = [ "entry/src/main/resources" ] - deps = [ ":apprecoverysrely_app_profile" ] - hap_profile = "entry/src/main/module.json" -} +# Copyright (c) 2023 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_hap_assist_suite("AppRecoverysRely") { + hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + deps = [ + ":apprecoverysrely_js_assets", + ":apprecoverysrely_resources", + ] + ets2abc = true + certificate_profile = "signature/openharmony_sx.p7b" + hap_name = "AppRecoverysRely" + subsystem_name = "ability" + part_name = "ability_runtime" +} + +ohos_app_scope("apprecoverysrely_app_profile") { + app_profile = "AppScope/app.json" + sources = [ "AppScope/resources" ] +} + +ohos_js_assets("apprecoverysrely_js_assets") { + source_dir = "entry/src/main/ets" +} + +ohos_resources("apprecoverysrely_resources") { + sources = [ "entry/src/main/resources" ] + deps = [ ":apprecoverysrely_app_profile" ] + hap_profile = "entry/src/main/module.json" +} diff --git a/ability/ability_runtime/apprecovery/BUILD.gn b/ability/ability_runtime/apprecovery/BUILD.gn index 143feec3a9b6d537acd6977d9842fbd22e56e204..e9a8fcf0de7ba9e8f51458a75d692cb9d4aa465c 100644 --- a/ability/ability_runtime/apprecovery/BUILD.gn +++ b/ability/ability_runtime/apprecovery/BUILD.gn @@ -17,9 +17,9 @@ group("apprecovery") { testonly = true if (is_standard_system) { deps = [ + "ActsAppRecoveryTestCaller:ActsAppRecoveryTestCaller", "AppRecoveryRely:AppRecoveryRely", "AppRecoverysRely:AppRecoverysRely", - "ActsAppRecoveryTestCaller:ActsAppRecoveryTestCaller", ] } }