diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/BUILD.gn index 02438864055d25603cfafe7c9a3656aad8a688ac..c136206820f2713a3208eb9402cce9f6b75ebd8e 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/BUILD.gn +++ b/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("simulateEAbility") { hap_profile = "./src/main/config.json" + js_build_mode = "debug" hap_name = "simulateEAbility" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/Test.json b/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/Test.json deleted file mode 100644 index 7a88763ed8d2ac31dd30211b9574f47273e84549..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/abilitymanager/sceneProject/simulateEAbility/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn index ad5f0e1622a345e2c2a8460147e56a605fb6da3a..aa893e79e2e4057eb507ee3fb1797733731c2ab9 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn +++ b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("simulateFAbilityFir") { hap_profile = "./src/main/config.json" + js_build_mode = "debug" hap_name = "simulateFAbilityFir" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/Test.json b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/Test.json deleted file mode 100644 index 7a88763ed8d2ac31dd30211b9574f47273e84549..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilityFir/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn index 1a7dbdf7894ae1f537e981ed80a8e949092e2f35..c1b531b833dd21827785712d6f9cce985d221f4a 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn +++ b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("simulateFAbilitySed") { hap_profile = "./src/main/config.json" + js_build_mode = "debug" hap_name = "simulateFAbilitySed" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/Test.json b/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/Test.json deleted file mode 100644 index 7a88763ed8d2ac31dd30211b9574f47273e84549..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/abilitymanager/sceneProject/simulateFAbilitySed/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/BUILD.gn index dd018853753e4388ba0d88f7e04c1fb7a7bab16d..04ca71663f093aba5ae56ec21ee9dc68da9ec5fc 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/BUILD.gn +++ b/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("verifyAAbility") { hap_profile = "./src/main/config.json" + js_build_mode = "debug" hap_name = "verifyAAbility" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/Test.json b/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/Test.json deleted file mode 100644 index 7a88763ed8d2ac31dd30211b9574f47273e84549..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/abilitymanager/sceneProject/verifyAAbility/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/BUILD.gn b/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/BUILD.gn index 0a5036d2f3e2e85e499022e71feb6a9de462506e..64cc8690a79c919b97649925b122919c541f0bab 100644 --- a/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/BUILD.gn +++ b/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("verifyIAbility") { hap_profile = "./src/main/config.json" + js_build_mode = "debug" hap_name = "verifyIAbility" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/Test.json b/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/Test.json deleted file mode 100644 index 7a88763ed8d2ac31dd30211b9574f47273e84549..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/abilitymanager/sceneProject/verifyIAbility/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/BUILD.gn index c83c15325cd203899974104a4d98f48148bdbdae..e4d097d5d25108f2245ad2ef70d61414b6f79cf5 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/BUILD.gn +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsAbilityMultiinstanceHapARelyHap") { +ohos_hap("ActsAmsAbilityMultiinstanceHapARelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsabilitymultiinstancehapa_js_assets", ":actsamsabilitymultiinstancehapa_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsAmsAbilityMultiinstanceHapARelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsAbilityMultiinstanceHapARelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("actsamsabilitymultiinstancehapa_app_profile") { diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/Test.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappa/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/BUILD.gn index bba12ccef8acba66db45593ea16fd8bd81e6e1b9..40968164b51877e9e18745b44dae87f9cae6c0c7 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/BUILD.gn +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsAbilityMultiinstanceHapBRelyHap") { +ohos_hap("ActsAmsAbilityMultiinstanceHapBRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsabilitymultiinstancehapb_js_assets", ":actsamsabilitymultiinstancehapb_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsAmsAbilityMultiinstanceHapBRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsAbilityMultiinstanceHapBRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("actsamsabilitymultiinstancehapb_app_profile") { diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/Test.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappb/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/BUILD.gn index cc9a0e6c0774110acccc51707a1a9542aa8cbdfc..d2270882e71031b214324798f06c56ef91933f66 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/BUILD.gn +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsAbilityMultiinstanceHapCRelyHap") { +ohos_hap("ActsAmsAbilityMultiinstanceHapCRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsabilitymultiinstancehapc_js_assets", ":actsamsabilitymultiinstancehapc_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsAmsAbilityMultiinstanceHapCRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsAbilityMultiinstanceHapCRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("actsamsabilitymultiinstancehapc_app_profile") { diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/Test.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappc/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/BUILD.gn index 4377072dbbc08ad9e916b06769f8daf5fb98fa72..f1b8454b303b2a9ac8ac602c203752d11ba0b6e4 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/BUILD.gn +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsAbilityMultiinstanceHapDRelyHap") { +ohos_hap("ActsAmsAbilityMultiinstanceHapDRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsabilitymultiinstancehapd_js_assets", ":actsamsabilitymultiinstancehapd_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsAmsAbilityMultiinstanceHapDRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsAbilityMultiinstanceHapDRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("actsamsabilitymultiinstancehapd_app_profile") { diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/Test.json b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappd/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/BUILD.gn index 3c1b34960ad6655fef73d3242e59ec1903d3e1de..410d6e41471fd37801a510e9600f23cb602037b9 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/BUILD.gn +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstanceappe/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsAmsAbilityMultiinstanceHapERelyHap") { hap_name = "ActsAmsAbilityMultiinstanceHapERelyHap" + js_build_mode = "debug" hap_profile = "./src/main/config.json" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/BUILD.gn b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/BUILD.gn index 829e668b197aa722c4356111fa9ed817c92e16c8..4c7ade0dc5bfbe244641e2ac2fa776f8fe8d7209 100644 --- a/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/BUILD.gn +++ b/ability/ability_runtime/abilitymultiinstance/amsabilitymultiinstancetest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsAbilityMultiinstanceTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsabilitymultiinstance_js_assets", ":actsamsabilitymultiinstance_resources", diff --git a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/ContextJsunit.test.ets b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/ContextJsunit.test.ets index c442900cc5e9e0fc62dff853788c7f3826655213..2ac05d01618c8877e134e493fb739969f6a43df6 100644 --- a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/ContextJsunit.test.ets +++ b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/ContextJsunit.test.ets @@ -18,7 +18,7 @@ import {describe, beforeEach, afterEach, it, expect} from 'hypium/index'; import Utils from './Utils'; export default function ContextJsunit() { - describe('appInfoTest_ability_2', function () { + describe('faContextTest', function () { beforeEach(async function (done) { console.info("context before each called"); done() diff --git a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/addContextAndAbilityJsunit.test.ets b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/addContextAndAbilityJsunit.test.ets index bfef54ca08517e7f3b1fa648c39aa418e92aa004..1e6814cc28e511f850c71c1a2e80a95cbff3eb7e 100644 --- a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/addContextAndAbilityJsunit.test.ets +++ b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/addContextAndAbilityJsunit.test.ets @@ -32,7 +32,7 @@ const TAG_TEST_0011 = ' context_featureAbility_test_0300 '; const TAG_TEST_0012 = ' context_featureAbility_test_0400 '; export default function addContextAndAbilityJsunit() { - describe('appInfoTest_ability_1', function () { + describe('addContextTest', function () { /* * @tc.number: context_isUpdatingConfigurations_test_0100 * @tc.name: isUpdatingConfigurations : Obtains whether the configuration of the current ability is changing. @@ -163,7 +163,7 @@ export default function addContextAndAbilityJsunit() { }) await Utils.sleep(2000) expect(typeof (detailed)).assertEqual("number"); - expect(detailed).assertEqual(512); + expect(detailed).assertLarger(0); done(); console.log('------------------ ' + TAG_TEST_0500 + ' end -------------------'); }); @@ -183,7 +183,7 @@ export default function addContextAndAbilityJsunit() { console.info(TAG_TEST_0600 + ' callBack error is: ' + JSON.stringify(error)); console.info(TAG_TEST_0600 + ' callBack data is:' + JSON.stringify(data)); expect(typeof (data)).assertEqual("number"); - expect(data).assertEqual(512); + expect(data).assertLarger(0); console.log('------------------ ' + TAG_TEST_0600 + ' end -------------------'); done(); }) diff --git a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAbilityInfoJsunit.test.ets b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAbilityInfoJsunit.test.ets index 82186bfa45f16fd639b278bd70d6fe7542b965a0..8524cc72d011647fb5474475e51f362797d7b779 100644 --- a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAbilityInfoJsunit.test.ets +++ b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAbilityInfoJsunit.test.ets @@ -17,7 +17,7 @@ import Utils from './Utils'; import ability_featureAbility from '@ohos.ability.featureAbility'; export default function getHapModuleInfoJsunit() { - describe('appInfoTest_ability_3', function () { + describe('getAbilityInfoTest', function () { /** * @tc.number: context_getAbilityInfo_test_0100 @@ -203,9 +203,9 @@ export default function getHapModuleInfoJsunit() { expect(typeof (data.uri)).assertEqual("string"); expect(data.bundleName).assertEqual("com.ohos.acecollaboration"); - expect(data.name).assertEqual("com.ohos.acecollaboration.MainAbility"); - expect(data.label).assertEqual("$string:entry_MainAbility"); - expect(data.description).assertEqual("$string:mainability_description"); + expect(data.name).assertEqual("com.ohos.acecollaboration.TestAbility"); + expect(data.label).assertEqual("$string:TestAbility_label"); + expect(data.description).assertEqual("$string:TestAbility_desc"); expect(data.icon).assertEqual("$media:icon"); expect(data.descriptionId > 0).assertTrue(); expect(data.iconId > 0).assertTrue(); diff --git a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAppVersionInfoJsunit.test.ets b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAppVersionInfoJsunit.test.ets index df44372bd1631dacf8effb3541fa8be9ab7bff7b..1112edca15f888dc8d4f46d3a589d9b091e920a9 100644 --- a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAppVersionInfoJsunit.test.ets +++ b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getAppVersionInfoJsunit.test.ets @@ -17,7 +17,7 @@ import Utils from './Utils'; import ability_featureAbility from '@ohos.ability.featureAbility'; export default function getHapModuleInfoJsunit() { - describe('appInfoTest_ability_5', function () { + describe('getAppVersionInfoTest', function () { /** * @tc.number: context_getAppVersionInfo_test_0100 * @tc.name: getAppVersionInfo:Gets the version information for the application. diff --git a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getApplicationContextJsunit.test.ets b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getApplicationContextJsunit.test.ets index 915bf9f235cac0c1b34817b2f5d7afd6dcbea30b..76785298e923f869fca275d42daaf74953d374cf 100644 --- a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getApplicationContextJsunit.test.ets +++ b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getApplicationContextJsunit.test.ets @@ -17,7 +17,7 @@ import Utils from './Utils'; import ability_featureAbility from '@ohos.ability.featureAbility'; export default function getHapModuleInfoJsunit() { - describe('appInfoTest_ability_4', function () { + describe('getApplicationContextTest', function () { /** * @tc.number: context_getApplicationContext_test_0100 * @tc.name: getApplicationContext:Gets the application context information. diff --git a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getHapModuleInfoJsunit.test.ets b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getHapModuleInfoJsunit.test.ets index df1ef556ff20ed48cb67c6daa2c955ef6affffc8..b84d2beaf39ea8ab59266f1b2611492208b462a1 100644 --- a/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getHapModuleInfoJsunit.test.ets +++ b/ability/ability_runtime/actsabilitymanageretstest/entry/src/main/ets/test/getHapModuleInfoJsunit.test.ets @@ -16,8 +16,10 @@ import {describe, it, expect} from 'hypium/index'; import Utils from './Utils'; import ability_featureAbility from '@ohos.ability.featureAbility'; + + export default function getHapModuleInfoJsunit() { - describe('appInfoTest_ability_6', function () { + describe('getHapModuleInfoTest', function () { /** * @tc.number: context_getHapModuleInfo_test_0100 * @tc.name: getHapModuleInfo:Obtains the HapModuleInfo object of the application. @@ -124,7 +126,8 @@ export default function getHapModuleInfoJsunit() { expect(data.backgroundImg).assertEqual(""); expect(data.supportedModes).assertEqual(0); expect(data.deviceTypes[0]).assertEqual("phone"); - checkAbilityInfo(msg,data.abilityInfos[0]); + console.info(msg + ' data.abilityInfos.length ' + data.abilityInfos.length) + checkAbilityInfo(msg, data.abilityInfos[0]); expect(data.moduleName).assertEqual("entry") expect(data.mainAbilityName).assertEqual(""); expect(data.installationFree).assertEqual(false); @@ -203,9 +206,9 @@ export default function getHapModuleInfoJsunit() { expect(typeof (data.defaultFormWidth)).assertEqual("number"); expect(typeof (data.uri)).assertEqual("string"); expect(data.bundleName).assertEqual("com.ohos.acecollaboration"); - expect(data.name).assertEqual("com.ohos.acecollaboration.MainAbility"); - expect(data.label).assertEqual("$string:entry_MainAbility"); - expect(data.description).assertEqual("$string:mainability_description"); + expect(data.name).assertEqual("com.ohos.acecollaboration.TestAbility"); + expect(data.label).assertEqual("$string:TestAbility_label"); + expect(data.description).assertEqual("$string:TestAbility_desc"); expect(data.icon).assertEqual("$media:icon"); expect(data.moduleName).assertEqual("entry"); expect(data.process).assertEqual(""); @@ -228,6 +231,6 @@ export default function getHapModuleInfoJsunit() { expect(data.subType).assertEqual(0); console.log(msg+ "---checkAbilityInfo End--- "); } - }) -} \ No newline at end of file +} + diff --git a/ability/ability_runtime/actscalltest/systemappcalleea/BUILD.gn b/ability/ability_runtime/actscalltest/systemappcalleea/BUILD.gn index 9a140b14e865138bcf775bc84461d255a2ec1bb5..fa08674129ae0bf7bc574f752b954117db407f1f 100644 --- a/ability/ability_runtime/actscalltest/systemappcalleea/BUILD.gn +++ b/ability/ability_runtime/actscalltest/systemappcalleea/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsSystemAppCalleeARelyHap") { +ohos_hap("ActsSystemAppCalleeARelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":systemappcalleea_js_assets", ":systemappcalleea_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsSystemAppCalleeARelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsSystemAppCalleeARelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("systemappcalleea_app_profile") { diff --git a/ability/ability_runtime/actscalltest/systemappcalleea/Test.json b/ability/ability_runtime/actscalltest/systemappcalleea/Test.json deleted file mode 100644 index d9fdcb92f81eac53bf51c78a428be0210c192b89..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actscalltest/systemappcalleea/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} \ No newline at end of file diff --git a/ability/ability_runtime/actscalltest/systemappcallera/BUILD.gn b/ability/ability_runtime/actscalltest/systemappcallera/BUILD.gn index 97b079739ce30680b1267390b38dd1b72ce2b8ec..8922634becabb0906fb18d3bcedb61e210706866 100644 --- a/ability/ability_runtime/actscalltest/systemappcallera/BUILD.gn +++ b/ability/ability_runtime/actscalltest/systemappcallera/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsSystemAppCallerARelyHap") { +ohos_hap("ActsSystemAppCallerARelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":systemappcallera_js_assets", ":systemappcallera_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsSystemAppCallerARelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsSystemAppCallerARelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("systemappcallera_app_profile") { diff --git a/ability/ability_runtime/actscalltest/systemappcallera/Test.json b/ability/ability_runtime/actscalltest/systemappcallera/Test.json deleted file mode 100644 index d9fdcb92f81eac53bf51c78a428be0210c192b89..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actscalltest/systemappcallera/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} \ No newline at end of file diff --git a/ability/ability_runtime/actscalltest/systemappcallerb/BUILD.gn b/ability/ability_runtime/actscalltest/systemappcallerb/BUILD.gn index 6589529c675aa3095bcb676e463182f3e3b90c93..dec1d5baa6ab0073daabee01616f3709cbd58d97 100644 --- a/ability/ability_runtime/actscalltest/systemappcallerb/BUILD.gn +++ b/ability/ability_runtime/actscalltest/systemappcallerb/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsSystemAppCallerBRelyHap") { +ohos_hap("ActsSystemAppCallerBRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":systemappcallerb_js_assets", ":systemappcallerb_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsSystemAppCallerBRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsSystemAppCallerBRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("systemappcallerb_app_profile") { diff --git a/ability/ability_runtime/actscalltest/systemappcallerb/Test.json b/ability/ability_runtime/actscalltest/systemappcallerb/Test.json deleted file mode 100644 index d9fdcb92f81eac53bf51c78a428be0210c192b89..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actscalltest/systemappcallerb/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} \ No newline at end of file diff --git a/ability/ability_runtime/actscalltest/systemappcallerc/BUILD.gn b/ability/ability_runtime/actscalltest/systemappcallerc/BUILD.gn index 0e6426ae74f431a985431e1cfc90c49bb8a44dae..91dea07daf9362bb9d5e5c9e5db7595ee5c51e4f 100644 --- a/ability/ability_runtime/actscalltest/systemappcallerc/BUILD.gn +++ b/ability/ability_runtime/actscalltest/systemappcallerc/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsSystemAppCallerCRelyHap") { +ohos_hap("ActsSystemAppCallerCRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":systemappcallerc_js_assets", ":systemappcallerc_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsSystemAppCallerCRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsSystemAppCallerCRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("systemappcallerc_app_profile") { diff --git a/ability/ability_runtime/actscalltest/systemappcallerc/Test.json b/ability/ability_runtime/actscalltest/systemappcallerc/Test.json deleted file mode 100644 index d9fdcb92f81eac53bf51c78a428be0210c192b89..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actscalltest/systemappcallerc/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} \ No newline at end of file diff --git a/ability/ability_runtime/actscalltest/systemcallentrytest/BUILD.gn b/ability/ability_runtime/actscalltest/systemcallentrytest/BUILD.gn index 27b56a8e78af22bb41fc63ce257b2676eb405505..1e81ee4a091883bfca4db90e55da699051a0e659 100644 --- a/ability/ability_runtime/actscalltest/systemcallentrytest/BUILD.gn +++ b/ability/ability_runtime/actscalltest/systemcallentrytest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsCallTestEntryTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":systemcallentrytest_js_assets", ":systemcallentrytest_resources", diff --git a/ability/ability_runtime/actscalltest/systemcallfeature/BUILD.gn b/ability/ability_runtime/actscalltest/systemcallfeature/BUILD.gn index 90456de5bbd314ba0f275f91fa0e9b84705cf379..4bb56ffa760a1be6eb621e62f87f448fae7509a4 100644 --- a/ability/ability_runtime/actscalltest/systemcallfeature/BUILD.gn +++ b/ability/ability_runtime/actscalltest/systemcallfeature/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsCallTestFeatureRelyHap") { +ohos_hap("ActsCallTestFeatureRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":systemcallfeature_js_assets", ":systemcallfeature_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsCallTestFeatureRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsCallTestFeatureRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("systemcallfeature_app_profile") { diff --git a/ability/ability_runtime/actscalltest/systemcallfeature/Test.json b/ability/ability_runtime/actscalltest/systemcallfeature/Test.json deleted file mode 100644 index d9fdcb92f81eac53bf51c78a428be0210c192b89..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actscalltest/systemcallfeature/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} \ No newline at end of file diff --git a/ability/ability_runtime/actscalltest/thirdappa/BUILD.gn b/ability/ability_runtime/actscalltest/thirdappa/BUILD.gn index decf1971558b20cc2f6b99ca7ab79ac11ed42251..a32cbe786caf9bd31db664df38661b2774632764 100644 --- a/ability/ability_runtime/actscalltest/thirdappa/BUILD.gn +++ b/ability/ability_runtime/actscalltest/thirdappa/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsThirdAppARelyHap") { +ohos_hap("ActsThirdAppARelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":thirdappa_js_assets", ":thirdappa_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsThirdAppARelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsThirdAppARelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("thirdappa_app_profile") { diff --git a/ability/ability_runtime/actscalltest/thirdappa/Test.json b/ability/ability_runtime/actscalltest/thirdappa/Test.json deleted file mode 100644 index d9fdcb92f81eac53bf51c78a428be0210c192b89..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actscalltest/thirdappa/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} \ No newline at end of file diff --git a/ability/ability_runtime/actscalltest/thirdcalltest/BUILD.gn b/ability/ability_runtime/actscalltest/thirdcalltest/BUILD.gn index cee804add703299b9daa9da89389b2815017a255..e8db5595a05fb5d9df7e2987b6675585dc947be7 100644 --- a/ability/ability_runtime/actscalltest/thirdcalltest/BUILD.gn +++ b/ability/ability_runtime/actscalltest/thirdcalltest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsThirdCallTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":thirdcalltest_js_assets", ":thirdcalltest_resources", diff --git a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/BUILD.gn b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/BUILD.gn index 74400d3f39848e1081bad10ac982a0a30d898b78..ca77e7bbf333596244b0cbbae2068128e83c231e 100644 --- a/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsfwkdataaccessortest/actsdataabilityrelyhap/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsDataAbilityRelyHap") { hap_name = "ActsDataAbilityRelyHap" + js_build_mode = "debug" hap_profile = "entry/src/main/config.json" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/BUILD.gn b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/BUILD.gn index c064c99fcf1c8c8ad0eb3c65a81884716720d0b6..6a5b350faa38519a7634c2174f0e7b7ec631c407 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsServiceAbilityServerRelyHap") { hap_name = "ActsServiceAbilityServerRelyHap" + js_build_mode = "debug" hap_profile = "entry/src/main/config.json" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/BUILD.gn b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/BUILD.gn index c9287c287980cd18c26930c72cd051b0a4973931..084688a51e3a1b18308d4bb9f904b8682c98bbbe 100644 --- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/BUILD.gn +++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsServiceAbilityServerSecondRelyHap") { hap_name = "ActsServiceAbilityServerSecondRelyHap" + js_build_mode = "debug" hap_profile = "entry/src/main/config.json" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserActionExtension_100/BUILD.gn b/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserActionExtension_100/BUILD.gn index 1490f2b07e7f659b330843ce118a9ad3385110c5..cf7ceec227311a4c121c2ebec6c43ac031ec2f15 100644 --- a/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserActionExtension_100/BUILD.gn +++ b/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserActionExtension_100/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsSpecifiedUserActionextensionZeroTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsspecifieduseractionextensionzerotest_js_assets", ":actsspecifieduseractionextensionzerotest_resources", diff --git a/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserActionExtension_101/BUILD.gn b/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserActionExtension_101/BUILD.gn index e15f6fb9d9a79c0726b9ac255abd17af5992cd72..35bca596beb835dee6ad6f26c3ce5c1b7b041021 100644 --- a/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserActionExtension_101/BUILD.gn +++ b/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserActionExtension_101/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsSpecifiedUserActionextensiononeTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsspecifieduseractionextensiononetest_js_assets", ":actsspecifieduseractionextensiononetest_resources", diff --git a/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserAction_100/BUILD.gn b/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserAction_100/BUILD.gn index 8393689f2f7effa41c8a9076d984db93306c3f19..2f4eac94fd97eec421a600dc27cd69c2eea21f1e 100644 --- a/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserAction_100/BUILD.gn +++ b/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserAction_100/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsSpecifiedUserActionZeroTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsspecifieduseractionzerotest_js_assets", ":actsspecifieduseractionzerotest_resources", diff --git a/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserAction_101/BUILD.gn b/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserAction_101/BUILD.gn index 0c9fd928106433015ea6bf82d1e97a7dfec81658..7ce5fd5bbdd4d24a7d8ab95696ce7b25c68b1ca0 100644 --- a/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserAction_101/BUILD.gn +++ b/ability/ability_runtime/actsstartcomponenttest/SpecifiedUserAction_101/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsSpecifiedUserActiononeTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsspecifieduseractiononetest_js_assets", ":actsspecifieduseractiononetest_resources", diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/BUILD.gn index 3f9e71fd4f7f97b48ec18dc7b2cf3e84652c6403..e6c31b21c318005c0a5981f7068f6fb50a5369a2 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/BUILD.gn +++ b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsAmsUsersApi7AppA") { hap_name = "ActsAmsUsersApi7AppA" + js_build_mode = "debug" hap_profile = "entry/src/main/config.json" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/Test.json b/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersApi7AppA/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/BUILD.gn index 1e742fed0e5369d14b5f98dcbdbf61fb3ebe3761..15d4b2e77dfb614049f28e46bc4e5b28c4a1baf1 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/BUILD.gn +++ b/ability/ability_runtime/actsusers/ActsAmsUsersExtensionSystemTest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsUsersExtensionSystemTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsusersextensionsystemtest_js_assets", ":actsamsusersextensionsystemtest_resources", diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn index 5e0fe0295965a36a6860393da1a9ef92051c2ecd..e98b3f4c8d186585f10eee36257e3260d0d64c44 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn +++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsAmsUsersKillProcessAppA") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" hap_name = "ActsAmsUsersKillProcessAppA" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/Test.json b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppA/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn index 1cee2c8265a9ecc77cf78c672dd4174f58ed4830..36056d57a323abf8d3b571c8ca45ed5b88c2c4b5 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn +++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsAmsUsersKillProcessAppB") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" hap_name = "ActsAmsUsersKillProcessAppB" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/Test.json b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppB/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn index cd1e0ed22f9ef55fbee7c0250c4dbdd656c99a88..125e54b0ed991b8cd0f09f1a1d80119de3235b43 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn +++ b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsAmsUsersKillProcessAppC") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" hap_name = "ActsAmsUsersKillProcessAppC" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/Test.json b/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/ActsAmsUsersKillProcessAppC/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/BUILD.gn b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/BUILD.gn index 40abe7c8643cd5c68f0af33a47a0e71181dd145a..89ebbb136f336061efb377f11561b515d03748e4 100644 --- a/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/BUILD.gn +++ b/ability/ability_runtime/actsusers/ActsAmsUsersSystemTest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsUsersSystemTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsuserssystemtest_js_assets", ":actsamsuserssystemtest_resources", diff --git a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/BUILD.gn b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/BUILD.gn index 28ed27d1d8283ec0a360e38d60cd3b4615b151be..7b34a3e395e9737e939c409672237dd8e21db872 100644 --- a/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/BUILD.gn +++ b/ability/ability_runtime/actsusers/actsconnectabilitysystemabilitytest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsConnectAbilitySystemAbilityTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsconnectabilitysystemabilitytest_js_assets", ":actsconnectabilitysystemabilitytest_resources", diff --git a/ability/ability_runtime/actsusers/actsextensionconnectabilitytest/BUILD.gn b/ability/ability_runtime/actsusers/actsextensionconnectabilitytest/BUILD.gn index eb96980b7174601ae5ea78e5933e51505df3aaa6..97b76848edb5c1e09fea2a893e3a36ba67da05a2 100644 --- a/ability/ability_runtime/actsusers/actsextensionconnectabilitytest/BUILD.gn +++ b/ability/ability_runtime/actsusers/actsextensionconnectabilitytest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsExtensionConnectAbilityTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsextensionconnectabilitytest_js_assets", ":actsextensionconnectabilitytest_resources", diff --git a/ability/ability_runtime/actsusers/actsserviceabilityrelytest/BUILD.gn b/ability/ability_runtime/actsusers/actsserviceabilityrelytest/BUILD.gn index 2c0778690c6b7daa670896025cc89425d8361ffb..90a759c0070e40f416be865ff33656a71571ed3b 100644 --- a/ability/ability_runtime/actsusers/actsserviceabilityrelytest/BUILD.gn +++ b/ability/ability_runtime/actsusers/actsserviceabilityrelytest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("actsServiceAbilityRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" hap_name = "actsServiceAbilityRelyHap" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/actsusers/actsserviceabilityrelytest/Test.json b/ability/ability_runtime/actsusers/actsserviceabilityrelytest/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/actsusers/actsserviceabilityrelytest/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn index 9ca60e9bc801edec2f1a60b5f316630d3d89de12..01923c8abee711bf12c27f14d3f155d741afe10e 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn +++ b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsAmsExtensionModuleRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" hap_name = "ActsAmsExtensionModuleRelyHap" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/Test.json b/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsextensionmodulehap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/BUILD.gn index 912a2b7f15ae76682ac91ce3ac8184664cd70484..d5411ce92f2f38e1d886c5fc2c20f0e7f7b945ef 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/BUILD.gn +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticabilitystagecontexttest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsStaticAbilityStageContextTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsstaticabilitystagecontexttest_js_assets", ":actsamsstaticabilitystagecontexttest_resources", diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn index faf67aba57e21e7a1ebcc8b13ea8f61911bbfb76..be5fe116bdd431b29de1f9933b8262835c4f609f 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsAmsStaticExtensionInfoRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" hap_name = "ActsAmsStaticExtensionInfoRelyHap" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/Test.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfohap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn index f525fd441cb07cdf74e62e1168ae949fc27529b1..53c8c54a11b4ef517d87a84e7e33e903bee7ef67 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsStaticExtensionInfoTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsstaticextensiontnfotest_js_assets", ":actsamsstaticextensiontnfotest_resources", diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/BUILD.gn index 14e681ef14473acb496a0c926a394f50042347cf..c025b8f101a154f3c2d376a217353d4a479c8cdc 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/BUILD.gn +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsAmsStaticARelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" hap_name = "ActsAmsStaticARelyHap" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/Test.json b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapa/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/BUILD.gn index 4de043201c55f8069e4c6d07c46018abdd903c9e..ab6b535b9c70e70d605806a08a90e7ad3d5cc475 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/BUILD.gn +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsAmsStaticBRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" hap_name = "ActsAmsStaticBRelyHap" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/Test.json b/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/Test.json deleted file mode 100644 index d9fdcb92f81eac53bf51c78a428be0210c192b89..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstatichapb/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} \ No newline at end of file diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/BUILD.gn index afd32ec85ed39a18afebf3af68e415a8a285e155..12b3a2e022c2a0e88993a1bbeedbe2a7df3ef86e 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/BUILD.gn +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinfomationquerytest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsStaticInfoMationQueryTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsstaticinfomationquerytest_js_assets", ":actsamsstaticinfomationquerytest_resources", diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/BUILD.gn index b10fa4c97c6389bd04b968a0c3b7e32fd8ff8d17..6bc4c54df9c204fc11c3fe14ac3f1b5ff2ad1ebe 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/BUILD.gn +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultipletest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsStaticInformationMultipleTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsstaticinformationmultipletest_js_assets", ":actsamsstaticinformationmultipletest_resources", diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/BUILD.gn index 31ab0c9605b302da4fab40889a2b7ec938b1d53e..246c0ccc9bd7a569670c5c9ebca9cad4d680308f 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/BUILD.gn +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticinformationmultitest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsStaticInformationMultiTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsstaticinformationmultitest_js_assets", ":actsamsstaticinformationmultitest_resources", diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn index ca18977cc4a2f5da3d202e3efad6a4558cd4dc7a..5a1dd9bb4ff51cf21b9504b5c7e3f82b789ed3ed 100644 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn +++ b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsAmsStaticQueryTestTwoRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" hap_name = "ActsAmsStaticQueryTestTwoRelyHap" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/Test.json b/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/Test.json deleted file mode 100644 index ec00ae24b1e4b73c5d7e3eaea6111e218d5dfaac..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/amscontextualinforquery/actsamsstaticquerytesttwohap/Test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" - -} diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/BUILD.gn b/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/BUILD.gn index 8fc1a913df959da0344acbbf289217139a75c667..d0cdaa3d39f944f50516d6dfb2285999737483a2 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/BUILD.gn +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsSpecifyTestRelyHap") { +ohos_hap("ActsAmsSpecifyTestRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsspecifytestrelyhap_js_assets", ":actsamsspecifytestrelyhap_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsAmsSpecifyTestRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsSpecifyTestRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("actsamsspecifytestrelyhap_app_profile") { diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/Test.json b/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsspecifytesthap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/BUILD.gn b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/BUILD.gn index ee4111aafaad52fa22a39ea12ca4dd55d3f9a827..6889f098406b8fe5da79f736505cfb7f0fef2c52 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/BUILD.gn +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilityforresulttest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsStartAbilityForResultTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsstartabilityforresulttest_js_assets", ":actsamsstartabilityforresulttest_resources", diff --git a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn index f9aae81712c7f90addbf93787dc5455706d944b7..c73cf5a8630c41d49d97f95e6b73cf01f562f36a 100644 --- a/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn +++ b/ability/ability_runtime/amsdisplayIdtest/actsamsstartabilitytest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsStartAbilityTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsstartabilitytest_js_assets", ":actsamsstartabilitytest_resources", diff --git a/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/entry/src/main/js/test/ActsProcessManageJsTest.test.js b/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/entry/src/main/js/test/ActsProcessManageJsTest.test.js index b21dcf5006f2ca93cbb23f06d0a7cbfada4d3725..afcd0ec7b90d10bac664a3d708a4be4c65d37992 100644 --- a/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/entry/src/main/js/test/ActsProcessManageJsTest.test.js +++ b/ability/ability_runtime/amsgetabilityprocessinfo/actsgetabilityprocessinfotest/entry/src/main/js/test/ActsProcessManageJsTest.test.js @@ -18,28 +18,11 @@ import appManager from '@ohos.application.AppManager' describe('ActsAbilityRunningInfosTest', function () { - - function checkRunningAbility(name, dataInfo) { - for (let i = 0, len = dataInfo.length; i < len; i++) { - if (dataInfo[i].ability.abilityName == name) { - expect(dataInfo[i].ability.deviceId).assertEqual(""); - expect(dataInfo[i].ability.uri).assertEqual(undefined); - expect(dataInfo[i].ability.ability).assertEqual(undefined); - expect(dataInfo[i].uid).assertLarger(10000); - expect(dataInfo[i].pid).assertLarger(500); - expect(dataInfo[i].startTime).assertLarger(3000); - expect(dataInfo[i].abilityState).assertLarger(0); - return true; - } - } - return false; - } - function checkRunningProcess(name, dataInfo) { for (let i = 0, len = dataInfo.length; i < len; i++) { - if (dataInfo[i].processName == name) { - expect(dataInfo[i].uid).assertLarger(2000); - expect(dataInfo[i].pid).assertLarger(500); + if (dataInfo[i].processName.indexOf(name) >= 0) { + expect(dataInfo[i].uid).assertLarger(0); + expect(dataInfo[i].pid).assertLarger(0); return true; } } @@ -70,7 +53,7 @@ describe('ActsAbilityRunningInfosTest', function () { console.log('ACTS_getProcessRunningInfos_0200==== { console.info('====> ACTS_getProcessRunningInfos_0200 ====>' + JSON.stringify(data)) - expect(checkRunningProcess('com.ohos.launcher', data)).assertTrue(); + expect(checkRunningProcess('com.example.abilityrunninginfostest', data)).assertTrue(); done(); }) }) diff --git a/ability/ability_runtime/context/scene/defpermission/BUILD.gn b/ability/ability_runtime/context/scene/defpermission/BUILD.gn index 90425b1c10fa1613dd7940c5bf146248cb41a9dc..90f79580967e217cd19f0ec42fcf0eafd8aa4e48 100644 --- a/ability/ability_runtime/context/scene/defpermission/BUILD.gn +++ b/ability/ability_runtime/context/scene/defpermission/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("DefPermission") { hap_profile = "./src/main/config.json" + js_build_mode = "debug" hap_name = "DefPermission" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/context/scene/defpermission/Test.json b/ability/ability_runtime/context/scene/defpermission/Test.json deleted file mode 100644 index 7a88763ed8d2ac31dd30211b9574f47273e84549..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/context/scene/defpermission/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/BUILD.gn index a79283b29630a6eaa403a7ab34d2f1bb7d7a5bf3..0551673c6d9e6a8e0ae2143c06af51a971e58586 100644 --- a/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/BUILD.gn +++ b/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("FinishWithResultEmptyTest") { hap_profile = "./src/main/config.json" + js_build_mode = "debug" hap_name = "FinishWithResultEmptyTest" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/Test.json b/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/Test.json deleted file mode 100644 index 7a88763ed8d2ac31dd30211b9574f47273e84549..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/featureability/sceneproject/finishwithresultemptytest/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn index 109b952f53ccc9a307c5e207399e07126494bd64..ed6c72f0a26b6d1ad91adca0744f21b2205ce7f6 100644 --- a/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn +++ b/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("FinishWithResultPromiseParametersTest") { hap_profile = "./src/main/config.json" + js_build_mode = "debug" hap_name = "FinishWithResultPromiseParametersTest" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/Test.json b/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/Test.json deleted file mode 100644 index 7a88763ed8d2ac31dd30211b9574f47273e84549..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/featureability/sceneproject/finishwithresultpromiseparameterstest/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/BUILD.gn index 03ebb8bb835ee839268476e924d6dd6cedd07ed1..0dd27e7af1e10faa63dbf77c3d9469527f13122d 100644 --- a/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/BUILD.gn +++ b/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("FinishWithResultTest") { hap_profile = "./src/main/config.json" + js_build_mode = "debug" hap_name = "FinishWithResultTest" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/Test.json b/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/Test.json deleted file mode 100644 index 7a88763ed8d2ac31dd30211b9574f47273e84549..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/featureability/sceneproject/finishwithresulttest/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/BUILD.gn index 9943c40ee85f6fe1187c9821c17a8f65a8e58048..72ef3714c8817ff544e3e5f126f24a96df945927 100644 --- a/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/BUILD.gn +++ b/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("GetCallingBundlePromiseTest") { hap_profile = "./src/main/config.json" + js_build_mode = "debug" hap_name = "GetCallingBundlePromiseTest" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/Test.json b/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/Test.json deleted file mode 100644 index 7a88763ed8d2ac31dd30211b9574f47273e84549..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/featureability/sceneproject/getcallingbundletest/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/ability/ability_runtime/featureability/sceneproject/startability/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/startability/BUILD.gn index 94d3a10cca5bc1179372d473c7979e69fa0da6d4..3b0684b8f4f14f0ccb01386261c68c71d48ed78a 100644 --- a/ability/ability_runtime/featureability/sceneproject/startability/BUILD.gn +++ b/ability/ability_runtime/featureability/sceneproject/startability/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("StartAbility") { hap_profile = "./src/main/config.json" + js_build_mode = "debug" hap_name = "StartAbility" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/featureability/sceneproject/startability/Test.json b/ability/ability_runtime/featureability/sceneproject/startability/Test.json deleted file mode 100644 index 7a88763ed8d2ac31dd30211b9574f47273e84549..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/featureability/sceneproject/startability/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/ability/ability_runtime/featureability/sceneproject/startabilityforresult/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/startabilityforresult/BUILD.gn index 3178fcd979a9171dc34cf98c954947b27cc2c1b3..e1e3ea836c882bac2f2a5780892ff0d260e3a567 100644 --- a/ability/ability_runtime/featureability/sceneproject/startabilityforresult/BUILD.gn +++ b/ability/ability_runtime/featureability/sceneproject/startabilityforresult/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("StartAbilityForResult") { hap_profile = "./src/main/config.json" + js_build_mode = "debug" hap_name = "StartAbilityForResult" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/featureability/sceneproject/startabilityforresult/Test.json b/ability/ability_runtime/featureability/sceneproject/startabilityforresult/Test.json deleted file mode 100644 index 7a88763ed8d2ac31dd30211b9574f47273e84549..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/featureability/sceneproject/startabilityforresult/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/BUILD.gn b/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/BUILD.gn index 84c93121113622ee2ce3ef2948443aed800634c9..3ddfb2615cc76de46b7035028e0124d1c6941866 100644 --- a/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/BUILD.gn +++ b/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("TerminateAbilityTest") { hap_profile = "./src/main/config.json" + js_build_mode = "debug" hap_name = "TerminateAbilityTest" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/Test.json b/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/Test.json deleted file mode 100644 index 7a88763ed8d2ac31dd30211b9574f47273e84549..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/featureability/sceneproject/terminateabilitytest/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", -} diff --git a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/Test.json b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/BUILD.gn b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/BUILD.gn index 571627b22367abbf9e09dbbffdf6e5d8b52ebb7c..19169f2c2f7a4f3b3c411abb600033381134797c 100644 --- a/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/BUILD.gn +++ b/ability/ability_runtime/killprocesswithaccountstage/ActsKillProcessWithAccountTest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsKillProcessWithAccountTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actskillprocesswithaccounttest_js_assets", ":actskillprocesswithaccounttest_resources", diff --git a/ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn b/ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn index b198f2ee22e58daee5f0292376ad560968247edc..b978d150f64f2d7e8447a0416eb4164607380ddc 100644 --- a/ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn +++ b/ability/ability_runtime/newwant/actsnewwantapi7relyhap/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsAmsNewWantApi7RelyHap") { hap_profile = "./entry/src/main/config.json" + js_build_mode = "debug" hap_name = "ActsAmsNewWantApi7RelyHap" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/newwant/actsnewwantarelyhap/BUILD.gn b/ability/ability_runtime/newwant/actsnewwantarelyhap/BUILD.gn index 8739ecfb60413bb5ad946a0146b06e30ace99030..99f2ffec2fe195a35c26193fdca925f064907314 100644 --- a/ability/ability_runtime/newwant/actsnewwantarelyhap/BUILD.gn +++ b/ability/ability_runtime/newwant/actsnewwantarelyhap/BUILD.gn @@ -13,15 +13,20 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsNewWantARelyHap") { +ohos_hap("ActsAmsNewWantARelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + hap_name = "ActsAmsNewWantARelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsnewwantarelyhap_js_assets", ":actsnewwantarelyhap_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAmsNewWantARelyHap" } ohos_app_scope("actsnewwantarelyhap_app_profile") { diff --git a/ability/ability_runtime/newwant/actsnewwantarelyhap/Test.json b/ability/ability_runtime/newwant/actsnewwantarelyhap/Test.json deleted file mode 100644 index 6726477872fb03a764124e61a8c04d4fa985c97b..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/newwant/actsnewwantarelyhap/Test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "180000", - "package": "com.example.newwanthapc", - "shell-timeout": "600000" - }, - "kits": [ - { - "test-file-name": [ - "ActsAmsNewWantARelyHap.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} diff --git a/ability/ability_runtime/newwant/actsnewwantbrelyhap/BUILD.gn b/ability/ability_runtime/newwant/actsnewwantbrelyhap/BUILD.gn index 5ff1b8f79d2af4b81619fb2c51bfb7a8d56d0513..441e65252fbdc1c1a228124b0bc20919b573355e 100644 --- a/ability/ability_runtime/newwant/actsnewwantbrelyhap/BUILD.gn +++ b/ability/ability_runtime/newwant/actsnewwantbrelyhap/BUILD.gn @@ -13,15 +13,20 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsNewWantBRelyHap") { +ohos_hap("ActsAmsNewWantBRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + hap_name = "ActsAmsNewWantBRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsnewwantbrelyhap_js_assets", ":actsnewwantbrelyhap_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAmsNewWantBRelyHap" } ohos_app_scope("actsnewwantbrelyhap_app_profile") { diff --git a/ability/ability_runtime/newwant/actsnewwantbrelyhap/Test.json b/ability/ability_runtime/newwant/actsnewwantbrelyhap/Test.json deleted file mode 100644 index 5d03e342a51156059d3ae38ea9199705d902e036..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/newwant/actsnewwantbrelyhap/Test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "180000", - "package": "com.example.newwanthapb", - "shell-timeout": "600000" - }, - "kits": [ - { - "test-file-name": [ - "ActsAmsNewWantBRelyHap.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} diff --git a/ability/ability_runtime/newwant/actsnewwantrelyhap/BUILD.gn b/ability/ability_runtime/newwant/actsnewwantrelyhap/BUILD.gn index 104d7ef93c610e421dc35dee50dec0a065229f37..9ea781fe1b3e3381716d70cac5b9e053a3b0311e 100644 --- a/ability/ability_runtime/newwant/actsnewwantrelyhap/BUILD.gn +++ b/ability/ability_runtime/newwant/actsnewwantrelyhap/BUILD.gn @@ -13,15 +13,20 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsNewWantRelyHap") { +ohos_hap("ActsAmsNewWantRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" + hap_name = "ActsAmsNewWantRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsnewwantrelyhap_js_assets", ":actsnewwantrelyhap_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAmsNewWantRelyHap" } ohos_app_scope("actsnewwantrelyhap_app_profile") { diff --git a/ability/ability_runtime/newwant/actsnewwantrelyhap/Test.json b/ability/ability_runtime/newwant/actsnewwantrelyhap/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/newwant/actsnewwantrelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/newwant/actsnewwanttest/BUILD.gn b/ability/ability_runtime/newwant/actsnewwanttest/BUILD.gn index 63217f54f89fa5c3ef0d084d3fa96830f5e3d56a..a90e34bd620f0d824b28d07ad850743da0cf8b74 100644 --- a/ability/ability_runtime/newwant/actsnewwanttest/BUILD.gn +++ b/ability/ability_runtime/newwant/actsnewwanttest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsNewWantTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsnewwanttest_js_assets", ":actsnewwanttest_resources", diff --git a/ability/ability_runtime/non_concurrent/acts_systemappa_test/BUILD.gn b/ability/ability_runtime/non_concurrent/acts_systemappa_test/BUILD.gn index 2b0e3dd3cdbb673279f5239fe862fe8085662bb7..8951f04ccb93e05bce5edefdd1167164d5ca9bc2 100644 --- a/ability/ability_runtime/non_concurrent/acts_systemappa_test/BUILD.gn +++ b/ability/ability_runtime/non_concurrent/acts_systemappa_test/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsSystemAppATest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actssystemappatest_js_assets", ":actssystemappatest_resources", diff --git a/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/BUILD.gn b/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/BUILD.gn index 5b8bb03ca69ab8afec9ec4cde660c88f405b23c4..d3e0551c72c73387a6a1045a0fdaaa6d76e1d25f 100644 --- a/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/BUILD.gn +++ b/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsSystemAppOneRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" hap_name = "ActsSystemAppOneRelyHap" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/Test.json b/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/non_concurrent/acts_systemappone_rely_test/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn index 15d4aa6e7df70e622ad1ebe9d3053cbc1790a1bf..ef397f88cccc0ff5638d059c4e97bf2af9b45f47 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapAARelyHap") { +ohos_hap("ActsAmsProcessMultiinstanceHapAARelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsprocessmultiinstancehapaarelyhap_js_assets", ":actsamsprocessmultiinstancehapaarelyhap_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapAARelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapAARelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("actsamsprocessmultiinstancehapaarelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/Test.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapaarelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/BUILD.gn index ab19e57fe806a8baa4642f65b475ecd5fd3ac812..12e1e9c3d2185d39075987d25ca35c9ea482c955 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapABRelyHap") { +ohos_hap("ActsAmsProcessMultiinstanceHapABRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsprocessmultiinstancehapabrelyhap_js_assets", ":actsamsprocessmultiinstancehapabrelyhap_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapABRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapABRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("actsamsprocessmultiinstancehapabrelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/Test.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapabrelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/BUILD.gn index 778c308e58e82176510172e822e66464c47a5408..d5a07a60fdb65cf59b1c0d2fcea974a2c6d5dcd3 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapBARelyHap") { +ohos_hap("ActsAmsProcessMultiinstanceHapBARelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsprocessmultiinstancehapbarelyhap_js_assets", ":actsamsprocessmultiinstancehapbarelyhap_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapBARelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapBARelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("actsamsprocessmultiinstancehapbarelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/Test.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbarelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/BUILD.gn index aaa7d85692984d86cc3d12eab8cd20a383d1a533..d2de656f5fab54c2295f5531a90f7eebf3755daf 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapBBRelyHap") { +ohos_hap("ActsAmsProcessMultiinstanceHapBBRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsprocessmultiinstancehapbbrelyhap_js_assets", ":actsamsprocessmultiinstancehapbbrelyhap_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapBBRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapBBRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("actsamsprocessmultiinstancehapbbrelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/Test.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbbrelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/BUILD.gn index 9622d12b376457eee1eee2dbdc6b7a30a2bde5c4..02ab49f475adbfcaf126ba5292628a0c038b4c54 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapBCRelyHap") { +ohos_hap("ActsAmsProcessMultiinstanceHapBCRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsprocessmultiinstancehapbcrelyhap_js_assets", ":actsamsprocessmultiinstancehapbcrelyhap_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapBCRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapBCRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("actsamsprocessmultiinstancehapbcrelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/Test.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbcrelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/BUILD.gn index 8a0b91598ef8aa2ba5b824627b8c07974ce1abe9..ecb1b25b0e6a2253fa22ce19008a203086136a9e 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapBDRelyHap") { +ohos_hap("ActsAmsProcessMultiinstanceHapBDRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsprocessmultiinstancehapbdrelyhap_js_assets", ":actsamsprocessmultiinstancehapbdrelyhap_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapBDRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapBDRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("actsamsprocessmultiinstancehapbdrelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/Test.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbdrelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/BUILD.gn index 96589490845a2c9fea4f5a5072e46e25a9727d72..d946023576bc361f057001ea14a2e2a01ceea86e 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapBERelyHap") { +ohos_hap("ActsAmsProcessMultiinstanceHapBERelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsprocessmultiinstancehapberelyhap_js_assets", ":actsamsprocessmultiinstancehapberelyhap_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapBERelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapBERelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("actsamsprocessmultiinstancehapberelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/Test.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapberelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/BUILD.gn index c7581a194ffaeff5364faeccfc8d2d24a7df29ec..5be228dd262f53acc0d59deaadb4739b4dabaef3 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapBFRelyHap") { +ohos_hap("ActsAmsProcessMultiinstanceHapBFRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsprocessmultiinstancehapbfrelyhap_js_assets", ":actsamsprocessmultiinstancehapbfrelyhap_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsAmsProcessMultiinstanceHapBFRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsProcessMultiinstanceHapBFRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("actsamsprocessmultiinstancehapbfrelyhap_app_profile") { diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/Test.json b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancehapbfrelyhap/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -} diff --git a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/BUILD.gn b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/BUILD.gn index db27e6d747f67941fdbc62f62599910d8b704adc..0c85331592d4630557313284dd237a5eb20570e9 100644 --- a/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/BUILD.gn +++ b/ability/ability_runtime/processmultiinstance/actsamsprocessmultiinstancetest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsProcessMultiinstanceTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamsprocessmultiinstance_js_assets", ":actsamsprocessmultiinstance_resources", diff --git a/ability/ability_runtime/stage/BUILD.gn b/ability/ability_runtime/stage/BUILD.gn index f05ebb7ec909581521e548a1d21075f6dc1d3b7f..ed2e6a2e295d1a6c553b37222547f24202777374 100644 --- a/ability/ability_runtime/stage/BUILD.gn +++ b/ability/ability_runtime/stage/BUILD.gn @@ -17,8 +17,8 @@ group("stage") { testonly = true if (is_standard_system) { deps = [ - "actslifecyclemultihap2test:ActsLifecycleMultiHap2Test", - "actslifecyclemultihap3test:ActsLifecycleMultiHap3Test", + "actslifecyclemultihap2:ActsLifecycleMultiHap2", + "actslifecyclemultihap3:ActsLifecycleMultiHap3", "actslifecyclemultihaptest:ActsLifecycleMultiHapTest", "actslifecyclesinglehaptest:ActsLifecycleSingleHapTest", ] diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/AppScope/app.json b/ability/ability_runtime/stage/actslifecyclemultihap2/AppScope/app.json similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/AppScope/app.json rename to ability/ability_runtime/stage/actslifecyclemultihap2/AppScope/app.json diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/AppScope/resources/base/element/string.json b/ability/ability_runtime/stage/actslifecyclemultihap2/AppScope/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/AppScope/resources/base/element/string.json rename to ability/ability_runtime/stage/actslifecyclemultihap2/AppScope/resources/base/element/string.json diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/AppScope/resources/base/media/app_icon.png b/ability/ability_runtime/stage/actslifecyclemultihap2/AppScope/resources/base/media/app_icon.png similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/AppScope/resources/base/media/app_icon.png rename to ability/ability_runtime/stage/actslifecyclemultihap2/AppScope/resources/base/media/app_icon.png diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/BUILD.gn b/ability/ability_runtime/stage/actslifecyclemultihap2/BUILD.gn similarity index 64% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/BUILD.gn rename to ability/ability_runtime/stage/actslifecyclemultihap2/BUILD.gn index 50af07476ed56c79d0e342f8be00f78cd1675ffd..c939fc5249840a2475555cfc3352ce06fb21b52c 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap2test/BUILD.gn +++ b/ability/ability_runtime/stage/actslifecyclemultihap2/BUILD.gn @@ -13,28 +13,33 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsLifecycleMultiHap2Test") { +ohos_hap("ActsLifecycleMultiHap2") { + hap_name = "ActsLifecycleMultiHap2" + js_build_mode = "debug" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true hap_profile = "entry/src/main/module.json" deps = [ - ":actslifecyclemultihap2test_js_assets", - ":actslifecyclemultihap2test_resources", + ":actslifecyclemultihap2_js_assets", + ":actslifecyclemultihap2_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsLifecycleMultiHap2Test" } -ohos_app_scope("actslifecyclemultihap2test_app_profile") { +ohos_app_scope("actslifecyclemultihap2_app_profile") { app_profile = "AppScope/app.json" sources = [ "AppScope/resources" ] } -ohos_js_assets("actslifecyclemultihap2test_js_assets") { +ohos_js_assets("actslifecyclemultihap2_js_assets") { source_dir = "entry/src/main/ets" } -ohos_resources("actslifecyclemultihap2test_resources") { +ohos_resources("actslifecyclemultihap2_resources") { sources = [ "entry/src/main/resources" ] - deps = [ ":actslifecyclemultihap2test_app_profile" ] + deps = [ ":actslifecyclemultihap2_app_profile" ] hap_profile = "entry/src/main/module.json" } diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Application/AbilityStage.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Application/AbilityStage.ts rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Application/AbilityStage.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility1/Hap2MainAbility1.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility1/Hap2MainAbility1.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility1/Hap2MainAbility1.ts rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility1/Hap2MainAbility1.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility10/Hap2MainAbility10.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility10/Hap2MainAbility10.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility10/Hap2MainAbility10.ts rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility10/Hap2MainAbility10.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility2/Hap2MainAbility2.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility2/Hap2MainAbility2.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility2/Hap2MainAbility2.ts rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility2/Hap2MainAbility2.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility3/Hap2MainAbility3.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility3/Hap2MainAbility3.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility3/Hap2MainAbility3.ts rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility3/Hap2MainAbility3.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility4/Hap2MainAbility4.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility4/Hap2MainAbility4.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility4/Hap2MainAbility4.ts rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility4/Hap2MainAbility4.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility5/Hap2MainAbility5.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility5/Hap2MainAbility5.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility5/Hap2MainAbility5.ts rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility5/Hap2MainAbility5.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility6/Hap2MainAbility6.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility6/Hap2MainAbility6.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility6/Hap2MainAbility6.ts rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility6/Hap2MainAbility6.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility7/Hap2MainAbility7.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility7/Hap2MainAbility7.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility7/Hap2MainAbility7.ts rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility7/Hap2MainAbility7.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility8/Hap2MainAbility8.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility8/Hap2MainAbility8.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility8/Hap2MainAbility8.ts rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility8/Hap2MainAbility8.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility9/Hap2MainAbility9.ts b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility9/Hap2MainAbility9.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/Hap2MainAbility9/Hap2MainAbility9.ts rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/Hap2MainAbility9/Hap2MainAbility9.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility10_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility10_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility10_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility10_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility1_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility1_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility1_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility1_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility2_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility2_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility2_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility2_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility3_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility3_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility3_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility3_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility4_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility4_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility4_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility4_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility5_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility5_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility5_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility5_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility6_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility6_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility6_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility6_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility7_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility7_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility7_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility7_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility8_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility8_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility8_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility8_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility9_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility9_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/ets/pages/Hap2MainAbility9_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/ets/pages/Hap2MainAbility9_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/module.json b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/module.json similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/module.json rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/module.json diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/resources/base/element/string.json rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/resources/base/element/string.json diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/resources/base/media/icon.png similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/resources/base/media/icon.png rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/resources/base/media/icon.png diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/entry/src/main/resources/base/profile/main_pages.json rename to ability/ability_runtime/stage/actslifecyclemultihap2/entry/src/main/resources/base/profile/main_pages.json diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/signature/openharmony_sx.p7b b/ability/ability_runtime/stage/actslifecyclemultihap2/signature/openharmony_sx.p7b similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap2test/signature/openharmony_sx.p7b rename to ability/ability_runtime/stage/actslifecyclemultihap2/signature/openharmony_sx.p7b diff --git a/ability/ability_runtime/stage/actslifecyclemultihap2test/Test.json b/ability/ability_runtime/stage/actslifecyclemultihap2test/Test.json deleted file mode 100644 index f90168bef2aac9d93ee6caba4da1165cff4f8c95..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/stage/actslifecyclemultihap2test/Test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "180000", - "package": "com.example.lifecycletest", - "shell-timeout": "600000" - }, - "kits": [ - { - "test-file-name": [ - "ActsLifecycleMultiHap2Test.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/AppScope/app.json b/ability/ability_runtime/stage/actslifecyclemultihap3/AppScope/app.json similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/AppScope/app.json rename to ability/ability_runtime/stage/actslifecyclemultihap3/AppScope/app.json diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/AppScope/resources/base/element/string.json b/ability/ability_runtime/stage/actslifecyclemultihap3/AppScope/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/AppScope/resources/base/element/string.json rename to ability/ability_runtime/stage/actslifecyclemultihap3/AppScope/resources/base/element/string.json diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/AppScope/resources/base/media/app_icon.png b/ability/ability_runtime/stage/actslifecyclemultihap3/AppScope/resources/base/media/app_icon.png similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/AppScope/resources/base/media/app_icon.png rename to ability/ability_runtime/stage/actslifecyclemultihap3/AppScope/resources/base/media/app_icon.png diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/BUILD.gn b/ability/ability_runtime/stage/actslifecyclemultihap3/BUILD.gn similarity index 64% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/BUILD.gn rename to ability/ability_runtime/stage/actslifecyclemultihap3/BUILD.gn index d163f02cf004ae32bd99c93985da0189792b6bd3..0f8bac95043f2be445e453baf369030993c2a0bf 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihap3test/BUILD.gn +++ b/ability/ability_runtime/stage/actslifecyclemultihap3/BUILD.gn @@ -13,28 +13,33 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsLifecycleMultiHap3Test") { +ohos_hap("ActsLifecycleMultiHap3") { + hap_name = "ActsLifecycleMultiHap3" + js_build_mode = "debug" hap_profile = "entry/src/main/module.json" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ - ":actslifecyclemultihap3test_js_assets", - ":actslifecyclemultihap3test_resources", + ":actslifecyclemultihap3_js_assets", + ":actslifecyclemultihap3_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsLifecycleMultiHap3Test" } -ohos_app_scope("actslifecyclemultihap3test_app_profile") { +ohos_app_scope("actslifecyclemultihap3_app_profile") { app_profile = "AppScope/app.json" sources = [ "AppScope/resources" ] } -ohos_js_assets("actslifecyclemultihap3test_js_assets") { +ohos_js_assets("actslifecyclemultihap3_js_assets") { source_dir = "entry/src/main/ets" } -ohos_resources("actslifecyclemultihap3test_resources") { +ohos_resources("actslifecyclemultihap3_resources") { sources = [ "entry/src/main/resources" ] - deps = [ ":actslifecyclemultihap3test_app_profile" ] + deps = [ ":actslifecyclemultihap3_app_profile" ] hap_profile = "entry/src/main/module.json" } diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/ets/Application/AbilityStage.ts b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Application/AbilityStage.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/ets/Application/AbilityStage.ts rename to ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Application/AbilityStage.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/ets/Hap3MainAbility1/Hap3MainAbility1.ts b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility1/Hap3MainAbility1.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/ets/Hap3MainAbility1/Hap3MainAbility1.ts rename to ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility1/Hap3MainAbility1.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/ets/Hap3MainAbility2/Hap3MainAbility2.ts b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility2/Hap3MainAbility2.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/ets/Hap3MainAbility2/Hap3MainAbility2.ts rename to ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility2/Hap3MainAbility2.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/ets/Hap3MainAbility3/Hap3MainAbility3.ts b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility3/Hap3MainAbility3.ts similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/ets/Hap3MainAbility3/Hap3MainAbility3.ts rename to ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/Hap3MainAbility3/Hap3MainAbility3.ts diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/ets/pages/Hap3MainAbility1_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/pages/Hap3MainAbility1_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/ets/pages/Hap3MainAbility1_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/pages/Hap3MainAbility1_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/ets/pages/Hap3MainAbility2_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/pages/Hap3MainAbility2_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/ets/pages/Hap3MainAbility2_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/pages/Hap3MainAbility2_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/ets/pages/Hap3MainAbility3_pages.ets b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/pages/Hap3MainAbility3_pages.ets similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/ets/pages/Hap3MainAbility3_pages.ets rename to ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/ets/pages/Hap3MainAbility3_pages.ets diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/module.json b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/module.json similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/module.json rename to ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/module.json diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/resources/base/element/string.json similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/resources/base/element/string.json rename to ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/resources/base/element/string.json diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/resources/base/media/icon.png similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/resources/base/media/icon.png rename to ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/resources/base/media/icon.png diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/resources/base/profile/main_pages.json b/ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/entry/src/main/resources/base/profile/main_pages.json rename to ability/ability_runtime/stage/actslifecyclemultihap3/entry/src/main/resources/base/profile/main_pages.json diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/signature/openharmony_sx.p7b b/ability/ability_runtime/stage/actslifecyclemultihap3/signature/openharmony_sx.p7b similarity index 100% rename from ability/ability_runtime/stage/actslifecyclemultihap3test/signature/openharmony_sx.p7b rename to ability/ability_runtime/stage/actslifecyclemultihap3/signature/openharmony_sx.p7b diff --git a/ability/ability_runtime/stage/actslifecyclemultihap3test/Test.json b/ability/ability_runtime/stage/actslifecyclemultihap3test/Test.json deleted file mode 100644 index 9fe74e62191d4a0b87664e12d4401cccbb224b6d..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/stage/actslifecyclemultihap3test/Test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "180000", - "package": "com.example.lifecycletest", - "shell-timeout": "600000" - }, - "kits": [ - { - "test-file-name": [ - "ActsLifecycleMultiHap3Test.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/BUILD.gn b/ability/ability_runtime/stage/actslifecyclemultihaptest/BUILD.gn index fe3b14b8a877c468cda50b453ff6d62e8ce180b7..53d7853fe267198cf93123d6d776d9a93c3e7a99 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/BUILD.gn +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsLifecycleMultiHapTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actslifecyclemultihaptest_js_assets", ":actslifecyclemultihaptest_resources", diff --git a/ability/ability_runtime/stage/actslifecyclemultihaptest/Test.json b/ability/ability_runtime/stage/actslifecyclemultihaptest/Test.json index d188df594316a2c2a9292e994b2b501f99971134..e73cb54310f368beffac1a4996d4bcb66b6b34d4 100644 --- a/ability/ability_runtime/stage/actslifecyclemultihaptest/Test.json +++ b/ability/ability_runtime/stage/actslifecyclemultihaptest/Test.json @@ -10,8 +10,8 @@ { "test-file-name": [ "ActsLifecycleMultiHapTest.hap", - "ActsLifecycleMultiHap2Test.hap", - "ActsLifecycleMultiHap3Test.hap" + "ActsLifecycleMultiHap2.hap", + "ActsLifecycleMultiHap3.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ability/ability_runtime/stage/actslifecyclesinglehaptest/BUILD.gn b/ability/ability_runtime/stage/actslifecyclesinglehaptest/BUILD.gn index 431d74fb0251798e1eafb8c58b37827df91ca9f5..b76b4552c0890d498e617a6d9c8e58a08232e031 100644 --- a/ability/ability_runtime/stage/actslifecyclesinglehaptest/BUILD.gn +++ b/ability/ability_runtime/stage/actslifecyclesinglehaptest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsLifecycleSingleHapTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actslifecyclesinglehaptest_js_assets", ":actslifecyclesinglehaptest_resources", diff --git a/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/BUILD.gn b/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/BUILD.gn index a0c2cf96c5f3afe21f5c202bf44366ce48c93d8d..33e877cd8fa3c4ecbb0ece2c6ee0577b63d193a3 100644 --- a/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/BUILD.gn +++ b/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/BUILD.gn @@ -14,6 +14,7 @@ import("//test/xts/tools/build/suite.gni") ohos_hap("ActsGetWantAllTestHap") { hap_profile = "./src/main/config.json" + js_build_mode = "debug" hap_name = "ActsGetWantAllTestHap" subsystem_name = XTS_SUITENAME final_hap_path = diff --git a/ability/ability_runtime/zidltest/actsamszidlclienttest/BUILD.gn b/ability/ability_runtime/zidltest/actsamszidlclienttest/BUILD.gn index 0b5cd1ac3d950b101919eb3f2854e4f7fcc56a99..b3266873926c57d3396281901620c5663dc7db3a 100644 --- a/ability/ability_runtime/zidltest/actsamszidlclienttest/BUILD.gn +++ b/ability/ability_runtime/zidltest/actsamszidlclienttest/BUILD.gn @@ -15,6 +15,7 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("ActsAmsZidlClientTest") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamszidlclienttest_js_assets", ":actsamszidlclienttest_resources", diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/BUILD.gn b/ability/ability_runtime/zidltest/actsamszidlservice/BUILD.gn index cc8a1708e73a74539dacc88f92fbe69fe0954b72..c669685f1410928a447df0948ace3aa24bfcd9c8 100644 --- a/ability/ability_runtime/zidltest/actsamszidlservice/BUILD.gn +++ b/ability/ability_runtime/zidltest/actsamszidlservice/BUILD.gn @@ -13,8 +13,9 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsZidlServiceRelyHap") { +ohos_hap("ActsAmsZidlServiceRelyHap") { hap_profile = "entry/src/main/module.json" + js_build_mode = "debug" deps = [ ":actsamszidlservicerelyhap_js_assets", ":actsamszidlservicerelyhap_resources", @@ -22,6 +23,10 @@ ohos_js_hap_suite("ActsAmsZidlServiceRelyHap") { ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" hap_name = "ActsAmsZidlServiceRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true } ohos_app_scope("actsamszidlservicerelyhap_app_profile") { diff --git a/ability/ability_runtime/zidltest/actsamszidlservice/Test.json b/ability/ability_runtime/zidltest/actsamszidlservice/Test.json deleted file mode 100644 index 4300a64be9af93e37a31f6b5c6fc734e8f1b4563..0000000000000000000000000000000000000000 --- a/ability/ability_runtime/zidltest/actsamszidlservice/Test.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "description": "Configuration for hjunit demo Tests" -}