From c6f7f30501a5b285afa400e4b6b3198539e14ca0 Mon Sep 17 00:00:00 2001 From: "zhaoyuan17@huawei.com" Date: Mon, 22 Nov 2021 22:18:26 +0800 Subject: [PATCH] xts Signed-off-by: zhaoyuan17@huawei.com --- .../formsystemtesthost/FormFuzzTest/BUILD.gn | 0 .../formsystemtesthost/FormFuzzTest/Test.json | 0 .../FormFuzzTest/entry/src/main/config.json | 0 .../entry/src/main/js/default/app.js | 0 .../src/main/js/default/pages/index/index.css | 0 .../src/main/js/default/pages/index/index.js | 0 .../main/js/test/FormFuzzTestString.test.js | 52 -------- .../main/resources/base/element/string.json | 0 .../FormFuzzTest/signature/openharmony_sx.p7b | Bin .../getallformsinfo10/Test.json | 19 +-- .../entry/src/main/config.json | 124 +++++++++--------- .../main/resources/base/element/string.json | 22 ++-- .../getallformsinfo201/Test.json | 21 +-- .../entry/src/main/config.json | 124 +++++++++--------- .../main/resources/base/element/string.json | 22 ++-- .../getallformsinfo211/Test.json | 21 +-- .../entry/src/main/config.json | 124 +++++++++--------- .../main/resources/base/element/string.json | 22 ++-- .../getallformsinfo212/Test.json | 21 +-- .../entry/src/main/config.json | 124 +++++++++--------- .../main/resources/base/element/string.json | 22 ++-- .../formsystemtestservicea/Test.json | 0 .../src/main/config.json | 6 +- .../src/main/config.json | 4 +- .../src/main/config.json | 2 +- 25 files changed, 313 insertions(+), 417 deletions(-) mode change 100755 => 100644 aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/BUILD.gn mode change 100755 => 100644 aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/Test.json mode change 100755 => 100644 aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/config.json mode change 100755 => 100644 aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/default/app.js mode change 100755 => 100644 aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/default/pages/index/index.css mode change 100755 => 100644 aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/default/pages/index/index.js mode change 100755 => 100644 aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/resources/base/element/string.json mode change 100755 => 100644 aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/signature/openharmony_sx.p7b mode change 100644 => 100755 aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/BUILD.gn b/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/BUILD.gn old mode 100755 new mode 100644 diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/Test.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/Test.json old mode 100755 new mode 100644 diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/config.json old mode 100755 new mode 100644 diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/default/app.js b/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/default/app.js old mode 100755 new mode 100644 diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/default/pages/index/index.css b/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/default/pages/index/index.css old mode 100755 new mode 100644 diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/default/pages/index/index.js old mode 100755 new mode 100644 diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/test/FormFuzzTestString.test.js b/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/test/FormFuzzTestString.test.js index 1bc192746..8fed4df8e 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/test/FormFuzzTestString.test.js +++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/test/FormFuzzTestString.test.js @@ -810,30 +810,6 @@ describe('FMS_FuzzTest', function () { console.info('=====================FMS_fuzzTestString_0300_param_10_callback==================end'); }, 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 @@ -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 diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/resources/base/element/string.json old mode 100755 new mode 100644 diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/signature/openharmony_sx.p7b old mode 100755 new mode 100644 diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/Test.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/Test.json index 8d8bd5105..9f88ec1f7 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/Test.json +++ b/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" - ] - } - ] + } + ] } diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/entry/src/main/config.json index c55339fa4..d3c11a228 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/entry/src/main/config.json +++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/entry/src/main/config.json @@ -1,63 +1,63 @@ -{ - "app": { - "bundleName": "com.example.getallformsinfo10", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.getallformsinfo10", - "name": ".MyApplication", - "mainAbility": "com.example.getallformsinfo10.MainAbility", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "visible": true, - "name": "com.example.getallformsinfo10.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } - } - ] - } +{ + "app": { + "bundleName": "com.example.getallformsinfo10", + "vendor": "example", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 5, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.getallformsinfo10", + "name": ".MyApplication", + "mainAbility": "com.example.getallformsinfo10.MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "visible": true, + "name": "com.example.getallformsinfo10.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": true + } + } + ] + } } \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/entry/src/main/resources/base/element/string.json index a8c86be44..18cf63518 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/entry/src/main/resources/base/element/string.json +++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/entry/src/main/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "GetAllFormsInfo10" - }, - { - "name": "mainability_description", - "value": "JS_Empty Ability" - } - ] +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "GetAllFormsInfo10" + }, + { + "name": "mainability_description", + "value": "JS_Empty Ability" + } + ] } \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/Test.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/Test.json index 407118fcf..1bcd73446 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/Test.json +++ b/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" - ] - } - ] + } + ] } diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/entry/src/main/config.json index 833d96877..554be55d7 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/entry/src/main/config.json +++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/entry/src/main/config.json @@ -1,63 +1,63 @@ -{ - "app": { - "bundleName": "com.example.getallformsinfo201", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.getallformsinfo201", - "name": ".MyApplication", - "mainAbility": "com.example.getallformsinfo201.MainAbility", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "visible": true, - "name": "com.example.getallformsinfo201.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } - } - ] - } +{ + "app": { + "bundleName": "com.example.getallformsinfo201", + "vendor": "example", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 5, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.getallformsinfo201", + "name": ".MyApplication", + "mainAbility": "com.example.getallformsinfo201.MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "visible": true, + "name": "com.example.getallformsinfo201.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": true + } + } + ] + } } \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/entry/src/main/resources/base/element/string.json index 5627ae976..098147ed1 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/entry/src/main/resources/base/element/string.json +++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/entry/src/main/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "GetAllFormsInfo201" - }, - { - "name": "mainability_description", - "value": "JS_Empty Ability" - } - ] +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "GetAllFormsInfo201" + }, + { + "name": "mainability_description", + "value": "JS_Empty Ability" + } + ] } \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/Test.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/Test.json index 21ea163c0..466167efc 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/Test.json +++ b/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" - ] - } - ] + } + ] } diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/entry/src/main/config.json index 70c190cc5..6e7a68842 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/entry/src/main/config.json +++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/entry/src/main/config.json @@ -1,63 +1,63 @@ -{ - "app": { - "bundleName": "com.example.getallformsinfo211", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.getallformsinfo211", - "name": ".MyApplication", - "mainAbility": "com.example.getallformsinfo211.MainAbility", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "visible": true, - "name": "com.example.getallformsinfo211.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } - } - ] - } +{ + "app": { + "bundleName": "com.example.getallformsinfo211", + "vendor": "example", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 5, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.getallformsinfo211", + "name": ".MyApplication", + "mainAbility": "com.example.getallformsinfo211.MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "visible": true, + "name": "com.example.getallformsinfo211.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": true + } + } + ] + } } \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/entry/src/main/resources/base/element/string.json index d555768dc..361473e0d 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/entry/src/main/resources/base/element/string.json +++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/entry/src/main/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "GetAllFormsInfo211" - }, - { - "name": "mainability_description", - "value": "JS_Empty Ability" - } - ] +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "GetAllFormsInfo211" + }, + { + "name": "mainability_description", + "value": "JS_Empty Ability" + } + ] } \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/Test.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/Test.json index 458c4620c..7ae86bac5 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/Test.json +++ b/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" - ] - } - ] + } + ] } diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/entry/src/main/config.json index 65294c672..0e2bc5b99 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/entry/src/main/config.json +++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/entry/src/main/config.json @@ -1,63 +1,63 @@ -{ - "app": { - "bundleName": "com.example.getallformsinfo", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.getallformsinfo", - "name": ".MyApplication", - "mainAbility": "com.example.getallformsinfo.MainAbility", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "visible": true, - "name": "com.example.getallformsinfo.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } - } - ] - } +{ + "app": { + "bundleName": "com.example.getallformsinfo", + "vendor": "example", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 5, + "target": 5, + "releaseType": "Beta1" + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.getallformsinfo", + "name": ".MyApplication", + "mainAbility": "com.example.getallformsinfo.MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "visible": true, + "name": "com.example.getallformsinfo.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": true + } + } + ] + } } \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/entry/src/main/resources/base/element/string.json index 1940d8463..4a326ad88 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/entry/src/main/resources/base/element/string.json +++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/entry/src/main/resources/base/element/string.json @@ -1,12 +1,12 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "GetAllFormsInfo212" - }, - { - "name": "mainability_description", - "value": "JS_Empty Ability" - } - ] +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "GetAllFormsInfo212" + }, + { + "name": "mainability_description", + "value": "JS_Empty Ability" + } + ] } \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/Test.json b/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/Test.json old mode 100644 new mode 100755 diff --git a/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestserviceb/src/main/config.json b/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestserviceb/src/main/config.json index 733fc3e28..fd4bca48e 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestserviceb/src/main/config.json +++ b/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestserviceb/src/main/config.json @@ -1,7 +1,7 @@ { "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", @@ -66,7 +66,7 @@ } ] } - } + } ] } ], diff --git a/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicec/src/main/config.json b/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicec/src/main/config.json index 8ac281f58..2d4552a93 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicec/src/main/config.json +++ b/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicec/src/main/config.json @@ -1,7 +1,7 @@ { "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", diff --git a/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestserviced/src/main/config.json b/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestserviced/src/main/config.json index 989557e5e..7fd7cae3a 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestserviced/src/main/config.json +++ b/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", -- GitLab