!1143 fms_xts

Merge pull request !1143 from blackleon/fms_1122

aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/test/FormFuzzTestString.test.js

@@ -811,30 +811,6 @@ describe('FMS_FuzzTest', function () {
         }, TIMEOUT)
     })
 
-     /**
-      * @tc.name fuzzTest
-      * @tc.number FMS_fuzzTestString_0300
-      * @tc.desc Check whether the releaseForm interface can pass the fuzzy test (by Promise)
-      */
-    it('FMS_fuzzTestString_0300_param_10_promise', 0, async function (done) {
-        console.log("FMS_fuzzTestString_0300_param_10_promise releaseForm begin");
- 
-        var formId = numberTest() + "";
-        console.log("FMS_fuzzTestString_0300_param_10_promise releaseForm formId typeof:"
-            + typeof(formId) + ",formId:" + formId);
-
-        formManager.releaseForm(formId).then((err) => {
-            console.log("FMS_fuzzTestString_0300_param_10_promise async::sucess err:" + err);
-            expect(err).assertEqual(0);
-            console.log("FMS_fuzzTestString_0300_param_10_promise deleteForm end");
-            done();
-        });
-    
-        setTimeout(function () {
-            console.info('=====================FMS_fuzzTestString_0300_param_10_promise==================end');
-        }, TIMEOUT)
-    })
-
      /**
       * @tc.name fuzzTest
       * @tc.number FMS_fuzzTestString_0300
@@ -870,34 +846,6 @@ describe('FMS_FuzzTest', function () {
         }, TIMEOUT)
     })
 
-     /**
-      * @tc.name fuzzTest
-      * @tc.number FMS_fuzzTestString_0300
-      * @tc.desc Check whether the releaseForm interface can pass the fuzzy test (by Promise)
-      */
-    it('FMS_fuzzTestString_0300_param_11_promise', 0, async function (done) {
-        console.log("FMS_fuzzTestString_0300_param_11_promise releaseForm begin");
- 
-        var formId = numberTest() + "";
-        console.log("FMS_fuzzTestString_0300_param_11_promise releaseForm formId typeof:"
-            + typeof(formId) + ",formId:" + formId);
- 
-        var isReleaseCache = booleanTest();
-        console.log("FMS_fuzzTestString_0300_param_11_promise releaseForm isReleaseCache typeof:"
-            + typeof(isReleaseCache));
- 
-        formManager.releaseForm(formId, isReleaseCache).then((err) => {
-            console.log("FMS_fuzzTestString_0300_param_11_promise async::sucess err:" + err);
-            expect(err).assertEqual(0);
-            console.log("FMS_fuzzTestString_0300_param_11_promise deleteForm end");
-            done();
-        });
-
-        setTimeout(function () {
-            console.info('=====================FMS_fuzzTestString_0300_param_11_promise==================end');
-        }, TIMEOUT)
-    })
-
     /**
      * @tc.name fuzzTest
      * @tc.number FMS_fuzzTestString_1200

aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/Test.json

@@ -10,23 +10,10 @@
         {
             "test-file-name": [
                 "GetAllFormsInfo10.hap",
-                "ActsFormSystemTestServiceD"
+                "ActsFormSystemTestServiceD.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
-        },
-		{
-            "type": "ShellKit",
-            "run-command": [
-                "remount",
-                "mkdir /system/vendor"
-            ]
-        },
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "chmod 644 /system/vendor/*.hap"
-			]
         }
     ]
 }

aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/Test.json

@@ -10,24 +10,11 @@
         {
             "test-file-name": [
                 "GetAllFormsInfo201.hap",
-                "ActsFormSystemTestServiceB",
-                "ActsFormSystemTestServiceD"
+                "ActsFormSystemTestServiceB.hap",
+                "ActsFormSystemTestServiceD.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
-        },
-		{
-            "type": "ShellKit",
-            "run-command": [
-                "remount",
-                "mkdir /system/vendor"
-            ]
-        },
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "chmod 644 /system/vendor/*.hap"
-			]
         }
     ]
 }

aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/Test.json

@@ -10,24 +10,11 @@
         {
             "test-file-name": [
                 "GetAllFormsInfo211.hap",
-                "ActsFormSystemTestServiceB",
-                "ActsFormSystemTestServiceC"
+                "ActsFormSystemTestServiceB.hap",
+                "ActsFormSystemTestServiceC.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
-        },
-		{
-            "type": "ShellKit",
-            "run-command": [
-                "remount",
-                "mkdir /system/vendor"
-            ]
-        },
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "chmod 644 /system/vendor/*.hap"
-			]
         }
     ]
 }

aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/Test.json

@@ -10,24 +10,11 @@
         {
             "test-file-name": [
                 "GetAllFormsInfo212.hap",
-                "ActsFormSystemTestServiceA",
-                "ActsFormSystemTestServiceB"
+                "ActsFormSystemTestServiceA.hap",
+                "ActsFormSystemTestServiceB.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
-        },
-		{
-            "type": "ShellKit",
-            "run-command": [
-                "remount",
-                "mkdir /system/vendor"
-            ]
-        },
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "chmod 644 /system/vendor/*.hap"
-			]
         }
     ]
 }

aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestserviceb/src/main/config.json

 {
   "app": {
     "bundleName": "com.form.formsystemtestserviceb",
-    "vendor": "neusoft",
+    "vendor": "ohos",
     "version": {
       "code": 1,
       "name": "1.0"
@@ -37,7 +37,7 @@
           }
         ],
         "visible": true,
-        "name": "com.form.formmodule001.FormAbility001",
+        "name": "FormStServiceAbilityB",
         "icon": "$media:icon",
         "description": "$string:mainability_description",
         "label": "$string:entry_MainAbility",

aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicec/src/main/config.json

 {
   "app": {
     "bundleName": "com.form.formsystemtestservicec",
-    "vendor": "neusoft",
+    "vendor": "ohos",
     "version": {
       "code": 1,
       "name": "1.0"
@@ -37,7 +37,7 @@
           }
         ],
         "visible": true,
-        "name": "com.form.formmodule001.FormAbility001",
+        "name": "FormStServiceAbilityC",
         "icon": "$media:icon",
         "description": "$string:mainability_description",
         "label": "$string:entry_MainAbility",

aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestserviced/src/main/config.json

@@ -37,7 +37,7 @@
           }
         ],
         "visible": true,
-        "name": "FormStServiceAbilityA",
+        "name": "FormStServiceAbilityD",
         "icon": "$media:icon",
         "description": "$string:mainability_description",
         "label": "$string:entry_MainAbility",