!4352 modified FA-JS PART8

Merge pull request !4352 from jiyong/local-20220716-0003

storage/storagefileioerrorjstest/BUILD.gn

@@ -23,7 +23,9 @@ ohos_js_hap_suite("storagefileioerror_js_test") {
   hap_name = "ActsStorageFileIoErrorJsTest"
 }
 ohos_js_assets("storagefileioerror_js_assets") {
-  source_dir = "./src/main/js/default"
+  js2abc = true
+  hap_profile = "./src/main/config.json"
+  source_dir = "./src/main/js"
 }
 ohos_resources("storagefileioerror_js_resources") {
   sources = [ "./src/main/resources" ]

storage/storagefileioerrorjstest/Test.json

 {
     "description": "Configuration for storage fileio Tests",
     "driver": {
-        "type": "JSUnitTest",
+        "type": "OHJSUnitTest",
         "test-timeout": "60000",
-        "package": "ohos.acts.storage.fileioerror",
-        "shell-timeout": "60000"
+        "shell-timeout": "60000",
+        "bundle-name": "ohos.acts.storage.fileioerror",
+        "package-name": "ohos.acts.storage.fileioerror"
     },
     "kits": [
         {

storage/storagefileioerrorjstest/src/main/config.json

@@ -14,7 +14,7 @@
     "deviceConfig": {},
     "module": {
         "package": "ohos.acts.storage.fileioerror",
-    "name": ".MyApplication",
+        "name": ".entry",
         "deviceType": [
             "phone"
         ],
@@ -36,13 +36,30 @@
                         ]
                     }
                 ],
-        "name": "ohos.acts.storage.fileioerror.MainAbility",
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".MainAbility",
+                "srcLanguage": "js",
+                "srcPath": "MainAbility",
                 "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:app_name",
+                "description": "$string:MainAbility_desc",
+                "label": "$string:MainAbility_label",
                 "type": "page",
-        "launchType": "standard",
-        "visible": true
+                "visible": true,
+                "launchType": "standard"
+            },
+            {
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".TestAbility",
+                "srcLanguage": "js",
+                "srcPath": "TestAbility",
+                "icon": "$media:icon",
+                "description": "$string:TestAbility_desc",
+                "label": "$string:TestAbility_label",
+                "type": "page",
+                "visible": true,
+                "launchType": "standard"
             }
         ],
         "js": [
@@ -55,7 +72,23 @@
                     "designWidth": 720,
                     "autoDesignWidth": false
                 }
+            },
+            {
+                "pages": [
+                    "pages/index/index"
+                ],
+                "name": ".TestAbility",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": false
+                }
             }
-    ]
+        ],
+        "testRunner": {
+            "name": "OpenHarmonyTestRunner",
+            "srcPath": "TestRunner"
+        },
+        "mainAbility": ".MainAbility",
+        "srcPath": ""
     }
 }
\ No newline at end of file

storage/storagefileioerrorjstest/src/main/js/default/pages/index/index.js → storage/storagefileioerrorjstest/src/main/js/MainAbility/pages/index/index.js

@@ -15,7 +15,6 @@
 
 import app from '@system.app'
 
-import {Core} from 'deccjsunit/index'
 
 const injectRef = Object.getPrototypeOf(global) || global
 injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
@@ -29,12 +28,6 @@ export default {
   },
   onShow() {
     console.info('onShow finish')
-    const core = Core.getInstance()
-    core.init()
-    const configService = core.getDefaultService('config')
-    configService.setConfig(this)
-    require('../../test/List.test')
-    core.execute()
   },
   onReady() {
   },

storage/storagefileioerrorjstest/src/main/js/TestAbility/app.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../test/List.test'
+
+export default {
+    onCreate() {
+        console.info('TestApplication onCreate')
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        console.info('start run testcase!!!')
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+    },
+    onDestroy() {
+        console.info("TestApplication onDestroy");
+    }
+};

storage/storagefileioerrorjstest/src/main/js/TestAbility/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

storage/storagefileioerrorjstest/src/main/js/TestAbility/i18n/zh-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

storage/storagefileioerrorjstest/src/main/js/TestAbility/pages/index/index.css

+.container {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    left: 0px;
+    top: 0px;
+    width: 100%;
+    height: 100%;
+}
+
+.title {
+    font-size: 60px;
+    text-align: center;
+    width: 100%;
+    height: 40%;
+    margin: 10px;
+}
+
+@media screen and (device-type: phone) and (orientation: landscape) {
+    .title {
+        font-size: 60px;
+    }
+}
+
+@media screen and (device-type: tablet) and (orientation: landscape) {
+    .title {
+        font-size: 100px;
+    }
+}
\ No newline at end of file

storage/storagefileioerrorjstest/src/main/js/TestAbility/pages/index/index.hml

+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/ListTest.js → storage/storagefileioerrorjstest/src/main/js/TestAbility/pages/index/index.js

@@ -13,5 +13,14 @@
  * limitations under the License.
  */
 
-require('./execute.js')
-require('./enumTest.js')
+export default {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    }
+}
+
+
+

