diff --git a/aafwk/aafwk_standard/abilitymultiinstance/amsabilitymultiinstancetest/Test.json b/aafwk/aafwk_standard/abilitymultiinstance/amsabilitymultiinstancetest/Test.json index f3c05f6cac44b4e1392bd7de9359f572e107fef2..ab88a5292e3899519ebc08b79d02bd83a7d98a02 100755 --- a/aafwk/aafwk_standard/abilitymultiinstance/amsabilitymultiinstancetest/Test.json +++ b/aafwk/aafwk_standard/abilitymultiinstance/amsabilitymultiinstancetest/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for hjunit demo Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "1000000", + "test-timeout": "500000", "package": "com.example.abilitymultiinstance", "shell-timeout": "300000" }, diff --git a/aafwk/aafwk_standard/actscalltest/systemcallentrytest/Test.json b/aafwk/aafwk_standard/actscalltest/systemcallentrytest/Test.json index 9e244efab107c2acc4f7a1dd68f19e6a3ce92f3a..87ac89c4f63fc417d0c27cf4fb4831130b95ae32 100755 --- a/aafwk/aafwk_standard/actscalltest/systemcallentrytest/Test.json +++ b/aafwk/aafwk_standard/actscalltest/systemcallentrytest/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for hjunit demo Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "1000000", + "test-timeout": "300000", "package": "com.example.systemcalltest", "shell-timeout": "60000" }, diff --git a/aafwk/aafwk_standard/actscalltest/thirdcalltest/Test.json b/aafwk/aafwk_standard/actscalltest/thirdcalltest/Test.json index be829fa64d2f0de17aed753a31a013505eb5a561..5ff5006bfa5d2a4d0c31ea2c50aa85784e28eed9 100755 --- a/aafwk/aafwk_standard/actscalltest/thirdcalltest/Test.json +++ b/aafwk/aafwk_standard/actscalltest/thirdcalltest/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for hjunit demo Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "1000000", + "test-timeout": "100000", "package": "com.example.thirdcalltest", "shell-timeout": "60000" }, diff --git a/aafwk/aafwk_standard/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn b/aafwk/aafwk_standard/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn index b3dd9ae9bfabcba69c160f9853732a22e11c836c..5e0fe0295965a36a6860393da1a9ef92051c2ecd 100755 --- a/aafwk/aafwk_standard/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn +++ b/aafwk/aafwk_standard/actsusers/ActsAmsUsersKillProcessAppA/BUILD.gn @@ -13,15 +13,19 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsUsersKillProcessAppA") { +ohos_hap("ActsAmsUsersKillProcessAppA") { hap_profile = "entry/src/main/module.json" + hap_name = "ActsAmsUsersKillProcessAppA" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsamsuserskillprocessappa_js_assets", ":actsamsuserskillprocessappa_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAmsUsersKillProcessAppA" } ohos_app_scope("actsamsuserskillprocessappa_app_profile") { diff --git a/aafwk/aafwk_standard/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn b/aafwk/aafwk_standard/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn index 9e4027b42a84f1196a629e190d5d3ae474a94382..1cee2c8265a9ecc77cf78c672dd4174f58ed4830 100755 --- a/aafwk/aafwk_standard/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn +++ b/aafwk/aafwk_standard/actsusers/ActsAmsUsersKillProcessAppB/BUILD.gn @@ -13,15 +13,19 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsUsersKillProcessAppB") { +ohos_hap("ActsAmsUsersKillProcessAppB") { hap_profile = "entry/src/main/module.json" + hap_name = "ActsAmsUsersKillProcessAppB" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsamsuserskillprocessappb_js_assets", ":actsamsuserskillprocessappb_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAmsUsersKillProcessAppB" } ohos_app_scope("actsamsuserskillprocessappb_app_profile") { diff --git a/aafwk/aafwk_standard/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn b/aafwk/aafwk_standard/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn index 9e83279c41e965d1f4e07a362cc2ef5726f2c079..cd1e0ed22f9ef55fbee7c0250c4dbdd656c99a88 100755 --- a/aafwk/aafwk_standard/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn +++ b/aafwk/aafwk_standard/actsusers/ActsAmsUsersKillProcessAppC/BUILD.gn @@ -13,15 +13,19 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsUsersKillProcessAppC") { +ohos_hap("ActsAmsUsersKillProcessAppC") { hap_profile = "entry/src/main/module.json" + hap_name = "ActsAmsUsersKillProcessAppC" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsamsuserskillprocessappc_js_assets", ":actsamsuserskillprocessappc_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAmsUsersKillProcessAppC" } ohos_app_scope("actsamsuserskillprocessappc_app_profile") { diff --git a/aafwk/aafwk_standard/actsusers/actsserviceabilityrelytest/BUILD.gn b/aafwk/aafwk_standard/actsusers/actsserviceabilityrelytest/BUILD.gn index eeaa839ab5651544fceacb0492e3618fa45e35de..2c0778690c6b7daa670896025cc89425d8361ffb 100755 --- a/aafwk/aafwk_standard/actsusers/actsserviceabilityrelytest/BUILD.gn +++ b/aafwk/aafwk_standard/actsusers/actsserviceabilityrelytest/BUILD.gn @@ -13,15 +13,19 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("actsServiceAbilityRelyHap") { +ohos_hap("actsServiceAbilityRelyHap") { hap_profile = "entry/src/main/module.json" + hap_name = "actsServiceAbilityRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsserviceabilityrelytest_js_assets", ":actsserviceabilityrelytest_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "actsServiceAbilityRelyHap" } ohos_app_scope("actsserviceabilityrelytest_app_profile") { diff --git a/aafwk/aafwk_standard/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn b/aafwk/aafwk_standard/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn index 360d5286174b91725f07b84aa736e5808b7d6dcc..9ca60e9bc801edec2f1a60b5f316630d3d89de12 100644 --- a/aafwk/aafwk_standard/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn +++ b/aafwk/aafwk_standard/amscontextualinforquery/actsamsextensionmodulehap/BUILD.gn @@ -13,15 +13,19 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsExtensionModuleRelyHap") { +ohos_hap("ActsAmsExtensionModuleRelyHap") { hap_profile = "entry/src/main/module.json" + hap_name = "ActsAmsExtensionModuleRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsamsextensionmodulerelyhap_js_assets", ":actsamsextensionmodulerelyhap_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAmsExtensionModuleRelyHap" } ohos_app_scope("actsamsextensionmodulerelyhap_app_profile") { diff --git a/aafwk/aafwk_standard/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn b/aafwk/aafwk_standard/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn index 73fef6379681ae8e6c33dd92041162ae91ce012c..faf67aba57e21e7a1ebcc8b13ea8f61911bbfb76 100644 --- a/aafwk/aafwk_standard/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn +++ b/aafwk/aafwk_standard/amscontextualinforquery/actsamsstaticextensioninfohap/BUILD.gn @@ -13,15 +13,19 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsStaticExtensionInfoRelyHap") { +ohos_hap("ActsAmsStaticExtensionInfoRelyHap") { hap_profile = "entry/src/main/module.json" + hap_name = "ActsAmsStaticExtensionInfoRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsamsstaticextensioninforelyhap_js_assets", ":actsamsstaticextensioninforelyhap_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAmsStaticExtensionInfoRelyHap" } ohos_app_scope("actsamsstaticextensioninforelyhap_app_profile") { diff --git a/aafwk/aafwk_standard/amscontextualinforquery/actsamsstatichapa/BUILD.gn b/aafwk/aafwk_standard/amscontextualinforquery/actsamsstatichapa/BUILD.gn index 2e0822e7659a40f014de29c173e08b1b63da6374..14e681ef14473acb496a0c926a394f50042347cf 100644 --- a/aafwk/aafwk_standard/amscontextualinforquery/actsamsstatichapa/BUILD.gn +++ b/aafwk/aafwk_standard/amscontextualinforquery/actsamsstatichapa/BUILD.gn @@ -13,15 +13,19 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsStaticARelyHap") { +ohos_hap("ActsAmsStaticARelyHap") { hap_profile = "entry/src/main/module.json" + hap_name = "ActsAmsStaticARelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsamsstaticarelyhap_js_assets", ":actsamsstaticarelyhap_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAmsStaticARelyHap" } ohos_app_scope("actsamsstaticarelyhap_app_profile") { diff --git a/aafwk/aafwk_standard/amscontextualinforquery/actsamsstatichapb/BUILD.gn b/aafwk/aafwk_standard/amscontextualinforquery/actsamsstatichapb/BUILD.gn index 2550f6187977034683736e2bbe87a3bf4e7e499b..4de043201c55f8069e4c6d07c46018abdd903c9e 100644 --- a/aafwk/aafwk_standard/amscontextualinforquery/actsamsstatichapb/BUILD.gn +++ b/aafwk/aafwk_standard/amscontextualinforquery/actsamsstatichapb/BUILD.gn @@ -13,15 +13,19 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsStaticBRelyHap") { +ohos_hap("ActsAmsStaticBRelyHap") { hap_profile = "entry/src/main/module.json" + hap_name = "ActsAmsStaticBRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsamsstaticbrelyhap_js_assets", ":actsamsstaticbrelyhap_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAmsStaticBRelyHap" } ohos_app_scope("actsamsstaticbrelyhap_app_profile") { diff --git a/aafwk/aafwk_standard/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn b/aafwk/aafwk_standard/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn index 54cfa87f7eb8b953381b5c160c94db84024bfe8d..ca18977cc4a2f5da3d202e3efad6a4558cd4dc7a 100644 --- a/aafwk/aafwk_standard/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn +++ b/aafwk/aafwk_standard/amscontextualinforquery/actsamsstaticquerytesttwohap/BUILD.gn @@ -13,15 +13,19 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAmsStaticQueryTestTwoRelyHap") { +ohos_hap("ActsAmsStaticQueryTestTwoRelyHap") { hap_profile = "entry/src/main/module.json" + hap_name = "ActsAmsStaticQueryTestTwoRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actsamsstaticquerytesttworelyhap_js_assets", ":actsamsstaticquerytesttworelyhap_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsAmsStaticQueryTestTwoRelyHap" } ohos_app_scope("actsamsstaticquerytesttworelyhap_app_profile") { diff --git a/aafwk/aafwk_standard/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/test/Ability.test.ets b/aafwk/aafwk_standard/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/test/Ability.test.ets index d76e7f621a4bde7bdf3c9684d82d4a327cb2368e..c93b7093fb2f95a3ad14c72a4f0d93cdd4ea54f0 100644 --- a/aafwk/aafwk_standard/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/test/Ability.test.ets +++ b/aafwk/aafwk_standard/amsdisplayIdtest/actsamsstartabilitytest/entry/src/main/ets/test/Ability.test.ets @@ -74,8 +74,6 @@ export default function abilityTest(abilityContext) { describe('ActsGetDisplayIdStartAbilityTest', function () { afterEach(async (done) => { - let installer = await bundle.getBundleInstaller(); - var count = 0; var testMissionId; testMissionId = await getMissionId(); diff --git a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js index aea8ccf58a2d540dbf7cb0e8787425a92940bb7a..f98cddd8d2e30a3ac6b5d2103e0fc0cb3148356f 100755 --- a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js +++ b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/test/FeatureAbilityJsunit.test.js @@ -21,6 +21,7 @@ import wantAgent from '@ohos.wantAgent'; import particleAbility from '@ohos.ability.particleAbility' import backgroundTaskManager from '@ohos.backgroundTaskManager' +const CREATELOCALDIR = "/data/storage/el2/base/haps/entry"; const START_ABILITY_TIMEOUT = 4000; const TERMINATE_ABILITY_TIMEOUT = 1000; const TIMEOUT = 1000; @@ -1815,12 +1816,6 @@ describe('ActsFeatureAbilityTest', function () { ); }) - // checkGetOrCreateLocalDir - function checkGetOrCreateLocalDir(info) { - console.log("checkGetOrCreateLocalDir root dir : " + info); - expect(typeof (info)).assertEqual("string"); - } - // @tc.number: ACTS_GetOrCreateLocalDir_0100 // @tc.name: GetProcessName : Obtains the name of the current process. // @tc.desc: Check the return value of the interface (by promise) @@ -1829,7 +1824,7 @@ describe('ActsFeatureAbilityTest', function () { var promise = context.getOrCreateLocalDir(); expect(typeof (promise)).assertEqual("object"); var info = await context.getOrCreateLocalDir(); - checkGetOrCreateLocalDir(info); + expect(info).assertEqual(CREATELOCALDIR); done(); setTimeout(function () { console.info('====> ACTS_GetOrCreateLocalDir_0100 =====>') @@ -1843,7 +1838,7 @@ describe('ActsFeatureAbilityTest', function () { var context = featureAbility.getContext(); var result = context.getOrCreateLocalDir( (err, data) => { - checkGetOrCreateLocalDir(data); + expect(data).assertEqual(CREATELOCALDIR); done() } ); diff --git a/aafwk/aafwk_standard/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/BUILD.gn b/aafwk/aafwk_standard/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/BUILD.gn index ee3d4bb15b5c621c33284b16330a95eaae9e777e..ab5874b3563a523bebb88cbb68d53fcd94889f09 100755 --- a/aafwk/aafwk_standard/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/BUILD.gn +++ b/aafwk/aafwk_standard/killprocesswithaccountstage/ActsKillProcessWithAccountRelyHap/BUILD.gn @@ -13,15 +13,19 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsKillProcessWithAccountRelyHap") { +ohos_hap("ActsKillProcessWithAccountRelyHap") { hap_profile = "entry/src/main/module.json" + hap_name = "ActsKillProcessWithAccountRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":actskillprocesswithaccountrelyhap_js_assets", ":actskillprocesswithaccountrelyhap_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsKillProcessWithAccountRelyHap" } ohos_app_scope("actskillprocesswithaccountrelyhap_app_profile") { diff --git a/aafwk/aafwk_standard/non_concurrent/acts_systemappone_rely_test/BUILD.gn b/aafwk/aafwk_standard/non_concurrent/acts_systemappone_rely_test/BUILD.gn index 29f5958dfdb3899771a84dfff99cf7445eeb3860..5b8bb03ca69ab8afec9ec4cde660c88f405b23c4 100755 --- a/aafwk/aafwk_standard/non_concurrent/acts_systemappone_rely_test/BUILD.gn +++ b/aafwk/aafwk_standard/non_concurrent/acts_systemappone_rely_test/BUILD.gn @@ -13,15 +13,19 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsSystemAppOneRelyHap") { +ohos_hap("ActsSystemAppOneRelyHap") { hap_profile = "entry/src/main/module.json" + hap_name = "ActsSystemAppOneRelyHap" + subsystem_name = XTS_SUITENAME + final_hap_path = + "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" + testonly = true deps = [ ":acts_systemappone_rely_test_js_assets", ":acts_systemappone_rely_test_resources", ] ets2abc = true certificate_profile = "signature/openharmony_sx.p7b" - hap_name = "ActsSystemAppOneRelyHap" } ohos_app_scope("acts_systemappone_rely_test_app_profile") { diff --git a/aafwk/aafwk_standard/zidltest/actsamszidlclienttest/Test.json b/aafwk/aafwk_standard/zidltest/actsamszidlclienttest/Test.json index 00594c18413b8e10e7a2f9df0717edcd8a996a10..dd53882afeddf9397989f323c34a867f69d4fd7a 100755 --- a/aafwk/aafwk_standard/zidltest/actsamszidlclienttest/Test.json +++ b/aafwk/aafwk_standard/zidltest/actsamszidlclienttest/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for hjunit demo Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "1000000", + "test-timeout": "300000", "package": "com.example.zidlclienttest", "shell-timeout": "300000" },