diff --git a/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/BUILD.gn b/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/BUILD.gn index 06612dbbd71c4966e175b4612ae31334c16c5fce..7d1c3ef232329e36c5db7fc44e3728bfb3f3df1d 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 7a88763ed8d2ac31dd30211b9574f47273e84549..891d4bca7512bb2093bfe627d5f688c958a2de81 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 41638d873192ec2f6540b63a4beecae877a9fd98..c09778112caa65abfbdc52fc75f5af1578133fa7 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 7a88763ed8d2ac31dd30211b9574f47273e84549..1c76163d82c0cb301a669fccb4a537d911634248 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 ce22dfa97e738b94f3876720da75ca9877366041..2e8e1e852fbb90ebf01c9ed0abeadd632cd861a7 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 fa764b47dd7bc7b304032949393163d6371da339..99047c16a867e13f3966da395f16744a196e08b4 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 83d3438ba6e337a379095d0e36f0c69c10282ed3..775315860098491b46bcd5859ca7fe6774b7d2e4 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 9a87ef1dea6914c5a83fbeb844b6f969bd9b6d4e..b1786d5d13f6d7f6e6f8d778370e126d52cc3fac 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 488cf48669002b81e7a13ea6f9215f9f349fe15c..88fdfcc2c81e6368bf02ed48e488bdfd9fdef6cc 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 fe85625f6d78d97c31cb21a80bf6323db0476437..67795b25f9ef2016ce4f815e0de6d754a0257ef1 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 2ff7e7343656b5f03812db6f2006f147d0642d4d..4155c8668a001a282531832a4a89a2d5aa19bc4c 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", ] }