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..4b6326a0fdcde4d9addf2d5856c6141d68a028d1 100644 --- a/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/Test.json +++ b/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/Test.json @@ -1,3 +1,19 @@ { "description": "Configuration for hjunit demo Tests", -} + "driver": { + "type": "JSUnitTest", + "test-timeout": "120000", + "package": "com.example.clearmissionscallback", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "ClearMissionsCallBack.hap", + "verifyIAbility.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/src/main/config.json b/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/src/main/config.json index 9b99a7a6a73ec5136f89b18cbc6f0ec3fd8d0e00..d8c3f3b543423f4860438474b5873fb3f4964bf3 100644 --- a/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/src/main/config.json +++ b/aafwk/aafwk_standard/abilitymanager/clearmissionscallback/src/main/config.json @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.ohos.launcher", + "bundleName": "com.example.clearmissionscallback", "vendor": "example", "version": { "code": 1000013, @@ -14,7 +14,7 @@ }, "deviceConfig": {}, "module": { - "package": "com.example.myapplication11", + "package": "com.example.clearmissionscallback", "name": ".MyApplication", "deviceType": [ "phone" @@ -28,7 +28,7 @@ "abilities": [ { "visible": true, - "name": "com.ohos.launcherSed11.MainAbility", + "name": "com.example.clearmissionscallback.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", 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..49a3fa35e168b7491ed752c3f2abf3cdd10f47dd 100644 --- a/aafwk/aafwk_standard/abilitymanager/clearmissionspromise/Test.json +++ b/aafwk/aafwk_standard/abilitymanager/clearmissionspromise/Test.json @@ -1,3 +1,19 @@ { "description": "Configuration for hjunit demo Tests", -} + "driver": { + "type": "JSUnitTest", + "test-timeout": "120000", + "package": "com.example.clearmissionspromise", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "ClearMissionsPromise.hap", + "verifyIAbility.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/abilitymanager/clearmissionspromise/src/main/config.json b/aafwk/aafwk_standard/abilitymanager/clearmissionspromise/src/main/config.json index f8fcdba104baf8983afd961ae604424f60d48dee..42ef5740baff27666e0631cf67430e0ff10bad2b 100644 --- a/aafwk/aafwk_standard/abilitymanager/clearmissionspromise/src/main/config.json +++ b/aafwk/aafwk_standard/abilitymanager/clearmissionspromise/src/main/config.json @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.ohos.launcher", + "bundleName": "com.example.clearmissionspromise", "vendor": "example", "version": { "code": 1000013, @@ -14,8 +14,8 @@ }, "deviceConfig": {}, "module": { - "package": "com.example.myapplication111", - "name": ".MyApplication111", + "package": "com.example.clearmissionspromise", + "name": ".MyApplication", "deviceType": [ "phone" ], @@ -28,7 +28,7 @@ "abilities": [ { "visible": true, - "name": "com.ohos.launcherSed111.MainAbility", + "name": "com.example.clearmissionspromise.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/appexecfwk/ams_standard/fwkdataaccessor/hap/amsStDataAbility.hap b/appexecfwk/ams_standard/fwkdataaccessor/hap/amsStDataAbility.hap deleted file mode 100644 index a3b5384320ea49717968f6e8d5d5e88963b4e436..0000000000000000000000000000000000000000 Binary files a/appexecfwk/ams_standard/fwkdataaccessor/hap/amsStDataAbility.hap and /dev/null differ diff --git a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/Test.json b/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/Test.json index 100abeae4c980a543c78711a771f0cca954ab976..5aaadf9076bd3de10bdc5ff6d05978388acf662f 100755 --- a/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/Test.json +++ b/appexecfwk/ams_standard/serviceability/actsparticleabilitytest/Test.json @@ -10,11 +10,31 @@ { "test-file-name": [ "ActsParticleAbilityTest.hap", - "ParticleStartAbility.hap", - "amsStDataAbility.hap" + "ParticleStartAbility.hap" ], "type": "AppInstallKit", "cleanup-apps": true - } - ] + }, + { + "type": "ShellKit", + "run-command": [ + "remount", + "mkdir /data/test" + ] + }, + { + "type": "PushKit", + "push": [ + "/resource/appexecfwk/amsStDataAbility.hap->/data/test/amsStDataAbility.hap" + ] + + }, + { + "type": "ShellKit", + "run-command": [ + "chmod 644 /data/test/*.hap", + "bm install -p /data/test/amsStDataAbility.hap" + ] + } + ] }