!1076 L2_合规问题整理

Merge pull request !1076 from jiyong/master

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"

aafwk/aafwk_standard/abilitymanager/clearmissionscallback/Test.json

 {
     "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

aafwk/aafwk_standard/abilitymanager/clearmissionscallback/src/main/config.json

 {
   "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",

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"

aafwk/aafwk_standard/abilitymanager/clearmissionspromise/Test.json

 {
     "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

aafwk/aafwk_standard/abilitymanager/clearmissionspromise/src/main/config.json

 {
   "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",

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"
+			]
+		}
+	]
 }