storage/storagefileioerrorjstest/src/main/js/TestRunner/OpenHarmonyTestRunner.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+function translateParamsToString(parameters) {
+    const keySet = new Set([
+        '-s class', '-s notClass', '-s suite', '-s itName',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s package', '-s dryRun'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams += ' ' + key + ' ' + parameters[key]
+        }
+    }
+    return targetParams.trim()
+}
+
+ export default {
+    onPrepare() {
+        console.info('OpenHarmonyTestRunner OnPrepare')
+    },
+    onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+
+        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility'
+
+        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        console.info('debug value : '+debug)
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            console.info('executeShellCommand : err : ' + JSON.stringify(err));
+            console.info('executeShellCommand : data : ' + data.stdResult);
+            console.info('executeShellCommand : data : ' + data.exitCode);
+        })
+    }
+};

storage/storagefileioerrorjstest/src/main/js/default/test/FileIOError.test.js → storage/storagefileioerrorjstest/src/main/js/test/FileIOError.test.js

@@ -19,7 +19,7 @@ import {
   it,
   expect
 }
-from 'deccjsunit/index'
+from '@ohos/hypium'
 import {
   FILE_CONTENT,
   prepareFile,
@@ -30,6 +30,7 @@ import {
 }
 from './Common'
 
+export default function FileIOError() {
 describe('FileIOError', function () {
 
   /**
@@ -157,3 +158,4 @@ describe('FileIOError', function () {
     }
   });
 });
+}

storage/storagestatfsjstest/src/main/js/default/test/List.test.js → storage/storagefileioerrorjstest/src/main/js/test/List.test.js

@@ -13,4 +13,7 @@
  * limitations under the License.
  */
 
-require('./statfs.test.js')
+import FileIOError from './FileIOError.test.js'
+export default function testsuite() {
+FileIOError()
+}

storage/storagefileioerrorjstest/src/main/resources/base/element/string.json

@@ -7,6 +7,22 @@
     {
       "name": "mainability_description",
       "value": "JS_Phone_Empty Feature Ability"
+		},
+	{
+		"name": "MainAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "MainAbility_label",
+		"value": "label"
+	},
+		{
+		"name": "TestAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "TestAbility_label",
+		"value": "label"
 	}
   ]
 }
\ No newline at end of file

storage/storagesecuritylabeljstest/BUILD.gn

@@ -23,7 +23,9 @@ ohos_js_hap_suite("storagesecuritylabel_js_test") {
   hap_name = "ActsStorageSecurityLabelJSTest"
 }
 ohos_js_assets("storagesecuritylabel_js_assets") {
-  source_dir = "./src/main/js/default"
+  js2abc = true
+  hap_profile = "./src/main/config.json"
+  source_dir = "./src/main/js"
 }
 ohos_resources("storagesecuritylabel_js_resources") {
   sources = [ "./src/main/resources" ]

storage/storagesecuritylabeljstest/Test.json

 {
     "description": "Configuration for storage securitylabel Tests",
     "driver": {
-        "type": "JSUnitTest",
+        "type": "OHJSUnitTest",
         "test-timeout": "60000",
-        "package": "ohos.acts.storage.securitylabel",
-        "shell-timeout": "60000"
+        "shell-timeout": "60000",
+        "bundle-name": "ohos.acts.storage.securitylabel",
+        "package-name": "ohos.acts.storage.securitylabel"
     },
     "kits": [
         {

storage/storagesecuritylabeljstest/src/main/config.json

@@ -14,7 +14,7 @@
     "deviceConfig": {},
     "module": {
         "package": "ohos.acts.storage.securitylabel",
-    "name": ".MyApplication",
+        "name": ".entry",
         "deviceType": [
             "phone"
         ],
@@ -36,13 +36,30 @@
                         ]
                     }
                 ],
-        "name": "ohos.acts.storage.securitylabel.MainAbility",
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".MainAbility",
+                "srcLanguage": "js",
+                "srcPath": "MainAbility",
                 "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:app_name",
+                "description": "$string:MainAbility_desc",
+                "label": "$string:MainAbility_label",
                 "type": "page",
-        "launchType": "standard",
-        "visible": true
+                "visible": true,
+                "launchType": "standard"
+            },
+            {
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".TestAbility",
+                "srcLanguage": "js",
+                "srcPath": "TestAbility",
+                "icon": "$media:icon",
+                "description": "$string:TestAbility_desc",
+                "label": "$string:TestAbility_label",
+                "type": "page",
+                "visible": true,
+                "launchType": "standard"
             }
         ],
         "js": [
@@ -55,7 +72,23 @@
                     "designWidth": 720,
                     "autoDesignWidth": false
                 }
+            },
+            {
+                "pages": [
+                    "pages/index/index"
+                ],
+                "name": ".TestAbility",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": false
+                }
             }
-    ]
+        ],
+        "testRunner": {
+            "name": "OpenHarmonyTestRunner",
+            "srcPath": "TestRunner"
+        },
+        "mainAbility": ".MainAbility",
+        "srcPath": ""
     }
 }
\ No newline at end of file

storage/storagestatfsjstest/src/main/js/default/pages/index/index.js → storage/storagesecuritylabeljstest/src/main/js/MainAbility/pages/index/index.js

@@ -15,7 +15,6 @@
 
 import app from '@system.app'
 
-import {Core} from 'deccjsunit/index'
 
 const injectRef = Object.getPrototypeOf(global) || global
 injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
@@ -29,12 +28,6 @@ export default {
   },
   onShow() {
     console.info('onShow finish')
-    const core = Core.getInstance()
-    core.init()
-    const configService = core.getDefaultService('config')
-    configService.setConfig(this)
-    require('../../test/List.test')
-    core.execute()
   },
   onReady() {
   },

