diff --git a/ability/ability_runtime/freeinstalltest/BUILD.gn b/ability/ability_runtime/freeinstalltest/BUILD.gn index 2553b8661cf4bc3d25283e28a9edd09227ac37eb..7afe0fa513611aea0314558808777abdc19418b7 100644 --- a/ability/ability_runtime/freeinstalltest/BUILD.gn +++ b/ability/ability_runtime/freeinstalltest/BUILD.gn @@ -17,6 +17,7 @@ group("freeinstalltest") { testonly = true if (is_standard_system) { deps = [ + "connectabilityfatest/actsfreeinstallconnectabilityfatest:ActsFreeInstallConnectAbilityFaTest", "connectabilityfatest/connectdifferentapplication:ConnectDifferentApplication", "connectabilityfatest/connectfamyapplication1:ConnectFaMyApplication1", "connectabilityfatest/connectfamyapplication10:ConnectFaMyApplication10", @@ -28,7 +29,7 @@ group("freeinstalltest") { "connectabilityfatest/connectfamyapplication7:ConnectFaMyApplication7", "connectabilityfatest/connectfamyapplication8:ConnectFaMyApplication8", "connectabilityfatest/connectfamyapplication9:ConnectFaMyApplication9", - "connectabilityfatest/freeinstallconnectabilityfatest:FreeInstallConnectAbilityFaTest", + "connectabilitystagetest/actsfreeinstallconnectabilitystagetest:ActsFreeInstallConnectAbilityStageTest", "connectabilitystagetest/connectstagemyapplication0:ConnectStageMyApplication0", "connectabilitystagetest/connectstagemyapplication1:ConnectStageMyApplication1", "connectabilitystagetest/connectstagemyapplication2:ConnectStageMyApplication2", @@ -38,34 +39,33 @@ group("freeinstalltest") { "connectabilitystagetest/connectstagemyapplication6:ConnectStageMyApplication6", "connectabilitystagetest/connectstagemyapplication7:ConnectStageMyApplication7", "connectabilitystagetest/connectstagemyapplication8:ConnectStageMyApplication8", - "connectabilitystagetest/freeinstallconnectabilitystagetest:FreeInstallConnectAbilityStageTest", "mockservice:MockService", "mockservicetimeout:MockServiceTimeout", + "startabilityfatest/actsfreeinstallstartabilityfatest:ActsFreeInstallStartAbilityFaTest", + "startabilityfatest/actsstartabilitynotargetbundlelistfatest:ActsStartAbilityNoTargetBundleListFaTest", "startabilityfatest/atomizationfaentry:AtomizationFaEntry", "startabilityfatest/atomizationfahm2:AtomizationFaHm2", "startabilityfatest/atomizationfahm4:AtomizationFaHm4", "startabilityfatest/famyapplication1:FaMyApplication1", - "startabilityfatest/freeinstallstartabilityfatest:FreeInstallStartAbilityFaTest", - "startabilityfatest/startabilitynotargetbundlelistfatest:StartAbilityNoTargetBundleListFaTest", + "startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest:ActsFreeInstallStartAbilityForResultFaTest", + "startabilityforresultfatest/actsstartabilityforresultnotargetfatest:ActsStartAbilityForResultNoTargetFaTest", "startabilityforresultfatest/atomizationresulta:AtomizationResultA", "startabilityforresultfatest/atomizationresultfaentry:AtomizationResultFaEntry", "startabilityforresultfatest/atomizationresultfahm1:AtomizationResultFaHm1", "startabilityforresultfatest/atomizationresultfahm2:AtomizationResultFaHm2", "startabilityforresultfatest/faresultmyapplication1:FaResultMyApplication1", - "startabilityforresultfatest/freeinstallstartabilityforresultfatest:FreeInstallStartAbilityForResultFaTest", - "startabilityforresultfatest/startabilityforresultnotargetfatest:StartAbilityForResultNoTargetFaTest", + "startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest:ActsFreeInstallStartAbilityForResultStageTest", + "startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest:ActsStartAbilityForResultNoTargetBundleListStageTest", "startabilityforresultstagetest/atomizationresultstageentry:AtomizationResultStageEntry", "startabilityforresultstagetest/atomizationresultstagehm2:AtomizationResultStageHm2", "startabilityforresultstagetest/atomizationresultstagehnm2:AtomizationResultStageHnm2", - "startabilityforresultstagetest/freeinstallstartabilityforresultstagetest:FreeInstallStartAbilityForResultStageTest", "startabilityforresultstagetest/stageresultmyapplication1:StageResultMyApplication1", - "startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest:StartAbilityForResultNoTargetBundleListStageTest", + "startabilitystagetest/actsfreeinstallstartabilitystagetest:ActsFreeInstallStartAbilityStageTest", + "startabilitystagetest/actsstartabilitynotargetbundleliststagetest:ActsStartAbilityNoTargetBundleListStageTest", "startabilitystagetest/atomizationstageentry:AtomizationStageEntry", "startabilitystagetest/atomizationstagehm2:AtomizationStageHm2", "startabilitystagetest/atomizationstagehm4:AtomizationStageHm4", - "startabilitystagetest/freeinstallstartabilitystagetest:FreeInstallStartAbilityStageTest", "startabilitystagetest/stagemyapplication1:StageMyApplication1", - "startabilitystagetest/startabilitynotargetbundleliststagetest:StartAbilityNoTargetBundleListStageTest", ] } } diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/BUILD.gn b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/BUILD.gn similarity index 72% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/BUILD.gn rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/BUILD.gn index f220be14067f7265ae3974515b2bee0dc2d09890..037f19180a747c59bc3f01c27622f869da65e2f9 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/BUILD.gn +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/BUILD.gn @@ -13,22 +13,22 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("FreeInstallStartAbilityFaTest") { +ohos_js_hap_suite("ActsFreeInstallConnectAbilityFaTest") { hap_profile = "./entry/src/main/config.json" deps = [ - ":freeinstallstartabilityfatest_ets_assets", - ":freeinstallstartabilityfatest_ets_resources", + ":actsfreeinstallconnectabilityfatest_ets_assets", + ":actsfreeinstallconnectabilityfatest_ets_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "FreeInstallStartAbilityFaTest" + hap_name = "ActsFreeInstallConnectAbilityFaTest" } -ohos_js_assets("freeinstallstartabilityfatest_ets_assets") { +ohos_js_assets("actsfreeinstallconnectabilityfatest_ets_assets") { source_dir = "./entry/src/main/ets" hap_profile = "entry/src/main/config.json" ets2abc = true } -ohos_resources("freeinstallstartabilityfatest_ets_resources") { +ohos_resources("actsfreeinstallconnectabilityfatest_ets_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" } diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/Test.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/Test.json similarity index 92% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/Test.json rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/Test.json index a473fdecb86d9fb6a6a7e26e8c0a3f380c010657..f546b6ba45da983cda3f2c768f4dbadc1971cdd2 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/Test.json +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/Test.json @@ -5,12 +5,13 @@ "test-timeout": "600000", "bundle-name": "com.example.myapplication.hmservice", "package-name": "com.example.myapplication", - "shell-timeout": "600000" + "shell-timeout": "600000", + "testcase-timeout": "10000" }, "kits": [ { "test-file-name": [ - "FreeInstallConnectAbilityFaTest.hap" + "ActsFreeInstallConnectAbilityFaTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/config.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/config.json rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/config.json diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/app.ets b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/app.ets rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/app.ets diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..71c6c129811f8ca20095f46164677fa274d74231 --- /dev/null +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/pages/index.ets @@ -0,0 +1,46 @@ +// @ts-nocheck +/** + * 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from "../test/List.test"; +@Entry +@Component +struct Index { + @State message: string = 'Hello World' + + aboutToAppear() { + console.info("aboutToAppear start!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + } + .height('100%') + } +} \ No newline at end of file diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets similarity index 99% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets index 5dd86d6ebb8fad9a9578ea6713243d760c5f86fb..6375de628759370602f21c70e52191cd229cb506 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets @@ -15,7 +15,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index" +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import rpc from '@ohos.rpc'; import featureAbility from '@ohos.ability.featureAbility'; import wantConstant from '@ohos.ability.wantConstant' diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest1.ets b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest1.ets similarity index 99% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest1.ets rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest1.ets index d3232ec906ff4fc9e8c3200ba1ef8992b465f8de..eac3752f2a06de7d4e49d17be6994e8a7fdb7be9 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest1.ets +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest1.ets @@ -15,7 +15,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index" +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import rpc from '@ohos.rpc'; import featureAbility from '@ohos.ability.featureAbility'; import wantConstant from '@ohos.ability.wantConstant' diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/List.test.ets b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/List.test.ets rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/connectAbilityTest_PA.ets b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/connectAbilityTest_PA.ets similarity index 99% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/connectAbilityTest_PA.ets rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/connectAbilityTest_PA.ets index 54120ab10b5a009f18e9c150f7427e78981a06a5..a5300a0f23f4b3368009daa71604380adda86682 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/connectAbilityTest_PA.ets +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/connectAbilityTest_PA.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index" +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import featureAbility from '@ohos.ability.featureAbility'; import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' import commonEvent from '@ohos.commonEvent'; diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility2/app.ets b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility2/app.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility2/app.ets rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility2/app.ets diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility2/pages/index.ets b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility2/pages/index.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility2/pages/index.ets rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility2/pages/index.ets diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility/service.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility/service.ts rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility/service.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility10/service.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility10/service.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility10/service.ts rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility10/service.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility11/service.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility11/service.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility11/service.ts rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility11/service.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility2/service.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility2/service.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility2/service.ts rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility2/service.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility3/service.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility3/service.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility3/service.ts rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility3/service.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility4/service.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility4/service.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility4/service.ts rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility4/service.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility5/service.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility5/service.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility5/service.ts rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility5/service.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility6/service.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility6/service.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility6/service.ts rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility6/service.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility7/service.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility7/service.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility7/service.ts rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility7/service.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility8/service.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility8/service.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility8/service.ts rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility8/service.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility9/service.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility9/service.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility9/service.ts rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/ServiceAbility9/service.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts similarity index 98% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts index 3134bf3aca18a39ba3111efebcfe082ca2343dfe..d85e64c4e36b63105278fed2300e417530d45802 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -23,7 +23,7 @@ function translateParamsToString(parameters) { const keySet = new Set([ '-s class', '-s notClass', '-s suite', '-s itName', '-s level', '-s testType', '-s size', '-s timeout', - '-s package' + '-s package','-s dryRun' ]) let targetParams = ''; for (const key in parameters) { diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/resources/base/media/icon.png rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/resources/base/media/icon.png diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/signature/openharmony_sx.p7b b/ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/signature/openharmony_sx.p7b similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/signature/openharmony_sx.p7b rename to ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/signature/openharmony_sx.p7b diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/pages/index.ets deleted file mode 100644 index 3efa07583577fab3dd6f797ee79a54a474983d8f..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/pages/index.ets +++ /dev/null @@ -1,63 +0,0 @@ -// @ts-nocheck -/** - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import file from '@system.file'; -import {Core, ExpectExtend, ReportExtend} from "deccjsunit/index.ets"; -import testsuite from "../test/List.test"; -import featureAbility from "@ohos.ability.featureAbility"; -@Entry -@Component -struct Index { - @State message: string = 'Hello World' - - aboutToAppear() { - console.info("start run testcase!!!!") - featureAbility.getWant() - .then((Want) => { - 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(Want.parameters)); - Want.parameters.timeout = 10000; - configService.setConfig(Want.parameters); - testsuite(); - core.execute(); - console.info('Operation successful. Data: ' + JSON.stringify(Want)); - }) - .catch((error) => { - console.error('Operation failed. Cause: ' + JSON.stringify(error)); - }) - } - - build() { - Row() { - Column() { - Text(this.message) - .fontSize(50) - .fontWeight(FontWeight.Bold) - } - .width('100%') - } - .height('100%') - } -} \ No newline at end of file diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/AppScope/app.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/AppScope/app.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/AppScope/app.json rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/AppScope/app.json diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/AppScope/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/AppScope/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/AppScope/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/AppScope/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/AppScope/resources/base/media/app_icon.png b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/AppScope/resources/base/media/app_icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/AppScope/resources/base/media/app_icon.png rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/AppScope/resources/base/media/app_icon.png diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/BUILD.gn b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/BUILD.gn similarity index 66% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/BUILD.gn rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/BUILD.gn index 0d2ef9be2ff9b7185f6f9668aab1d1a8fa7e1ecc..357cdd42a9af05ebe00a3d87894d4eac1346bef4 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/BUILD.gn +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/BUILD.gn @@ -13,29 +13,29 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("FreeInstallStartAbilityStageTest") { +ohos_js_hap_suite("ActsFreeInstallConnectAbilityStageTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ - ":freeinstallstartabilitystagetest_js_assets", - ":freeinstallstartabilitystagetest_resources", + ":actsfreeinstallconnectabilitystagetest_js_assets", + ":actsfreeinstallconnectabilitystagetest_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "FreeInstallStartAbilityStageTest" + hap_name = "ActsFreeInstallConnectAbilityStageTest" } -ohos_app_scope("freeinstallstartabilitystagetest_app_profile") { +ohos_app_scope("actsfreeinstallconnectabilitystagetest_app_profile") { app_profile = "AppScope/app.json" sources = [ "AppScope/resources" ] } -ohos_js_assets("freeinstallstartabilitystagetest_js_assets") { +ohos_js_assets("actsfreeinstallconnectabilitystagetest_js_assets") { source_dir = "entry/src/main/ets" } -ohos_resources("freeinstallstartabilitystagetest_resources") { +ohos_resources("actsfreeinstallconnectabilitystagetest_resources") { sources = [ "entry/src/main/resources" ] - deps = [ ":freeinstallstartabilitystagetest_app_profile" ] + deps = [ ":actsfreeinstallconnectabilitystagetest_app_profile" ] hap_profile = "entry/src/main/module.json" } diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/Test.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/Test.json similarity index 92% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/Test.json rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/Test.json index 0a6ab9cd2f995e2db5a19804d3b76951d87eebea..fb80657451240e232a3db02b2579135a3d737a88 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/Test.json +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/Test.json @@ -5,12 +5,13 @@ "test-timeout": "600000", "bundle-name": "com.example.myapplication.hmservice", "module-name": "entry", - "shell-timeout": "600000" + "shell-timeout": "600000", + "testcase-timeout": "60000" }, "kits": [ { "test-file-name": [ - "FreeInstallConnectAbilityStageTest.hap" + "ActsFreeInstallConnectAbilityStageTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/MainAbility2/MainAbility2.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/MainAbility2/MainAbility2.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/MainAbility2/MainAbility2.ts rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/MainAbility2/MainAbility2.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility2/ServiceAbility2.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility3/ServiceAbility3.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility3/ServiceAbility3.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility3/ServiceAbility3.ts rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility3/ServiceAbility3.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility4/ServiceAbility4.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility4/ServiceAbility4.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility4/ServiceAbility4.ts rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility4/ServiceAbility4.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility5/ServiceAbility5.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility5/ServiceAbility5.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility5/ServiceAbility5.ts rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility5/ServiceAbility5.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility6/ServiceAbility6.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility6/ServiceAbility6.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility6/ServiceAbility6.ts rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility6/ServiceAbility6.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility7/ServiceAbility7.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility7/ServiceAbility7.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility7/ServiceAbility7.ts rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility7/ServiceAbility7.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility8/ServiceAbility8.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility8/ServiceAbility8.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility8/ServiceAbility8.ts rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility8/ServiceAbility8.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility9/ServiceAbility9.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility9/ServiceAbility9.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility9/ServiceAbility9.ts rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/ServiceAbility9/ServiceAbility9.ts diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts similarity index 97% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts index ec20fc0823ea020a5e20468f96d136147dd3a2b8..28b63ae323260a1c50537460cc23308796714f81 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -22,7 +22,7 @@ var abilityDelegatorArguments = undefined function translateParamsToString(parameters) { const keySet = new Set([ '-s class', '-s notClass', '-s suite', '-s it', - '-s level', '-s testType', '-s size', '-s timeout' + '-s level', '-s testType', '-s size', '-s timeout','-s dryRun' ]) let targetParams = ''; for (const key in parameters) { diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/pages/index.ets similarity index 57% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/pages/index.ets rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/pages/index.ets index 1c3a4da0ee43f97df122a059f5bff0ad6e86ae93..9f1d4ceb5aeab5ebee551ff485cc741c02601572 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/pages/index.ets @@ -14,29 +14,22 @@ */ // @ts-nocheck -import file from '@system.file'; -import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index.ets" -import List from '../test/ListTest' +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../test/ListTest' + @Entry @Component struct Index { @State message: string = 'Hello World' 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(); - globalThis.abilityWant.parameters.timeout = 60000; - core.subscribeEvent('task', reportExtend); - const configService = core.getDefaultService('config'); - configService.setConfig(globalThis.abilityWant.parameters); - List(globalThis.abilityContext); - core.execute(); + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) } build() { diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/pages/index2.ets b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/pages/index2.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/pages/index2.ets rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/pages/index2.ets diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets similarity index 99% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets index 8770453e8b42bb31f4ee9f16cfd4c7e56cead323..51f4370a758a52d5d7a824fa1e22ca028d98198e 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest.ets @@ -15,7 +15,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index" +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import rpc from '@ohos.rpc'; import wantConstant from '@ohos.ability.wantConstant' import Prompt from '@system.prompt'; diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest_Ext.ets b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest_Ext.ets similarity index 99% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest_Ext.ets rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest_Ext.ets index fdcda47764b58703e9153d24752b76187b8bfe71..73353fe6e1467d962b4883be1f906d4c144748ee 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest_Ext.ets +++ b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest_Ext.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index" +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import commonEvent from '@ohos.commonEvent'; export default function ConnectAbilityTest_Ext(abilityContext) { diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/test/ListTest.ets b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ListTest.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/ets/test/ListTest.ets rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ListTest.ets diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/module.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/module.json rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/module.json diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/resources/base/media/icon.png rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/resources/base/media/icon.png diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/entry/src/main/resources/base/profile/main_pages.json rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/resources/base/profile/main_pages.json diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/signature/openharmony_sx.p7b b/ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/signature/openharmony_sx.p7b similarity index 100% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/signature/openharmony_sx.p7b rename to ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/signature/openharmony_sx.p7b diff --git a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/BUILD.gn b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/BUILD.gn similarity index 73% rename from ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/BUILD.gn rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/BUILD.gn index d15d2df4219daa703f0f69420f1e8fc001ff23d2..ea23eb9998dad49b339fc9aaea6f93dacacf9033 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilityfatest/freeinstallconnectabilityfatest/BUILD.gn +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/BUILD.gn @@ -13,22 +13,22 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("FreeInstallConnectAbilityFaTest") { +ohos_js_hap_suite("ActsFreeInstallStartAbilityFaTest") { hap_profile = "./entry/src/main/config.json" deps = [ - ":freeinstallconnectabilityfatest_ets_assets", - ":freeinstallconnectabilityfatest_ets_resources", + ":actsfreeinstallstartabilityfatest_ets_assets", + ":actsfreeinstallstartabilityfatest_ets_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "FreeInstallConnectAbilityFaTest" + hap_name = "ActsFreeInstallStartAbilityFaTest" } -ohos_js_assets("freeinstallconnectabilityfatest_ets_assets") { +ohos_js_assets("actsfreeinstallstartabilityfatest_ets_assets") { source_dir = "./entry/src/main/ets" hap_profile = "entry/src/main/config.json" ets2abc = true } -ohos_resources("freeinstallconnectabilityfatest_ets_resources") { +ohos_resources("actsfreeinstallstartabilityfatest_ets_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" } diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/Test.json b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/Test.json similarity index 89% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/Test.json rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/Test.json index 49286efd7644c24254bf06aca3ab24cd33ca4e6c..bc361d1e6227f117f7371775fc144881425fbb50 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/Test.json +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/Test.json @@ -5,12 +5,13 @@ "test-timeout": "600000", "bundle-name": "com.open.harmony.startAbility", "package-name": "com.open.harmony.startAbility", - "shell-timeout": "600000" + "shell-timeout": "600000", + "testcase-timeout": "50000" }, "kits": [ { "test-file-name": [ - "FreeInstallStartAbilityFaTest.hap" + "ActsFreeInstallStartAbilityFaTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/config.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/config.json rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/config.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/app.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/app.ets rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/app.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/pages/index.ets similarity index 61% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/pages/index.ets rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/pages/index.ets index 8800e52414c0cd250b0db931fba3d789f8bd9db3..60d7d89b364c39e6d2b1920c684793bd6f00b6c8 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/pages/index.ets @@ -17,7 +17,8 @@ import router from '@system.router'; import file from '@system.file'; -import {Core, ExpectExtend, InstrumentLog, ReportExtend,expect} from "deccjsunit/index"; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' import testsuite from "../test/List.test"; import featureAbility from "@ohos.ability.featureAbility"; @@ -36,29 +37,13 @@ async function routePage() { @Component struct Index { aboutToAppear() { - console.info("start run testcase!!!!") - featureAbility.getWant() - .then((Want) => { - 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(); - Want.parameters.timeout = 50000; - core.subscribeEvent('task', reportExtend); - const configService = core.getDefaultService('config'); - console.info('parameters---->' + JSON.stringify(Want.parameters)); - configService.setConfig(Want.parameters); - testsuite(); - core.execute(); - console.info('Operation successful. Data: ' + JSON.stringify(Want)); - }) - .catch((error) => { - console.error('Operation failed. Cause: ' + JSON.stringify(error)); - }) + console.info("aboutToAppear start!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) } build() { diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/List.test.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/List.test.ets rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets similarity index 94% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets index f21da957daa2d35375368ecb7c306c7ca589b90e..94a1b7f5e3884bf5a8c9b75d5461d77c4ce1443b 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index"; +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium"; import featureAbility from "@ohos.ability.featureAbility"; import wantConstant from '@ohos.ability.wantConstant'; import abilityManager from '@ohos.application.abilityManager'; @@ -543,72 +543,6 @@ export default function startAbilityTest() { done(); }); - /* - * @tc.number FreeInstall_FA_Local_StartAbility_1300 - * @tc.name Flags= '94.31' of the incoming error. There is a hap package that - needs to be installed free under the specified path - * @tc.desc Function test - * @tc.level 0 - */ - it("FreeInstall_FA_Local_StartAbility_1300", 0, async function (done) { - console.info("------------start FreeInstall_FA_Local_StartAbility_1300-------------"); - TAG = "FreeInstall_FA_Local_StartAbility_1300"; - let wrong; - var str = { - 'want': { - "bundleName": "com.example.qianyiyingyong.hmservice", - "abilityName": "com.example.qianyiyingyong.MainAbility", - "moduleName": "entry", - "flags": 94.31 - } - } - await featureAbility.startAbility(str).then((data) => { - console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); - }).catch((error) => { - wrong = error; - console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); - }); - await sleep(2000); - expect(wrong.code).assertEqual(1); - console.info("------------end FreeInstall_FA_Local_StartAbility_1300-------------"); - done(); - }); - - /* - * @tc.number FreeInstall_FA_Local_StartAbility_1400 - * @tc.name Flags= '94.31' of incoming error, atomized HAP package installed - * @tc.desc Function test - * @tc.level 0 - */ - it("FreeInstall_FA_Local_StartAbility_1400", 0, async function (done) { - console.info("------------start FreeInstall_FA_Local_StartAbility_1400-------------"); - TAG = "FreeInstall_FA_Local_StartAbility_1400"; - var cmd1400 = "bm install -p data/test/AtomizationFaEntry.hap"; - delegator.executeShellCommand(cmd1400, (err: any, d: any) => { - console.info("executeShellCommand : err : " + JSON.stringify(err), " data : " + JSON.stringify(d)); - }) - await sleep(500); - let details; - var str = { - 'want': { - "bundleName": "com.example.qianyiyingyong.hmservice", - "abilityName": "com.example.qianyiyingyong.MainAbility", - "moduleName": "entry", - "flags": 94.31 - } - } - await featureAbility.startAbility(str).then((data) => { - details = data; - console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); - }).catch((error) => { - console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); - }); - await sleep(2000); - expect(details).assertEqual(0); - console.info("------------end FreeInstall_FA_Local_StartAbility_1400-------------"); - done(); - }); - /* * @tc.number FreeInstall_FA_Local_StartAbility_1500 * @tc.name Flags= '' of the incoming error. There is a hap package that needs to be diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test2.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test2.ets similarity index 99% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test2.ets rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test2.ets index eedbb2ed68075a2777e75c60072a1eb7999d2c86..5520cafb598681e15e1865a692ab3625e1010040 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test2.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/StartAbility.test2.ets @@ -15,7 +15,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index"; +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium"; import featureAbility from "@ohos.ability.featureAbility"; import wantConstant from '@ohos.ability.wantConstant'; import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/Utils.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/Utils.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/Utils.ets rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/MainAbility/test/Utils.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/PageAbility/app.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/PageAbility/app.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/PageAbility/app.ets rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/PageAbility/app.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/PageAbility/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/PageAbility/pages/index.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/PageAbility/pages/index.ets rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/PageAbility/pages/index.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/ServiceAbility/service.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/ServiceAbility/service.ts rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/ServiceAbility/service.ts diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts similarity index 98% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts index f9e8ab66979f59c8109f65c8f2a4f21867fbf44b..06bbc557648940a5153e04c9e584043474ab2a9c 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -23,7 +23,7 @@ function translateParamsToString(parameters) { const keySet = new Set([ '-s class', '-s notClass', '-s suite', '-s itName', '-s level', '-s testType', '-s size', '-s timeout', - '-s package' + '-s package','-s dryRun' ]) let targetParams = ''; for (const key in parameters) { diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/resources/base/media/icon.png rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/entry/src/main/resources/base/media/icon.png diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/signature/openharmony_sx.p7b b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/signature/openharmony_sx.p7b similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/signature/openharmony_sx.p7b rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/signature/openharmony_sx.p7b diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/BUILD.gn b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/BUILD.gn similarity index 70% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/BUILD.gn rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/BUILD.gn index 93e0276d9f4aa1bbf25dc7ed73612e1150e97a0b..57e0a685b85e3039da5048a950b2be8141a1f9a6 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/BUILD.gn +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/BUILD.gn @@ -13,20 +13,20 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("StartAbilityNoTargetBundleListFaTest") { +ohos_js_hap_suite("ActsStartAbilityNoTargetBundleListFaTest") { hap_profile = "./entry/src/main/config.json" deps = [ - ":startabilitynotargetbundlelistfatest_ets_assets", - ":startabilitynotargetbundlelistfatest_ets_resources", + ":actsstartabilitynotargetbundlelistfatest_ets_assets", + ":actsstartabilitynotargetbundlelistfatest_ets_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "StartAbilityNoTargetBundleListFaTest" + hap_name = "ActsStartAbilityNoTargetBundleListFaTest" } -ohos_js_assets("startabilitynotargetbundlelistfatest_ets_assets") { +ohos_js_assets("actsstartabilitynotargetbundlelistfatest_ets_assets") { source_dir = "./entry/src/main/ets/MainAbility" } -ohos_resources("startabilitynotargetbundlelistfatest_ets_resources") { +ohos_resources("actsstartabilitynotargetbundlelistfatest_ets_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" } diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/Test.json b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/Test.json similarity index 87% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/Test.json rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/Test.json index 7492f13e4af6dc4a96a3ffb644f201c300b141f4..8942283b10dc138a43019cf479d0bf4676aa8a2e 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/Test.json +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/Test.json @@ -5,12 +5,13 @@ "test-timeout": "600000", "bundle-name": "com.open.harmony.startAbility", "package-name": "com.open.harmony.startAbility", - "shell-timeout": "600000" + "shell-timeout": "600000", + "testcase-timeout": "50000" }, "kits": [ { "test-file-name": [ - "StartAbilityNoTargetBundleListFaTest.hap" + "ActsStartAbilityNoTargetBundleListFaTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/config.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/config.json rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/config.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/app.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/app.ets rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/app.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/pages/index.ets similarity index 61% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/pages/index.ets rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/pages/index.ets index ea2b35a8c128f57ac266544e7b09a8b8578e5889..b2f7c90c1f99badee175828cce3b78984ddb8aa4 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/pages/index.ets @@ -17,7 +17,8 @@ import router from '@system.router'; import file from '@system.file'; -import {Core, ExpectExtend, InstrumentLog, ReportExtend,expect} from "deccjsunit/index"; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' import testsuite from "../test/List.test"; import featureAbility from "@ohos.ability.featureAbility"; @@ -36,29 +37,13 @@ async function routePage() { @Component struct Index { aboutToAppear() { - console.info("start run testcase!!!!") - featureAbility.getWant() - .then((Want) => { - 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(); - Want.parameters.timeout = 50000; - core.subscribeEvent('task', reportExtend); - const configService = core.getDefaultService('config'); - console.info('parameters---->' + JSON.stringify(Want.parameters)); - configService.setConfig(Want.parameters); - testsuite(); - core.execute(); - console.info('Operation successful. Data: ' + JSON.stringify(Want)); - }) - .catch((error) => { - console.error('Operation failed. Cause: ' + JSON.stringify(error)); - }) + console.info("aboutToAppear start!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) } build() { diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/List.test.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/List.test.ets rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets similarity index 99% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets index 2c70731d91551d55b06a53b62180b6c0ce070d9d..7b12f12ab40b4f04131c8bd4f025a4284131e11a 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/StartAbility.test.ets @@ -15,7 +15,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index"; +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium"; import Utils from './Utils'; import featureAbility from "@ohos.ability.featureAbility"; import wantConstant from '@ohos.ability.wantConstant'; diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/Utils.ets b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/Utils.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/Utils.ets rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/MainAbility/test/Utils.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts similarity index 98% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts index f9e8ab66979f59c8109f65c8f2a4f21867fbf44b..06bbc557648940a5153e04c9e584043474ab2a9c 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -23,7 +23,7 @@ function translateParamsToString(parameters) { const keySet = new Set([ '-s class', '-s notClass', '-s suite', '-s itName', '-s level', '-s testType', '-s size', '-s timeout', - '-s package' + '-s package','-s dryRun' ]) let targetParams = ''; for (const key in parameters) { diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/resources/base/media/icon.png rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/entry/src/main/resources/base/media/icon.png diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/signature/openharmony_sx.p7b b/ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/signature/openharmony_sx.p7b similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/signature/openharmony_sx.p7b rename to ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/signature/openharmony_sx.p7b diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/BUILD.gn b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/BUILD.gn similarity index 69% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/BUILD.gn rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/BUILD.gn index b3f3f8a5ff3c3781604897540136b84c1ec3b5ba..9903d7a39fbe4eb66bed2cce5a12d7cc68eea54f 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/BUILD.gn +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/BUILD.gn @@ -13,20 +13,20 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("FreeInstallStartAbilityForResultFaTest") { +ohos_js_hap_suite("ActsFreeInstallStartAbilityForResultFaTest") { hap_profile = "./entry/src/main/config.json" deps = [ - ":freeinstallstartabilityforresultfatest_ets_assets", - ":freeinstallstartabilityforresultfatest_ets_resources", + ":actsfreeinstallstartabilityforresultfatest_ets_assets", + ":actsfreeinstallstartabilityforresultfatest_ets_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "FreeInstallStartAbilityForResultFaTest" + hap_name = "ActsFreeInstallStartAbilityForResultFaTest" } -ohos_js_assets("freeinstallstartabilityforresultfatest_ets_assets") { +ohos_js_assets("actsfreeinstallstartabilityforresultfatest_ets_assets") { source_dir = "./entry/src/main/ets/MainAbility" } -ohos_resources("freeinstallstartabilityforresultfatest_ets_resources") { +ohos_resources("actsfreeinstallstartabilityforresultfatest_ets_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" } diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/Test.json b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/Test.json similarity index 89% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/Test.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/Test.json index d78670e9c553fa0c3028d9310d1eb8111a6f2096..b7ed08ebb5437bc1b8398a30442d82f9da3e71a1 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/Test.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/Test.json @@ -5,12 +5,13 @@ "test-timeout": "600000", "bundle-name": "com.open.harmony.startAbilityForResult", "package-name": "com.open.harmony.startAbilityForResult", - "shell-timeout": "600000" + "shell-timeout": "600000", + "testcase-timeout": "50000" }, "kits": [ { "test-file-name": [ - "FreeInstallStartAbilityForResultFaTest.hap" + "ActsFreeInstallStartAbilityForResultFaTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/config.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/config.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/config.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/app.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/app.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/app.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/pages/index.ets similarity index 61% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/pages/index.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/pages/index.ets index bfec465ee4537e893285030f9b1113f3b6272376..2fb0fdf90bd41c7ded1e7b863c96947703d0d297 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/pages/index.ets @@ -17,7 +17,8 @@ import router from '@system.router'; import file from '@system.file'; -import {Core, ExpectExtend, InstrumentLog, ReportExtend,expect} from "deccjsunit/index"; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' import testsuite from "../test/List.test"; import featureAbility from "@ohos.ability.featureAbility"; @@ -36,29 +37,13 @@ async function routePage() { @Component struct Index { aboutToAppear() { - console.info("start run testcase!!!!") - featureAbility.getWant() - .then((Want) => { - 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(); - Want.parameters.timeout = 50000; - core.subscribeEvent('task', reportExtend); - const configService = core.getDefaultService('config'); - console.info('parameters---->' + JSON.stringify(Want.parameters)); - configService.setConfig(Want.parameters); - testsuite(); - core.execute(); - console.info('Operation successful. Data: ' + JSON.stringify(Want)); - }) - .catch((error) => { - console.error('Operation failed. Cause: ' + JSON.stringify(error)); - }) + console.info("aboutToAppear start!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) } build() { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/List.test.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/List.test.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult.test.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult.test.ets similarity index 99% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult.test.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult.test.ets index 660389022af82768af49639c62bd9e58fd1f5cbd..721bc3f77cff4306e122ac3430c1b0b34ca75b5c 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult.test.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult.test.ets @@ -16,7 +16,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index"; +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium"; import Utils from './Utils'; import featureAbility from "@ohos.ability.featureAbility"; import wantConstant from '@ohos.ability.wantConstant'; diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult2.test.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult2.test.ets similarity index 99% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult2.test.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult2.test.ets index 176ca0d7e692cc4e71f98e5136601d55b332c7f1..589c442c1c8d16eecb5bae91517d674d417383d9 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult2.test.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult2.test.ets @@ -16,7 +16,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index"; +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium"; import Utils from './Utils'; import featureAbility from "@ohos.ability.featureAbility"; import wantConstant from '@ohos.ability.wantConstant'; diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/Utils.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/Utils.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/Utils.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/MainAbility/test/Utils.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/PageAbility/app.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/PageAbility/app.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/PageAbility/app.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/PageAbility/app.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/PageAbility/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/PageAbility/pages/index.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/ets/PageAbility/pages/index.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/PageAbility/pages/index.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts similarity index 98% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts index f9e8ab66979f59c8109f65c8f2a4f21867fbf44b..06bbc557648940a5153e04c9e584043474ab2a9c 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/freeinstallstartabilityfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -23,7 +23,7 @@ function translateParamsToString(parameters) { const keySet = new Set([ '-s class', '-s notClass', '-s suite', '-s itName', '-s level', '-s testType', '-s size', '-s timeout', - '-s package' + '-s package','-s dryRun' ]) let targetParams = ''; for (const key in parameters) { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/entry/src/main/resources/base/media/icon.png rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/entry/src/main/resources/base/media/icon.png diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/signature/openharmony_sx.p7b b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/signature/openharmony_sx.p7b similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/freeinstallstartabilityforresultfatest/signature/openharmony_sx.p7b rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/signature/openharmony_sx.p7b diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/BUILD.gn b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/BUILD.gn similarity index 70% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/BUILD.gn rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/BUILD.gn index 01e6284e03dbb6b9619971b781abca95b8af0a8c..cb02443e2272482f3dc7fe402c885e5322bd05fb 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/BUILD.gn +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/BUILD.gn @@ -13,20 +13,20 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("StartAbilityForResultNoTargetFaTest") { +ohos_js_hap_suite("ActsStartAbilityForResultNoTargetFaTest") { hap_profile = "./entry/src/main/config.json" deps = [ - ":startabilityforresultnotargetfatest_ets_assets", - ":startabilityforresultnotargetfatest_ets_resources", + ":actsstartabilityforresultnotargetfatest_ets_assets", + ":actsstartabilityforresultnotargetfatest_ets_resources", ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "StartAbilityForResultNoTargetFaTest" + hap_name = "ActsStartAbilityForResultNoTargetFaTest" } -ohos_js_assets("startabilityforresultnotargetfatest_ets_assets") { +ohos_js_assets("actsstartabilityforresultnotargetfatest_ets_assets") { source_dir = "./entry/src/main/ets/MainAbility" } -ohos_resources("startabilityforresultnotargetfatest_ets_resources") { +ohos_resources("actsstartabilityforresultnotargetfatest_ets_resources") { sources = [ "./entry/src/main/resources" ] hap_profile = "./entry/src/main/config.json" } diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/Test.json b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/Test.json similarity index 87% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/Test.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/Test.json index 723dee8a530c69145e443e0876597486f36ac2ef..fed0246236522d2eb1f980796a3d4d884034ae84 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/Test.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/Test.json @@ -5,12 +5,13 @@ "test-timeout": "600000", "bundle-name": "com.open.harmony.startAbilityForResult", "package-name": "com.open.harmony.startAbilityForResult", - "shell-timeout": "600000" + "shell-timeout": "600000", + "testcase-timeout": "50000" }, "kits": [ { "test-file-name": [ - "StartAbilityForResultNoTargetFaTest.hap" + "ActsStartAbilityForResultNoTargetFaTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/config.json b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/config.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/config.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/config.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/app.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/app.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/app.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/pages/index.ets similarity index 61% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/pages/index.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/pages/index.ets index a422068c451a77f4a692c79937c7f49c83d1abc4..8d2b19fc51126b4a1da925cab9f31d921d252956 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/pages/index.ets @@ -17,7 +17,8 @@ import router from '@system.router'; import file from '@system.file'; -import {Core, ExpectExtend, InstrumentLog, ReportExtend,expect} from "deccjsunit/index"; +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' import testsuite from "../test/List.test"; import featureAbility from "@ohos.ability.featureAbility"; @@ -36,29 +37,13 @@ async function routePage() { @Component struct Index { aboutToAppear() { - console.info("start run testcase!!!!") - featureAbility.getWant() - .then((Want) => { - 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(); - Want.parameters.timeout = 50000; - core.subscribeEvent('task', reportExtend); - const configService = core.getDefaultService('config'); - console.info('parameters---->' + JSON.stringify(Want.parameters)); - configService.setConfig(Want.parameters); - testsuite(); - core.execute(); - console.info('Operation successful. Data: ' + JSON.stringify(Want)); - }) - .catch((error) => { - console.error('Operation failed. Cause: ' + JSON.stringify(error)); - }) + console.info("aboutToAppear start!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) } build() { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/List.test.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/List.test.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult.test.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult.test.ets similarity index 99% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult.test.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult.test.ets index fb8422c23cdb7749f176fb52e7418c43abb4c85e..22fcd645c35315ad3119043d6a210c14f7a1c7fe 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult.test.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/StartAbilityForResult.test.ets @@ -15,7 +15,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index"; +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium"; import Utils from './Utils'; import featureAbility from "@ohos.ability.featureAbility"; import wantConstant from '@ohos.ability.wantConstant'; diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/Utils.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/Utils.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/Utils.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/MainAbility/test/Utils.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts similarity index 98% rename from ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts index f9e8ab66979f59c8109f65c8f2a4f21867fbf44b..06bbc557648940a5153e04c9e584043474ab2a9c 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityfatest/startabilitynotargetbundlelistfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -23,7 +23,7 @@ function translateParamsToString(parameters) { const keySet = new Set([ '-s class', '-s notClass', '-s suite', '-s itName', '-s level', '-s testType', '-s size', '-s timeout', - '-s package' + '-s package','-s dryRun' ]) let targetParams = ''; for (const key in parameters) { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/entry/src/main/resources/base/media/icon.png rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/entry/src/main/resources/base/media/icon.png diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/signature/openharmony_sx.p7b b/ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/signature/openharmony_sx.p7b similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultfatest/startabilityforresultnotargetfatest/signature/openharmony_sx.p7b rename to ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/signature/openharmony_sx.p7b diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/AppScope/app.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/AppScope/app.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/AppScope/app.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/AppScope/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/AppScope/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/AppScope/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/AppScope/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/AppScope/resources/base/media/app_icon.png b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/AppScope/resources/base/media/app_icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/AppScope/resources/base/media/app_icon.png rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/AppScope/resources/base/media/app_icon.png diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/BUILD.gn b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/BUILD.gn similarity index 64% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/BUILD.gn rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/BUILD.gn index bf71f89abdb435398f7f9192c6ac99c401995246..af7a9fa4dc66a8111ce2e9b0b476810e4961dad9 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/BUILD.gn +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/BUILD.gn @@ -13,29 +13,29 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("StartAbilityNoTargetBundleListStageTest") { +ohos_js_hap_suite("ActsFreeInstallStartAbilityForResultStageTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ - ":startabilitynotargetbundleliststagetest_js_assets", - ":startabilitynotargetbundleliststagetest_resources", + ":actsfreeinstallstartabilityforresultstagetest_js_assets", + ":actsfreeinstallstartabilityforresultstagetest_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "StartAbilityNoTargetBundleListStageTest" + hap_name = "ActsFreeInstallStartAbilityForResultStageTest" } -ohos_app_scope("startabilitynotargetbundleliststagetest_app_profile") { +ohos_app_scope("actsfreeinstallstartabilityforresultstagetest_app_profile") { app_profile = "AppScope/app.json" sources = [ "AppScope/resources" ] } -ohos_js_assets("startabilitynotargetbundleliststagetest_js_assets") { +ohos_js_assets("actsfreeinstallstartabilityforresultstagetest_js_assets") { source_dir = "entry/src/main/ets" } -ohos_resources("startabilitynotargetbundleliststagetest_resources") { +ohos_resources("actsfreeinstallstartabilityforresultstagetest_resources") { sources = [ "entry/src/main/resources" ] - deps = [ ":startabilitynotargetbundleliststagetest_app_profile" ] + deps = [ ":actsfreeinstallstartabilityforresultstagetest_app_profile" ] hap_profile = "entry/src/main/module.json" } diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/Test.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/Test.json similarity index 88% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/Test.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/Test.json index e2cfccad122c9463966476f1d1af1202a9c805cf..678e61d1fd4798a002495bb28af28e857217f25d 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/Test.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/Test.json @@ -5,12 +5,13 @@ "test-timeout": "600000", "bundle-name": "com.example.startAbilityForResult.hmservice", "module-name": "entry", - "shell-timeout": "600000" + "shell-timeout": "600000", + "testcase-timeout": "50000" }, "kits": [ { "test-file-name": [ - "FreeInstallStartAbilityForResultStageTest.hap" + "ActsFreeInstallStartAbilityForResultStageTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/Application/AbilityStage.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/Application/AbilityStage.ts rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/Application/AbilityStage.ts diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/MainAbility/MainAbility.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/MainAbility/MainAbility.ts rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/MainAbility/MainAbility.ts diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts similarity index 97% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts index ec20fc0823ea020a5e20468f96d136147dd3a2b8..28b63ae323260a1c50537460cc23308796714f81 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -22,7 +22,7 @@ var abilityDelegatorArguments = undefined function translateParamsToString(parameters) { const keySet = new Set([ '-s class', '-s notClass', '-s suite', '-s it', - '-s level', '-s testType', '-s size', '-s timeout' + '-s level', '-s testType', '-s size', '-s timeout','-s dryRun' ]) let targetParams = ''; for (const key in parameters) { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/pages/index.ets similarity index 67% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/pages/index.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/pages/index.ets index fb2b61d0f92f4c740f185c9458ab844f9bbe1842..3826d4124548dc5163ca756f5815d3a841cb790f 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/pages/index.ets @@ -15,8 +15,9 @@ */ import router from '@system.router'; import file from '@system.file'; -import { Core, ExpectExtend, InstrumentLog, ReportExtend } from "deccjsunit/index" -import List from '../test/ListTest' +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../test/ListTest' async function routePage() { let options = { @@ -33,21 +34,13 @@ async function routePage() { @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() - globalThis.abilityWant.parameters.timeout = 16000; - core.subscribeEvent('task', reportExtend) - const configService = core.getDefaultService('config') - configService.setConfig(globalThis.abilityWant.parameters); - List(globalThis.abilityContext) - core.execute() + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) } build() { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/test/ListTest.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/test/ListTest.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/test/ListTest.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/test/ListTest.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/test/StartAbilityForResult.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/test/StartAbilityForResult.ets similarity index 99% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/test/StartAbilityForResult.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/test/StartAbilityForResult.ets index 07f3190e242b20ba3b7497e91a3e9e3f66c4b6d8..bab8df845a87af42654e5e5668861a7ab3ab4548 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/test/StartAbilityForResult.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/test/StartAbilityForResult.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index" +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import ability from '@ohos.application.Ability' import rpc from '@ohos.rpc'; import wantConstant from '@ohos.ability.wantConstant' diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/test/Utils.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/test/Utils.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/test/Utils.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/ets/test/Utils.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/module.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/module.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/module.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/resources/base/media/icon.png rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/resources/base/media/icon.png diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/resources/base/profile/main_pages.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/entry/src/main/resources/base/profile/main_pages.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/signature/openharmony_sx.p7b b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/signature/openharmony_sx.p7b similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/signature/openharmony_sx.p7b rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/signature/openharmony_sx.p7b diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/AppScope/app.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/AppScope/app.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/AppScope/app.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/AppScope/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/AppScope/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/AppScope/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/AppScope/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/AppScope/resources/base/media/app_icon.png b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/AppScope/resources/base/media/app_icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/AppScope/resources/base/media/app_icon.png rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/AppScope/resources/base/media/app_icon.png diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/BUILD.gn b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/BUILD.gn similarity index 61% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/BUILD.gn rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/BUILD.gn index b29c1ddbd46a22b3beaaaad1f77643b413289966..1c8af7d242d1c61472677dfc12458d096c1acb9e 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/BUILD.gn +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/BUILD.gn @@ -13,29 +13,32 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("StartAbilityForResultNoTargetBundleListStageTest") { +ohos_js_hap_suite("ActsStartAbilityForResultNoTargetBundleListStageTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ - ":startabilityforresultnotargetbundleliststagetest_js_assets", - ":startabilityforresultnotargetbundleliststagetest_resources", + ":actsstartabilityforresultnotargetbundleliststagetest_js_assets", + ":actsstartabilityforresultnotargetbundleliststagetest_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "StartAbilityForResultNoTargetBundleListStageTest" + hap_name = "ActsStartAbilityForResultNoTargetBundleListStageTest" } -ohos_app_scope("startabilityforresultnotargetbundleliststagetest_app_profile") { +ohos_app_scope( + "actsstartabilityforresultnotargetbundleliststagetest_app_profile") { app_profile = "AppScope/app.json" sources = [ "AppScope/resources" ] } -ohos_js_assets("startabilityforresultnotargetbundleliststagetest_js_assets") { +ohos_js_assets( + "actsstartabilityforresultnotargetbundleliststagetest_js_assets") { source_dir = "entry/src/main/ets" } -ohos_resources("startabilityforresultnotargetbundleliststagetest_resources") { +ohos_resources( + "actsstartabilityforresultnotargetbundleliststagetest_resources") { sources = [ "entry/src/main/resources" ] - deps = [ ":startabilityforresultnotargetbundleliststagetest_app_profile" ] + deps = [ ":actsstartabilityforresultnotargetbundleliststagetest_app_profile" ] hap_profile = "entry/src/main/module.json" } diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/Test.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/Test.json similarity index 85% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/Test.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/Test.json index 0d78cfc0bf0f816073fa6b63e3e4df389f8f4989..83e122a462d7c1a0e788743c3c729f13d61098e2 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/Test.json +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/Test.json @@ -5,12 +5,13 @@ "test-timeout": "600000", "bundle-name": "com.example.startAbilityForResult.hmservice", "module-name": "entry", - "shell-timeout": "600000" + "shell-timeout": "600000", + "testcase-timeout": "50000" }, "kits": [ { "test-file-name": [ - "StartAbilityForResultNoTargetBundleListStageTest.hap" + "ActsStartAbilityForResultNoTargetBundleListStageTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts similarity index 97% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts index ec20fc0823ea020a5e20468f96d136147dd3a2b8..28b63ae323260a1c50537460cc23308796714f81 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -22,7 +22,7 @@ var abilityDelegatorArguments = undefined function translateParamsToString(parameters) { const keySet = new Set([ '-s class', '-s notClass', '-s suite', '-s it', - '-s level', '-s testType', '-s size', '-s timeout' + '-s level', '-s testType', '-s size', '-s timeout','-s dryRun' ]) let targetParams = ''; for (const key in parameters) { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/pages/index.ets similarity index 69% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/pages/index.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/pages/index.ets index fb2b61d0f92f4c740f185c9458ab844f9bbe1842..24a6152449c41795122a3f88a2d0d2a8335cfb91 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/entry/src/main/ets/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/pages/index.ets @@ -15,8 +15,9 @@ */ import router from '@system.router'; import file from '@system.file'; -import { Core, ExpectExtend, InstrumentLog, ReportExtend } from "deccjsunit/index" -import List from '../test/ListTest' +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../test/ListTest' async function routePage() { let options = { @@ -34,20 +35,12 @@ async function routePage() { 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() - globalThis.abilityWant.parameters.timeout = 16000; - core.subscribeEvent('task', reportExtend) - const configService = core.getDefaultService('config') - configService.setConfig(globalThis.abilityWant.parameters); - List(globalThis.abilityContext) - core.execute() + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) } build() { diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/ListTest.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/ListTest.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/ListTest.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/ListTest.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityForResult.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityForResult.ets similarity index 99% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityForResult.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityForResult.ets index 45e2430452bdf5a5b6c73f23c4e07a69d67a543f..0854f5d1f36848cd63bbe5717632adf2921eba23 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityForResult.ets +++ b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityForResult.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index" +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import ability from '@ohos.application.Ability' import rpc from '@ohos.rpc'; import wantConstant from '@ohos.ability.wantConstant' diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/Utils.ets b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/Utils.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/Utils.ets rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/ets/test/Utils.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/module.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/module.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/module.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/resources/base/media/icon.png rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/resources/base/media/icon.png diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/entry/src/main/resources/base/profile/main_pages.json rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/entry/src/main/resources/base/profile/main_pages.json diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/signature/openharmony_sx.p7b b/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/signature/openharmony_sx.p7b similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/startabilityforresultnotargetbundleliststagetest/signature/openharmony_sx.p7b rename to ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/signature/openharmony_sx.p7b diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/AppScope/app.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/AppScope/app.json rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/AppScope/app.json diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/AppScope/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/AppScope/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/AppScope/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/AppScope/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/AppScope/resources/base/media/app_icon.png b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/AppScope/resources/base/media/app_icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/AppScope/resources/base/media/app_icon.png rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/AppScope/resources/base/media/app_icon.png diff --git a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/BUILD.gn b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/BUILD.gn similarity index 67% rename from ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/BUILD.gn rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/BUILD.gn index 8f9d30d2beee32125c475245eae1d38014b10493..cffb6afdb82904b1cb5fe810c409f23880a68952 100644 --- a/ability/ability_runtime/freeinstalltest/connectabilitystagetest/freeinstallconnectabilitystagetest/BUILD.gn +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/BUILD.gn @@ -13,29 +13,29 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("FreeInstallConnectAbilityStageTest") { +ohos_js_hap_suite("ActsFreeInstallStartAbilityStageTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ - ":freeinstallconnectabilitystagetest_js_assets", - ":freeinstallconnectabilitystagetest_resources", + ":actsfreeinstallstartabilitystagetest_js_assets", + ":actsfreeinstallstartabilitystagetest_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "FreeInstallConnectAbilityStageTest" + hap_name = "ActsFreeInstallStartAbilityStageTest" } -ohos_app_scope("freeinstallconnectabilitystagetest_app_profile") { +ohos_app_scope("actsfreeinstallstartabilitystagetest_app_profile") { app_profile = "AppScope/app.json" sources = [ "AppScope/resources" ] } -ohos_js_assets("freeinstallconnectabilitystagetest_js_assets") { +ohos_js_assets("actsfreeinstallstartabilitystagetest_js_assets") { source_dir = "entry/src/main/ets" } -ohos_resources("freeinstallconnectabilitystagetest_resources") { +ohos_resources("actsfreeinstallstartabilitystagetest_resources") { sources = [ "entry/src/main/resources" ] - deps = [ ":freeinstallconnectabilitystagetest_app_profile" ] + deps = [ ":actsfreeinstallstartabilitystagetest_app_profile" ] hap_profile = "entry/src/main/module.json" } diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/Test.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/Test.json similarity index 88% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/Test.json rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/Test.json index 12e0d2e5a47feebafbfbb88eb13ac173a5ae8dcc..c4ba0ce2696acf8ec60e14f25c52b3988779c395 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/Test.json +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/Test.json @@ -5,12 +5,13 @@ "test-timeout": "600000", "bundle-name": "com.open.harmony.packagemag", "module-name": "entry", - "shell-timeout": "600000" + "shell-timeout": "600000", + "testcase-timeout": "50000" }, "kits": [ { "test-file-name": [ - "FreeInstallStartAbilityStageTest.hap" + "ActsFreeInstallStartAbilityStageTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/Application/AbilityStage.ts diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/FormAbility/FormAbility.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/FormAbility/FormAbility.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/FormAbility/FormAbility.ts rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/FormAbility/FormAbility.ts diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/MainAbility/MainAbility.ts diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/MainAbility1/MainAbility1.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/MainAbility1/MainAbility1.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/MainAbility1/MainAbility1.ts rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/MainAbility1/MainAbility1.ts diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/ServiceAbility/ServiceAbility.ts diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts similarity index 97% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts index 2c446f687cce0ed2e023e32461014af624e1ab01..3348d2bc5ca78af8cbb5187128590fb8bee9022e 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -22,7 +22,7 @@ var abilityDelegatorArguments = undefined function translateParamsToString(parameters) { const keySet = new Set([ '-s class', '-s notClass', '-s suite', '-s it', - '-s level', '-s testType', '-s size', '-s timeout' + '-s level', '-s testType', '-s size', '-s timeout','-s dryRun' ]) let targetParams = ''; for (const key in parameters) { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..cf044dab7bf62aeb0e2f36c5fd1eb19d1126a177 --- /dev/null +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/pages/index.ets @@ -0,0 +1,47 @@ +// @ts-nocheck +/** + * 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../test/ListTest' +import file from '@system.file'; + +@Entry +@Component +struct Index { + @State message: string = 'StartAbilityTest' + aboutToAppear() { + console.info("start run testcase!!!!") + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + } + + build() { + Row() { + Column() { + Text(this.message) + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + } + .height('100%') + } +} \ No newline at end of file diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/pages/second.ets b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/pages/second.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/pages/second.ets rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/pages/second.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/test/ListTest.ets b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/test/ListTest.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/test/ListTest.ets rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/test/ListTest.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets similarity index 95% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets index 84fcd95027484f4e0a930aecdbbbd602c51270ad..94642e7d33b4313a1cf07b4226dc598f285ad340 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/ets/test/StartAbilityTest.ets @@ -16,7 +16,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index" +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import ability from '@ohos.application.Ability' import rpc from '@ohos.rpc'; import wantConstant from '@ohos.ability.wantConstant' @@ -158,7 +158,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -189,7 +189,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -224,7 +224,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); @@ -259,7 +259,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -289,7 +289,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -327,7 +327,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -366,7 +366,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -407,7 +407,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "hnm2", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -447,7 +447,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str, (error, data) => { + globalThis.abilityContext.startAbility(str, (error, data) => { console.log(TAG + ": startAbility err: " + JSON.stringify(error) + ",data: " + JSON.stringify(data)); expect(error.code == 0).assertTrue(); }) @@ -473,7 +473,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str, (error, data) => { + globalThis.abilityContext.startAbility(str, (error, data) => { console.log(TAG + ": startAbility err: " + JSON.stringify(error) + ",data: " + JSON.stringify(data)); expect(error.code == 0).assertTrue(); }) @@ -500,7 +500,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": 1717, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); @@ -534,7 +534,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": 1717, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -564,7 +564,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": '94.31', } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); @@ -598,7 +598,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": '94.31', } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -628,7 +628,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": '', } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); @@ -662,7 +662,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": '', } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -690,7 +690,7 @@ export default function startAbilityTest(abilityContext) { "abilityName": "com.example.qianyiyingyong.MainAbility", "moduleName": "entry", } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); @@ -723,7 +723,7 @@ export default function startAbilityTest(abilityContext) { "abilityName": "com.example.qianyiyingyong.MainAbility", "moduleName": "entry", } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -759,7 +759,7 @@ export default function startAbilityTest(abilityContext) { "site": "很开心看到你！" } } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -795,7 +795,7 @@ export default function startAbilityTest(abilityContext) { "site": "很开心看到你！" } } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -827,7 +827,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); @@ -862,7 +862,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); @@ -910,7 +910,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); @@ -965,7 +965,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "hm4", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -1006,7 +1006,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "hm4", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); @@ -1045,7 +1045,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "hnm", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); @@ -1073,7 +1073,7 @@ export default function startAbilityTest(abilityContext) { "abilityName": "com.example.qianyiyingyong.MainAbility", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); @@ -1107,7 +1107,7 @@ export default function startAbilityTest(abilityContext) { "abilityName": "com.example.qianyiyingyong.MainAbility", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -1135,7 +1135,7 @@ export default function startAbilityTest(abilityContext) { "bundleName": "com.open.harmony.packagemag", "abilityName": "com.open.harmony.packagemag.ServiceAbility", } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); @@ -1163,7 +1163,7 @@ export default function startAbilityTest(abilityContext) { "abilityName": "MainAbility1", "moduleName": "entry", } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": Mainability2 startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": Mainability2 startAbility fail. err: " + JSON.stringify(error)); @@ -1177,7 +1177,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str2).then((data) => { + globalThis.abilityContext.startAbility(str2).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); @@ -1210,7 +1210,7 @@ export default function startAbilityTest(abilityContext) { "abilityName": "MainAbility1", "moduleName": "entry", } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": Mainability2 startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": Mainability2 startAbility fail. err: " + JSON.stringify(error)); @@ -1224,7 +1224,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str2).then((data) => { + globalThis.abilityContext.startAbility(str2).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); }).catch((error) => { console.log(TAG + ": startAbility fail. err: " + JSON.stringify(error)); diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/js/ServiceAbility/pages/index/index.css b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/js/ServiceAbility/pages/index/index.css similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/js/ServiceAbility/pages/index/index.css rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/js/ServiceAbility/pages/index/index.css diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/js/ServiceAbility/pages/index/index.hml b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/js/ServiceAbility/pages/index/index.hml similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/js/ServiceAbility/pages/index/index.hml rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/js/ServiceAbility/pages/index/index.hml diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/js/ServiceAbility/pages/index/index.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/js/ServiceAbility/pages/index/index.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/js/ServiceAbility/pages/index/index.json rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/js/ServiceAbility/pages/index/index.json diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/module.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/module.json rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/module.json diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/resources/base/media/icon.png rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/resources/base/media/icon.png diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/resources/base/profile/form_config.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/resources/base/profile/form_config.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/resources/base/profile/form_config.json rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/resources/base/profile/form_config.json diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/resources/base/profile/main_pages.json rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/entry/src/main/resources/base/profile/main_pages.json diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/signature/openharmony_sx.p7b b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/signature/openharmony_sx.p7b similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/signature/openharmony_sx.p7b rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/signature/openharmony_sx.p7b diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/AppScope/app.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/AppScope/app.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/AppScope/app.json rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/AppScope/app.json diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/AppScope/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/AppScope/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/AppScope/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/AppScope/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/AppScope/resources/base/media/app_icon.png b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/AppScope/resources/base/media/app_icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/AppScope/resources/base/media/app_icon.png rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/AppScope/resources/base/media/app_icon.png diff --git a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/BUILD.gn b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/BUILD.gn similarity index 64% rename from ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/BUILD.gn rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/BUILD.gn index 4412327012625c57bd0e6923af73125a938b20d4..8db27b0e86dfc90ff755a41f603c5d657286a187 100644 --- a/ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/freeinstallstartabilityforresultstagetest/BUILD.gn +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/BUILD.gn @@ -13,29 +13,29 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("FreeInstallStartAbilityForResultStageTest") { +ohos_js_hap_suite("ActsStartAbilityNoTargetBundleListStageTest") { hap_profile = "entry/src/main/module.json" js_build_mode = "debug" deps = [ - ":freeinstallstartabilityforresultstagetest_js_assets", - ":freeinstallstartabilityforresultstagetest_resources", + ":actsstartabilitynotargetbundleliststagetest_js_assets", + ":actsstartabilitynotargetbundleliststagetest_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "FreeInstallStartAbilityForResultStageTest" + hap_name = "ActsStartAbilityNoTargetBundleListStageTest" } -ohos_app_scope("freeinstallstartabilityforresultstagetest_app_profile") { +ohos_app_scope("actsstartabilitynotargetbundleliststagetest_app_profile") { app_profile = "AppScope/app.json" sources = [ "AppScope/resources" ] } -ohos_js_assets("freeinstallstartabilityforresultstagetest_js_assets") { +ohos_js_assets("actsstartabilitynotargetbundleliststagetest_js_assets") { source_dir = "entry/src/main/ets" } -ohos_resources("freeinstallstartabilityforresultstagetest_resources") { +ohos_resources("actsstartabilitynotargetbundleliststagetest_resources") { sources = [ "entry/src/main/resources" ] - deps = [ ":freeinstallstartabilityforresultstagetest_app_profile" ] + deps = [ ":actsstartabilitynotargetbundleliststagetest_app_profile" ] hap_profile = "entry/src/main/module.json" } diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/Test.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/Test.json similarity index 86% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/Test.json rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/Test.json index 4ea0bccf5471f5a53169ee57eea82a9626e5cbf8..2e9ec90cce8120690d70f4d63c70fa8dad56c46f 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/Test.json +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/Test.json @@ -5,12 +5,13 @@ "test-timeout": "600000", "bundle-name": "com.open.harmony.packagemag.hmservice", "module-name": "entry", - "shell-timeout": "600000" + "shell-timeout": "600000", + "testcase-timeout": "50000" }, "kits": [ { "test-file-name": [ - "StartAbilityNoTargetBundleListStageTest.hap" + "ActsStartAbilityNoTargetBundleListStageTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/Application/AbilityStage.ts diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/MainAbility/MainAbility.ts diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts similarity index 97% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts index 2c446f687cce0ed2e023e32461014af624e1ab01..3348d2bc5ca78af8cbb5187128590fb8bee9022e 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -22,7 +22,7 @@ var abilityDelegatorArguments = undefined function translateParamsToString(parameters) { const keySet = new Set([ '-s class', '-s notClass', '-s suite', '-s it', - '-s level', '-s testType', '-s size', '-s timeout' + '-s level', '-s testType', '-s size', '-s timeout','-s dryRun' ]) let targetParams = ''; for (const key in parameters) { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/pages/index.ets similarity index 57% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/pages/index.ets rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/pages/index.ets index 39d608703153cd07de7a2f4418f2da7c5f4e85da..ac8ffd4dac7495a2ce625c0437fc2463fe4e1fc9 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/pages/index.ets +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/pages/index.ets @@ -15,9 +15,10 @@ * limitations under the License. */ -import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index.ets" +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../test/ListTest' import file from '@system.file'; -import List from '../test/ListTest' @Entry @Component @@ -25,22 +26,12 @@ struct Index { @State message: string = 'StartAbility NoTargetBundleList Test' 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() - globalThis.abilityWant.parameters.timeout = 20000; - core.subscribeEvent('task', reportExtend) - const configService = core.getDefaultService('config') - console.info('parameters---->' + JSON.stringify(globalThis.abilityWant.parameters)) - configService.setConfig(globalThis.abilityWant.parameters) - List(globalThis.abilityContext) - core.execute() + var abilityDelegator: any + abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments: any + abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) } build() { diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/test/ListTest.ets b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/test/ListTest.ets similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/test/ListTest.ets rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/test/ListTest.ets diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityTest.ets b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityTest.ets similarity index 97% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityTest.ets rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityTest.ets index 804ca44a6c8310c5309007972ea491b0fb73c20f..0885d2aca087546723948b822acf1904f1efe377 100644 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityTest.ets +++ b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/ets/test/StartAbilityTest.ets @@ -15,7 +15,7 @@ * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "deccjsunit/index" +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from "@ohos/hypium" import ability from '@ohos.application.Ability' import rpc from '@ohos.rpc'; import wantConstant from '@ohos.ability.wantConstant' @@ -109,7 +109,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -145,7 +145,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "entry", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); @@ -187,7 +187,7 @@ export default function startAbilityTest(abilityContext) { "moduleName": "myapplication1", "flags": wantConstant.Flags.FLAG_INSTALL_ON_DEMAND, } - abilityContext.startAbility(str).then((data) => { + globalThis.abilityContext.startAbility(str).then((data) => { console.log(TAG + ": startAbility success. data: " + JSON.stringify(data)); flag = 1; expect(flag == 1).assertTrue(); diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/module.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/module.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/module.json rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/module.json diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/resources/base/element/string.json rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/resources/base/element/string.json diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/resources/base/media/icon.png rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/resources/base/media/icon.png diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/entry/src/main/resources/base/profile/main_pages.json rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/entry/src/main/resources/base/profile/main_pages.json diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/signature/openharmony_sx.p7b b/ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/signature/openharmony_sx.p7b similarity index 100% rename from ability/ability_runtime/freeinstalltest/startabilitystagetest/startabilitynotargetbundleliststagetest/signature/openharmony_sx.p7b rename to ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/signature/openharmony_sx.p7b diff --git a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/pages/index.ets b/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/pages/index.ets deleted file mode 100644 index 51801c99985b09f246a217507ed2ad6633abf253..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/freeinstalltest/startabilitystagetest/freeinstallstartabilitystagetest/entry/src/main/ets/pages/index.ets +++ /dev/null @@ -1,56 +0,0 @@ -// @ts-nocheck -/** - * 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 {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index.ets" -import file from '@system.file'; -import List from '../test/ListTest' - -@Entry -@Component -struct Index { - @State message: string = 'StartAbilityTest' - 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() - globalThis.abilityWant.parameters.timeout = 50000; - core.subscribeEvent('task', reportExtend) - const configService = core.getDefaultService('config') - console.info('parameters---->' + JSON.stringify(globalThis.abilityWant.parameters)) - configService.setConfig(globalThis.abilityWant.parameters) - List(globalThis.abilityContext) - core.execute() - } - - build() { - Row() { - Column() { - Text(this.message) - .fontSize(50) - .fontWeight(FontWeight.Bold) - } - .width('100%') - } - .height('100%') - } -} \ No newline at end of file