From f536e12e2f29a9aebd6189faa7223b8acebf375e Mon Sep 17 00:00:00 2001 From: jiyong Date: Mon, 29 Nov 2021 19:01:59 +0800 Subject: [PATCH] jiyong@huawei.com Signed-off-by: jiyong --- .../clearmissionscallback/BUILD.gn | 8 ++------ .../clearmissionscallback/Test.json | 17 +++++++++++++++++ .../clearmissionspromise/BUILD.gn | 8 ++------ .../clearmissionspromise/Test.json | 17 +++++++++++++++++ appexecfwk/ams_standard/BUILD.gn | 4 ++-- .../amszipfileunzipfilest/Test.json | 6 +++--- .../ams_standard/fwkdataaccessor/Test.json | 2 +- .../actsbmsallshortcutinfotest/Test.json | 4 +++- .../actsbmshapmoduletest/Test.json | 3 ++- .../bundlemanager/actsbmsmetadatatest/Test.json | 4 +++- .../ces_standard/subscribeandpublish/BUILD.gn | 5 +++-- 11 files changed, 55 insertions(+), 23 deletions(-) diff --git a/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/BUILD.gn index 06612dbbd..7d1c3ef23 100644 --- a/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/BUILD.gn @@ -12,18 +12,14 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("ClearMissionsCallBack") { +ohos_js_hap_suite("ClearMissionsCallBack") { hap_profile = "./src/main/config.json" - hap_name = "ClearMissionsCallBack" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" - testonly = true deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/systemui.p7b" + hap_name = "ClearMissionsCallBack" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./src/main/js/default" diff --git a/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/Test.json b/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/Test.json index 7a88763ed..891d4bca7 100644 --- a/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/Test.json +++ b/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/Test.json @@ -1,3 +1,20 @@ { "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "120000", + "package": "com.ohos.launcher", + "abilityName": "com.ohos.launcherSed11.MainAbility", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "ClearMissionsCallBack.hap", + "verifyIAbility.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] } diff --git a/aafwk/aafwk_standard/abilitymanager/clearmissionspromise/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/clearmissionspromise/BUILD.gn index 41638d873..c09778112 100644 --- a/aafwk/aafwk_standard/abilitymanager/clearmissionspromise/BUILD.gn +++ b/aafwk/aafwk_standard/abilitymanager/clearmissionspromise/BUILD.gn @@ -12,18 +12,14 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_hap("ClearMissionsPromise") { +ohos_js_hap_suite("ClearMissionsPromise") { hap_profile = "./src/main/config.json" - hap_name = "ClearMissionsPromise" - subsystem_name = XTS_SUITENAME - final_hap_path = - "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap" - testonly = true deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/systemui.p7b" + hap_name = "ClearMissionsPromise" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./src/main/js/default" diff --git a/aafwk/aafwk_standard/abilitymanager/clearmissionspromise/Test.json b/aafwk/aafwk_standard/abilitymanager/clearmissionspromise/Test.json index 7a88763ed..1c76163d8 100644 --- a/aafwk/aafwk_standard/abilitymanager/clearmissionspromise/Test.json +++ b/aafwk/aafwk_standard/abilitymanager/clearmissionspromise/Test.json @@ -1,3 +1,20 @@ { "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "120000", + "package": "com.ohos.launcher", + "abilityName": "com.ohos.launcherSed111.MainAbility", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "ClearMissionsPromise.hap", + "verifyIAbility.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] } diff --git a/appexecfwk/ams_standard/BUILD.gn b/appexecfwk/ams_standard/BUILD.gn index ce22dfa97..2e8e1e852 100644 --- a/appexecfwk/ams_standard/BUILD.gn +++ b/appexecfwk/ams_standard/BUILD.gn @@ -18,8 +18,8 @@ group("ams_standard") { if (is_standard_system) { deps = [ "amsdatauriutils:amsDataUriUtils", - #"amszipfileunzipfilest:amsZipfileUnzipfileST", - #"fwkdataaccessor:FWKDataAccessor", + "amszipfileunzipfilest:amsZipfileUnzipfileST", + "fwkdataaccessor:FWKDataAccessor", #"serviceability/actsparticleabilitytest:ActsParticleAbilityTest", #"serviceability/sceneProject/particlestartability:ParticleStartAbility", #"serviceability/sceneProject/particletestserver:ParticleTestServer", diff --git a/appexecfwk/ams_standard/amszipfileunzipfilest/Test.json b/appexecfwk/ams_standard/amszipfileunzipfilest/Test.json index fa764b47d..99047c16a 100644 --- a/appexecfwk/ams_standard/amszipfileunzipfilest/Test.json +++ b/appexecfwk/ams_standard/amszipfileunzipfilest/Test.json @@ -24,9 +24,9 @@ { "type": "PushKit", "push": [ - "/resource/appexecfwk/ceshi.txt->/data/test/ceshi.txt", - "/resource/appexecfwk/ceshitwo.zip->/data/test/ceshitwo.zip", - "/resource/appexecfwk/ceshitwo.txt->/data/test/ceshitwo.txt" + "./resource/appexecfwk/ceshi.txt->/data/test/ceshi.txt", + "./resource/appexecfwk/ceshitwo.zip->/data/test/ceshitwo.zip", + "./resource/appexecfwk/ceshitwo.txt->/data/test/ceshitwo.txt" ] diff --git a/appexecfwk/ams_standard/fwkdataaccessor/Test.json b/appexecfwk/ams_standard/fwkdataaccessor/Test.json index 83d3438ba..775315860 100644 --- a/appexecfwk/ams_standard/fwkdataaccessor/Test.json +++ b/appexecfwk/ams_standard/fwkdataaccessor/Test.json @@ -25,7 +25,7 @@ { "type": "PushKit", "push": [ - "amsStDataAbility.hap->/system/vendor/amsStDataAbility.hap" + "./resource/appexecfwk/amsStDataAbility.hap->/system/vendor/amsStDataAbility.hap" ] }, diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsallshortcutinfotest/Test.json b/appexecfwk/bundle_standard/bundlemanager/actsbmsallshortcutinfotest/Test.json index 9a87ef1de..b1786d5d1 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmsallshortcutinfotest/Test.json +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsallshortcutinfotest/Test.json @@ -9,7 +9,9 @@ "kits": [ { "test-file-name": [ - "ActsBmsAllShortcutInfoTest.hap" + "ActsBmsAllShortcutInfoTest.hap", + "bmsSystemBundleTest1.hap", + "bmsVendorBundleTest1.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/Test.json b/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/Test.json index 488cf4866..88fdfcc2c 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/Test.json +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/Test.json @@ -9,7 +9,8 @@ "kits": [ { "test-file-name": [ - "ActsBmsHapModuleTest.hap" + "ActsBmsHapModuleTest.hap", + "bmsSystemBundleTest1.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsmetadatatest/Test.json b/appexecfwk/bundle_standard/bundlemanager/actsbmsmetadatatest/Test.json index fe85625f6..67795b25f 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmsmetadatatest/Test.json +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsmetadatatest/Test.json @@ -9,7 +9,9 @@ "kits": [ { "test-file-name": [ - "ActsBmsMetaDataTest.hap" + "ActsBmsMetaDataTest.hap", + "bmsSystemBundleTest1.hap", + "bmsVendorBundleTest1.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/notification/ces_standard/subscribeandpublish/BUILD.gn b/notification/ces_standard/subscribeandpublish/BUILD.gn index 2ff7e7343..4155c8668 100644 --- a/notification/ces_standard/subscribeandpublish/BUILD.gn +++ b/notification/ces_standard/subscribeandpublish/BUILD.gn @@ -17,8 +17,9 @@ group("SubscribeAndPublish") { testonly = true if (is_standard_system) { deps = [ - #"actssubscriberorderedtest:ActsSubscriberOrderTest", - "actssubscriberunordersystemtest:ActsSubscriberTestUnorderSystem", + "actssubscriberorderedtest:ActsSubscriberOrderTest", + + #"actssubscriberunordersystemtest:ActsSubscriberTestUnorderSystem", "actssubscriberunordertest:ActsSubscriberUnorderTest", ] } -- GitLab