storage/storagesecuritylabeljstest/src/main/js/TestAbility/app.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../test/List.test'
+
+export default {
+    onCreate() {
+        console.info('TestApplication onCreate')
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        console.info('start run testcase!!!')
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+    },
+    onDestroy() {
+        console.info("TestApplication onDestroy");
+    }
+};

storage/storagesecuritylabeljstest/src/main/js/TestAbility/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

storage/storagesecuritylabeljstest/src/main/js/TestAbility/i18n/zh-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

storage/storagesecuritylabeljstest/src/main/js/TestAbility/pages/index/index.css

+.container {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    left: 0px;
+    top: 0px;
+    width: 100%;
+    height: 100%;
+}
+
+.title {
+    font-size: 60px;
+    text-align: center;
+    width: 100%;
+    height: 40%;
+    margin: 10px;
+}
+
+@media screen and (device-type: phone) and (orientation: landscape) {
+    .title {
+        font-size: 60px;
+    }
+}
+
+@media screen and (device-type: tablet) and (orientation: landscape) {
+    .title {
+        font-size: 100px;
+    }
+}
\ No newline at end of file

storage/storagesecuritylabeljstest/src/main/js/TestAbility/pages/index/index.hml

+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

storage/storagesecuritylabeljstest/src/main/js/TestAbility/pages/index/index.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export default {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    }
+}
+
+
+

storage/storagesecuritylabeljstest/src/main/js/TestRunner/OpenHarmonyTestRunner.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+function translateParamsToString(parameters) {
+    const keySet = new Set([
+        '-s class', '-s notClass', '-s suite', '-s itName',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s package', '-s dryRun'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams += ' ' + key + ' ' + parameters[key]
+        }
+    }
+    return targetParams.trim()
+}
+
+ export default {
+    onPrepare() {
+        console.info('OpenHarmonyTestRunner OnPrepare')
+    },
+    onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+
+        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility'
+
+        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        console.info('debug value : '+debug)
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            console.info('executeShellCommand : err : ' + JSON.stringify(err));
+            console.info('executeShellCommand : data : ' + data.stdResult);
+            console.info('executeShellCommand : data : ' + data.exitCode);
+        })
+    }
+};

storage/storagesecuritylabeljstest/src/main/js/default/test/Common.js → storage/storagesecuritylabeljstest/src/main/js/test/Common.js

@@ -17,10 +17,7 @@ import securityLabel from '@ohos.securityLabel';
 import fileio from '@ohos.fileio';
 import featureAbility from '@ohos.ability.featureAbility';
 
-import {
-  describe, beforeAll, beforeEach, afterEach, afterAll, it, expect
-}
-from 'deccjsunit/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 
 export async function nextFileName(testName) {
   let context = featureAbility.getContext();

storage/storagefileioerrorjstest/src/main/js/default/test/List.test.js → storage/storagesecuritylabeljstest/src/main/js/test/List.test.js

@@ -13,4 +13,7 @@
  * limitations under the License.
  */
 
-require('./FileIOError.test.js')
+import securitylabel from './securitylabel.test.js'
+export default function testsuite() {
+securitylabel()
+}

storage/storagesecuritylabeljstest/src/main/js/default/test/securitylabel.test.js → storage/storagesecuritylabeljstest/src/main/js/test/securitylabel.test.js

@@ -17,6 +17,7 @@ import {
     describe, it, expect, securityLabel, nextFileName, fileio
 } from './Common';
 
+export default function securitylabel() {
 describe('securitylabel', function () {
 
     /**
@@ -564,3 +565,4 @@ describe('securitylabel', function () {
         }
     });
 });
+}

storage/storagesecuritylabeljstest/src/main/resources/base/element/string.json

@@ -7,6 +7,22 @@
     {
       "name": "mainability_description",
       "value": "JS_Phone_Empty Feature Ability"
+		},
+	{
+		"name": "MainAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "MainAbility_label",
+		"value": "label"
+	},
+		{
+		"name": "TestAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "TestAbility_label",
+		"value": "label"
 	}
   ]
 }
\ No newline at end of file

storage/storagestatfsjstest/BUILD.gn

@@ -23,7 +23,9 @@ ohos_js_hap_suite("storagestatfs_js_test") {
   hap_name = "ActsStorageStatfsJsTest"
 }
 ohos_js_assets("storagestatfs_js_assets") {
-  source_dir = "./src/main/js/default"
+  js2abc = true
+  hap_profile = "./src/main/config.json"
+  source_dir = "./src/main/js"
 }
 ohos_resources("storagestatfs_js_resources") {
   sources = [ "./src/main/resources" ]

storage/storagestatfsjstest/Test.json

 {
     "description": "Configuration for storage statfs Tests",
     "driver": {
-        "type": "JSUnitTest",
+        "type": "OHJSUnitTest",
         "test-timeout": "60000",
-        "package": "ohos.acts.storage.statfs",
-        "shell-timeout": "60000"
+        "shell-timeout": "60000",
+        "bundle-name": "ohos.acts.storage.statfs",
+        "package-name": "ohos.acts.storage.statfs"
     },
     "kits": [
         {

storage/storagestatfsjstest/src/main/config.json

@@ -14,7 +14,7 @@
     "deviceConfig": {},
     "module": {
         "package": "ohos.acts.storage.statfs",
-    "name": ".MyApplication",
+        "name": ".entry",
         "deviceType": [
             "phone"
         ],
@@ -36,13 +36,30 @@
                         ]
                     }
                 ],
-        "name": "ohos.acts.storage.statfs.MainAbility",
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".MainAbility",
+                "srcLanguage": "js",
+                "srcPath": "MainAbility",
                 "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:app_name",
+                "description": "$string:MainAbility_desc",
+                "label": "$string:MainAbility_label",
                 "type": "page",
-        "launchType": "standard",
-        "visible": true
+                "visible": true,
+                "launchType": "standard"
+            },
+            {
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".TestAbility",
+                "srcLanguage": "js",
+                "srcPath": "TestAbility",
+                "icon": "$media:icon",
+                "description": "$string:TestAbility_desc",
+                "label": "$string:TestAbility_label",
+                "type": "page",
+                "visible": true,
+                "launchType": "standard"
             }
         ],
         "js": [
@@ -55,7 +72,23 @@
                     "designWidth": 720,
                     "autoDesignWidth": false
                 }
+            },
+            {
+                "pages": [
+                    "pages/index/index"
+                ],
+                "name": ".TestAbility",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": false
+                }
             }
-    ]
+        ],
+        "testRunner": {
+            "name": "OpenHarmonyTestRunner",
+            "srcPath": "TestRunner"
+        },
+        "mainAbility": ".MainAbility",
+        "srcPath": ""
     }
 }
\ No newline at end of file

storage/storagesecuritylabeljstest/src/main/js/default/pages/index/index.js → storage/storagestatfsjstest/src/main/js/MainAbility/pages/index/index.js

@@ -15,7 +15,6 @@
 
 import app from '@system.app'
 
-import {Core} from 'deccjsunit/index'
 
 const injectRef = Object.getPrototypeOf(global) || global
 injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
@@ -29,12 +28,6 @@ export default {
   },
   onShow() {
     console.info('onShow finish')
-    const core = Core.getInstance()
-    core.init()
-    const configService = core.getDefaultService('config')
-    configService.setConfig(this)
-    require('../../test/List.test')
-    core.execute()
   },
   onReady() {
   },

storage/storagestatfsjstest/src/main/js/TestAbility/app.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../test/List.test'
+
+export default {
+    onCreate() {
+        console.info('TestApplication onCreate')
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        console.info('start run testcase!!!')
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+    },
+    onDestroy() {
+        console.info("TestApplication onDestroy");
+    }
+};

storage/storagestatfsjstest/src/main/js/TestAbility/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

storage/storagestatfsjstest/src/main/js/TestAbility/i18n/zh-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

storage/storagestatfsjstest/src/main/js/TestAbility/pages/index/index.css

+.container {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    left: 0px;
+    top: 0px;
+    width: 100%;
+    height: 100%;
+}
+
+.title {
+    font-size: 60px;
+    text-align: center;
+    width: 100%;
+    height: 40%;
+    margin: 10px;
+}
+
+@media screen and (device-type: phone) and (orientation: landscape) {
+    .title {
+        font-size: 60px;
+    }
+}
+
+@media screen and (device-type: tablet) and (orientation: landscape) {
+    .title {
+        font-size: 100px;
+    }
+}
\ No newline at end of file

storage/storagestatfsjstest/src/main/js/TestAbility/pages/index/index.hml

+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

storage/storagestatfsjstest/src/main/js/TestAbility/pages/index/index.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export default {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    }
+}
+
+
+

storage/storagestatfsjstest/src/main/js/TestRunner/OpenHarmonyTestRunner.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+function translateParamsToString(parameters) {
+    const keySet = new Set([
+        '-s class', '-s notClass', '-s suite', '-s itName',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s package', '-s dryRun'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams += ' ' + key + ' ' + parameters[key]
+        }
+    }
+    return targetParams.trim()
+}
+
+ export default {
+    onPrepare() {
+        console.info('OpenHarmonyTestRunner OnPrepare')
+    },
+    onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+
+        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility'
+
+        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        console.info('debug value : '+debug)
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            console.info('executeShellCommand : err : ' + JSON.stringify(err));
+            console.info('executeShellCommand : data : ' + data.stdResult);
+            console.info('executeShellCommand : data : ' + data.exitCode);
+        })
+    }
+};

storage/storagestatfsjstest/src/main/js/default/test/Common.js → storage/storagestatfsjstest/src/main/js/test/Common.js

@@ -17,10 +17,7 @@ import statfs from '@ohos.statfs';
 
 export const FILE_CONTENT = 'hello world';
 
-import {
-  describe, beforeAll, beforeEach, afterEach, afterAll, it, expect
-}
-from 'deccjsunit/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 
 function isIntNum(val) {
   return typeof val === 'number' && val % 1 === 0;

storage/storagesecuritylabeljstest/src/main/js/default/test/List.test.js → storage/storagestatfsjstest/src/main/js/test/List.test.js

@@ -13,4 +13,7 @@
  * limitations under the License.
  */
 
-require('./securitylabel.test.js');
+import statfs_test from './statfs.test.js'
+export default function testsuite() {
+    statfs_test()
+}

storage/storagestatfsjstest/src/main/js/default/test/statfs.test.js → storage/storagestatfsjstest/src/main/js/test/statfs.test.js

@@ -16,7 +16,8 @@
 import {describe, it, expect, isIntNum, statfs} from './Common';
 import featureAbility from '@ohos.ability.featureAbility';
 
-describe('statfs', function () {
+export default function statfs_test() {
+describe('statfs_test', function () {
 
     /**
      * @tc.number SUB_DF_STATFS_GET_FREE_BYTES_0000
@@ -222,3 +223,4 @@ describe('statfs', function () {
       }
     });
 });
+}

storage/storagestatfsjstest/src/main/resources/base/element/string.json

@@ -7,6 +7,22 @@
     {
       "name": "mainability_description",
       "value": "JS_Phone_Empty Feature Ability"
+		},
+	{
+		"name": "MainAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "MainAbility_label",
+		"value": "label"
+	},
+		{
+		"name": "TestAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "TestAbility_label",
+		"value": "label"
 	}
   ]
 }
\ No newline at end of file

useriam/face_auth/js_api_test/function_test/userauth/BUILD.gn

@@ -14,7 +14,7 @@
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("ActsUserauthTest") {
-  hap_profile = "./entry/src/main/config.json"
+  hap_profile = "./src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
@@ -23,9 +23,11 @@ ohos_js_hap_suite("ActsUserauthTest") {
   hap_name = "ActsUserauthTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/js/default"
+  js2abc = true
+  hap_profile = "./src/main/config.json"
+  source_dir = "./src/main/js"
 }
 ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/js/resources" ]
-  hap_profile = "./entry/src/main/config.json"
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
 }

useriam/face_auth/js_api_test/function_test/userauth/Test.json

 {
     "description": "Configuration for hjunit demo Tests",
     "driver": {
-        "type": "JSUnitTest",
+        "type": "OHJSUnitTest",
         "test-timeout": "600000",
-        "package": "com.example.myapplication101",
-        "shell-timeout": "600000"
+        "shell-timeout": "600000",
+        "bundle-name": "com.example.myapplication101",
+        "package-name": "com.example.myapplication101"
     },
     "kits": [
         {

useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.example.myapplication101",
-    "vendor": "example",
-    "version": {
-      "code": 12,
-      "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 4,
-      "target": 5,
-      "releaseType": "Beta1"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.example.myapplication101",
-    "name": ".MyApplication",
-    "mainAbility": "com.example.myapplication101.MainAbility",
-    "deviceType": [
-      "phone",
-      "tablet",
-      "tv",
-      "wearable"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "com.example.myapplication101.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:entry_MainAbility",
-        "type": "page",
-        "launchType": "standard",
-        "visible": true
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": true
-        }
-      }
-    ],
-    "reqPermissions": [
-      {
-        "reason": "reason_manage_face",
-        "usedScene": {
-          "ability": ["com.myface.Ability","com.myface.AbilityBackground"],
-          "when": "always"
-        },
-        "name": "ohos.permission.MANAGE_FACE"
-      },
-      {
-        "reason": "reason_access_biometric",
-        "usedScene": {
-          "ability": ["com.mybiometric.Ability","com.mybiometric.AbilityBackground"],
-          "when": "always"
-        },
-        "name": "ohos.permission.ACCESS_BIOMETRIC"
-      }
-    ]
-  }
-}

useriam/face_auth/js_api_test/function_test/userauth/src/main/config.json

+{
+    "app": {
+        "bundleName": "com.example.myapplication101",
+        "vendor": "example",
+        "version": {
+            "code": 12,
+            "name": "1.0.0"
+        },
+        "apiVersion": {
+            "compatible": 4,
+            "target": 5,
+            "releaseType": "Beta1"
+        }
+    },
+    "deviceConfig": {},
+    "module": {
+        "package": "com.example.myapplication101",
+        "name": ".entry",
+        "mainAbility": ".MainAbility",
+        "deviceType": [
+            "phone",
+            "tablet",
+            "tv",
+            "wearable"
+        ],
+        "distro": {
+            "deliveryWithInstall": true,
+            "moduleName": "entry",
+            "moduleType": "entry",
+            "installationFree": false
+        },
+        "abilities": [
+            {
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".TestAbility",
+                "srcLanguage": "js",
+                "srcPath": "TestAbility",
+                "icon": "$media:icon",
+                "description": "$string:TestAbility_desc",
+                "label": "$string:TestAbility_label",
+                "type": "page",
+                "visible": true,
+                "launchType": "standard"
+            },
+            {
+                "skills": [
+                    {
+                        "entities": [
+                            "entity.system.home"
+                        ],
+                        "actions": [
+                            "action.system.home"
+                        ]
+                    }
+                ],
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".MainAbility",
+                "srcLanguage": "js",
+                "srcPath": "MainAbility",
+                "icon": "$media:icon",
+                "description": "$string:MainAbility_desc",
+                "label": "$string:MainAbility_label",
+                "type": "page",
+                "visible": true,
+                "launchType": "standard"
+            }
+        ],
+        "js": [
+            {
+                "pages": [
+                    "pages/index/index"
+                ],
+                "name": "default",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": true
+                }
+            },
+            {
+                "pages": [
+                    "pages/index/index"
+                ],
+                "name": ".TestAbility",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": false
+                }
+            }
+        ],
+        "reqPermissions": [
+            {
+                "reason": "reason_manage_face",
+                "usedScene": {
+                    "ability": [
+                        "com.myface.Ability",
+                        "com.myface.AbilityBackground"
+                    ],
+                    "when": "always"
+                },
+                "name": "ohos.permission.MANAGE_FACE"
+            },
+            {
+                "reason": "reason_access_biometric",
+                "usedScene": {
+                    "ability": [
+                        "com.mybiometric.Ability",
+                        "com.mybiometric.AbilityBackground"
+                    ],
+                    "when": "always"
+                },
+                "name": "ohos.permission.ACCESS_BIOMETRIC"
+            }
+        ],
+        "testRunner": {
+            "name": "OpenHarmonyTestRunner",
+            "srcPath": "TestRunner"
+        },
+        "srcPath": ""
+    }
+}
\ No newline at end of file

useriam/face_auth/js_api_test/function_test/userauth/src/main/js/MainAbility/app.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../test/List.Test'
+
+export default {
+    onCreate() {
+        console.info('TestApplication onCreate')
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        console.info('start run testcase!!!')
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+    },
+    onDestroy() {
+        console.info("TestApplication onDestroy");
+    }
+};
+

useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.js → useriam/face_auth/js_api_test/function_test/userauth/src/main/js/MainAbility/pages/index/index.js

@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Core, ExpectExtend} from 'deccjsunit/index'
 import fileio from '@ohos.fileio'
 
 export default {
@@ -24,18 +23,7 @@ export default {
     },
     onShow() {
         console.info('onShow start')
-        const core = Core.getInstance()
-        const expectExtend = new ExpectExtend({
-            'id': 'extend'
-        })
-        core.addService('expect', expectExtend)
-        core.init()
-        const configService = core.getDefaultService('config')
-        this.timeout = 35000;
-        configService.setConfig(this)
-        require('../../../test/ListTest')
-        core.execute()
-        console.info('onShow end')
+
     },
     onReady() {
     },

useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/app.js → useriam/face_auth/js_api_test/function_test/userauth/src/main/js/TestAbility/app.js

@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 export default {
     onCreate() {
         console.info('AceApplication onCreate');

useriam/face_auth/js_api_test/function_test/userauth/src/main/js/TestAbility/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

useriam/face_auth/js_api_test/function_test/userauth/src/main/js/TestAbility/i18n/zh-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

useriam/face_auth/js_api_test/function_test/userauth/src/main/js/TestAbility/pages/index/index.css

+.container {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    left: 0px;
+    top: 0px;
+    width: 100%;
+    height: 100%;
+}
+
+.title {
+    font-size: 60px;
+    text-align: center;
+    width: 100%;
+    height: 40%;
+    margin: 10px;
+}
+
+@media screen and (device-type: phone) and (orientation: landscape) {
+    .title {
+        font-size: 60px;
+    }
+}
+
+@media screen and (device-type: tablet) and (orientation: landscape) {
+    .title {
+        font-size: 100px;
+    }
+}
\ No newline at end of file

useriam/face_auth/js_api_test/function_test/userauth/src/main/js/TestAbility/pages/index/index.hml

+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

useriam/face_auth/js_api_test/function_test/userauth/src/main/js/TestAbility/pages/index/index.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export default {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    }
+}
+
+
+

useriam/face_auth/js_api_test/function_test/userauth/src/main/js/TestRunner/OpenHarmonyTestRunner.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+function translateParamsToString(parameters) {
+    const keySet = new Set([
+        '-s class', '-s notClass', '-s suite', '-s itName',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s package', '-s dryRun'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams += ' ' + key + ' ' + parameters[key]
+        }
+    }
+    return targetParams.trim()
+}
+
+ export default {
+    onPrepare() {
+        console.info('OpenHarmonyTestRunner OnPrepare')
+    },
+    onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+
+        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.MainAbility'
+
+        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        console.info('debug value : '+debug)
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            console.info('executeShellCommand : err : ' + JSON.stringify(err));
+            console.info('executeShellCommand : data : ' + data.stdResult);
+            console.info('executeShellCommand : data : ' + data.exitCode);
+        })
+    }
+};

useriam/face_auth/js_api_test/function_test/userauth/src/main/js/test/List.Test.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import userAuthTestExecute from './execute.js'
+import userAuthTestEnum from './enumTest.js'
+export default function testsuite() {
+    userAuthTestEnum()
+    userAuthTestExecute()
+}
+

useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/enumTest.js → useriam/face_auth/js_api_test/function_test/userauth/src/main/js/test/enumTest.js

@@ -14,12 +14,13 @@
  */
 
 import userAuth from '@ohos.userIAM.userAuth'
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
-var index = require('../default/pages/index/index.js');
+var index = require('../MainAbility/pages/index/index.js');
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 
 /**
  * test case
  */
+export default function userAuthTestEnum() {
 describe('userAuthTestEnum', function () {
     beforeEach(function(done) {
         let waitTime = 1000;
@@ -162,3 +163,4 @@ describe('userAuthTestEnum', function () {
         expect(userAuth.AuthenticationResult.GENERAL_ERROR).assertEqual(100)
     })
 })
+}
\ No newline at end of file

useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/execute.js → useriam/face_auth/js_api_test/function_test/userauth/src/main/js/test/execute.js

@@ -14,13 +14,14 @@
  */
 
 import userAuth from '@ohos.userIAM.userAuth'
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
-var index = require('../default/pages/index/index.js');
+var index = require('../MainAbility/pages/index/index.js');
 var waitFlag = false;
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
 
 /**
  * test case
  */
+export default function userAuthTestExecute() {
 describe('userAuthTestExecute', function () {
     beforeEach(function(done) {
         let waitTime = 1000;
@@ -120,3 +121,4 @@ describe('userAuthTestExecute', function () {
         console.log("JSAPI_Function_Execute_2100 end");
     })
 })
+}

useriam/face_auth/js_api_test/function_test/userauth/src/main/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "entry_MainAbility",
+      "value": "entry_MainAbility"
+    },
+	{
+		"name": "MainAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "MainAbility_label",
+		"value": "label"
+	},
+		{
+		"name": "TestAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "TestAbility_label",
+		"value": "label"
+	}
+  ]
+}
\ No newline at end of file

useriam/face_auth/js_api_test/function_test/userauthpart2/BUILD.gn

@@ -14,7 +14,7 @@
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("ActsUserauthTwoTest") {
-  hap_profile = "./entry/src/main/config.json"
+  hap_profile = "./src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
@@ -23,9 +23,11 @@ ohos_js_hap_suite("ActsUserauthTwoTest") {
   hap_name = "ActsUserauthTwoTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/js/default"
+  js2abc = true
+  hap_profile = "./src/main/config.json"
+  source_dir = "./src/main/js"
 }
 ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/js/resources" ]
-  hap_profile = "./entry/src/main/config.json"
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
 }

useriam/face_auth/js_api_test/function_test/userauthpart2/Test.json

 {
     "description": "Configuration for hjunit demo Tests",
     "driver": {
-        "type": "JSUnitTest",
+        "type": "OHJSUnitTest",
         "test-timeout": "900000",
-        "package": "com.example.myapplication101",
-        "shell-timeout": "600000"
+        "shell-timeout": "900000",
+        "bundle-name": "com.example.myapplication101",
+        "package-name": "com.example.myapplication101"
     },
     "kits": [
         {

useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.example.myapplication101",
-    "vendor": "example",
-    "version": {
-      "code": 12,
-      "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 4,
-      "target": 5,
-      "releaseType": "Beta1"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.example.myapplication101",
-    "name": ".MyApplication",
-    "mainAbility": "com.example.myapplication101.MainAbility",
-    "deviceType": [
-      "phone",
-      "tablet",
-      "tv",
-      "wearable"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "com.example.myapplication101.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:entry_MainAbility",
-        "type": "page",
-        "launchType": "standard",
-        "visible": true
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": true
-        }
-      }
-    ],
-    "reqPermissions": [
-      {
-        "name": "ohos.permission.ACCESS_BIOMETRIC"
-      },
-      {
-        "name": "ohos.permission.USE_USER_IDM"
-      },
-      {
-        "name": "ohos.permission.MANAGE_USER_IDM"
-      },
-      {
-        "name": "ohos.permission.ACCESS_USER_AUTH_INTERNAL"
-      },
-      {
-        "name": "ohos.permission.ACCESS_PIN_AUTH"
-      }
-    ]
-  }
-}

useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/default/pages/index/index.js

-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {Core, ExpectExtend} from 'deccjsunit/index'
-import fileio from '@ohos.fileio'
-
-export default {
-    data: {
-        title: ""
-    },
-    onInit() {
-        this.title = this.$t('strings.world');
-    },
-    onShow() {
-        console.info('onShow start')
-        const core = Core.getInstance()
-        const expectExtend = new ExpectExtend({
-            'id': 'extend'
-        })
-        core.addService('expect', expectExtend)
-        core.init()
-        const configService = core.getDefaultService('config')
-        this.timeout = 35000;
-        configService.setConfig(this)
-        require('../../../test/List.test.js')
-        core.execute()
-        console.info('onShow end')
-    },
-    onReady() {
-    },
-}

useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "entry_MainAbility",
-      "value": "entry_MainAbility"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Empty Ability"
-    }
-  ]
-}
\ No newline at end of file

useriam/face_auth/js_api_test/function_test/userauthpart2/src/main/config.json

+{
+    "app": {
+        "bundleName": "com.example.myapplication101",
+        "vendor": "example",
+        "version": {
+            "code": 12,
+            "name": "1.0.0"
+        },
+        "apiVersion": {
+            "compatible": 4,
+            "target": 5,
+            "releaseType": "Beta1"
+        }
+    },
+    "deviceConfig": {},
+    "module": {
+        "package": "com.example.myapplication101",
+        "name": ".entry",
+        "mainAbility": ".MainAbility",
+        "deviceType": [
+            "phone",
+            "tablet",
+            "tv",
+            "wearable"
+        ],
+        "distro": {
+            "deliveryWithInstall": true,
+            "moduleName": "entry",
+            "moduleType": "entry",
+            "installationFree": false
+        },
+        "abilities": [
+            {
+                "skills": [
+                    {
+                        "entities": [
+                            "entity.system.home"
+                        ],
+                        "actions": [
+                            "action.system.home"
+                        ]
+                    }
+                ],
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".MainAbility",
+                "srcLanguage": "js",
+                "srcPath": "MainAbility",
+                "icon": "$media:icon",
+                "description": "$string:MainAbility_desc",
+                "label": "$string:MainAbility_label",
+                "type": "page",
+                "visible": true,
+                "launchType": "standard"
+            },
+            {
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".TestAbility",
+                "srcLanguage": "js",
+                "srcPath": "TestAbility",
+                "icon": "$media:icon",
+                "description": "$string:TestAbility_desc",
+                "label": "$string:TestAbility_label",
+                "type": "page",
+                "visible": true,
+                "launchType": "standard"
+            }
+        ],
+        "js": [
+            {
+                "pages": [
+                    "pages/index/index"
+                ],
+                "name": "default",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": true
+                }
+            },
+            {
+                "pages": [
+                    "pages/index/index"
+                ],
+                "name": ".TestAbility",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": false
+                }
+            }
+        ],
+        "reqPermissions": [
+            {
+                "name": "ohos.permission.ACCESS_BIOMETRIC"
+            },
+            {
+                "name": "ohos.permission.USE_USER_IDM"
+            },
+            {
+                "name": "ohos.permission.MANAGE_USER_IDM"
+            },
+            {
+                "name": "ohos.permission.ACCESS_USER_AUTH_INTERNAL"
+            },
+            {
+                "name": "ohos.permission.ACCESS_PIN_AUTH"
+            }
+        ],
+        "testRunner": {
+            "name": "OpenHarmonyTestRunner",
+            "srcPath": "TestRunner"
+        },
+        "srcPath": ""
+    }
+}
\ No newline at end of file

useriam/face_auth/js_api_test/function_test/userauthpart2/src/main/js/MainAbility/pages/index/index.js

+/*
+ * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import fileio from '@ohos.fileio'
+
+export default {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    },
+    onShow() {
+        console.info('onShow start')
+    },
+    onReady() {
+    },
+}

useriam/face_auth/js_api_test/function_test/userauthpart2/src/main/js/TestAbility/app.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../test/List.test'
+
+export default {
+    onCreate() {
+        console.info('TestApplication onCreate')
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        console.info('start run testcase!!!')
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+    },
+    onDestroy() {
+        console.info("TestApplication onDestroy");
+    }
+};

useriam/face_auth/js_api_test/function_test/userauthpart2/src/main/js/TestAbility/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

useriam/face_auth/js_api_test/function_test/userauthpart2/src/main/js/TestAbility/i18n/zh-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

useriam/face_auth/js_api_test/function_test/userauthpart2/src/main/js/TestAbility/pages/index/index.css

+.container {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    left: 0px;
+    top: 0px;
+    width: 100%;
+    height: 100%;
+}
+
+.title {
+    font-size: 60px;
+    text-align: center;
+    width: 100%;
+    height: 40%;
+    margin: 10px;
+}
+
+@media screen and (device-type: phone) and (orientation: landscape) {
+    .title {
+        font-size: 60px;
+    }
+}
+
+@media screen and (device-type: tablet) and (orientation: landscape) {
+    .title {
+        font-size: 100px;
+    }
+}
\ No newline at end of file

useriam/face_auth/js_api_test/function_test/userauthpart2/src/main/js/TestAbility/pages/index/index.hml

+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

useriam/face_auth/js_api_test/function_test/userauthpart2/src/main/js/TestAbility/pages/index/index.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export default {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    }
+}
+
+
+

useriam/face_auth/js_api_test/function_test/userauthpart2/src/main/js/TestRunner/OpenHarmonyTestRunner.js

+/*
+ * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+function translateParamsToString(parameters) {
+    const keySet = new Set([
+        '-s class', '-s notClass', '-s suite', '-s itName',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s package', '-s dryRun'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams += ' ' + key + ' ' + parameters[key]
+        }
+    }
+    return targetParams.trim()
+}
+
+ export default {
+    onPrepare() {
+        console.info('OpenHarmonyTestRunner OnPrepare')
+    },
+    onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+
+        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility'
+
+        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        console.info('debug value : '+debug)
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            console.info('executeShellCommand : err : ' + JSON.stringify(err));
+            console.info('executeShellCommand : data : ' + data.stdResult);
+            console.info('executeShellCommand : data : ' + data.exitCode);
+        })
+    }
+};

useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/List.test.js → useriam/face_auth/js_api_test/function_test/userauthpart2/src/main/js/test/List.test.js

@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-require('./Security_IAM_PIN_Kit_CallbackJsunit.test.js')
-
+import userauthTest from './Security_IAM_PIN_Kit_CallbackJsunit.test.js'
+export default function testsuite() {
+    userauthTest()
+}

useriam/face_auth/js_api_test/function_test/userauthpart2/entry/src/main/js/test/Security_IAM_PIN_Kit_CallbackJsunit.test.js → useriam/face_auth/js_api_test/function_test/userauthpart2/src/main/js/test/Security_IAM_PIN_Kit_CallbackJsunit.test.js

@@ -13,12 +13,13 @@
  * limitations under the License.
  */
 
-import {describe, it, expect} from 'deccjsunit/index'
+import {describe, it, expect} from '@ohos/hypium'
 import userAuthNorth from '@ohos.userIAM.userAuth'
 
 let UserAuthKit = new userAuthNorth.UserAuth()
 
 
+export default function userauthTest() {
 describe('userauthTest', function () {
 
     /*
@@ -208,3 +209,4 @@ describe('userauthTest', function () {
 
 })
 
+}

useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/resources/base/element/string.json → useriam/face_auth/js_api_test/function_test/userauthpart2/src/main/resources/base/element/string.json

@@ -7,6 +7,22 @@
     {
       "name": "mainability_description",
       "value": "JS_Empty Ability"
+		},
+	{
+		"name": "MainAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "MainAbility_label",
+		"value": "label"
+	},
+		{
+		"name": "TestAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "TestAbility_label",
+		"value": "label"
 	}
   ]
 }
\ No newline at end of file