!4481 Adapt to the new framework_part22

Merge pull request !4481 from jiyong/local-20220722-0001

commonlibrary/ets_utils/uri_lib_standard/BUILD.gn

@@ -31,7 +31,9 @@ ohos_js_hap_suite("uri_js_test") {
   #  subsystem_name = "xts"
 }
 ohos_js_assets("uri_js_assets") {
-  source_dir = "./src/main/js/default"
+  js2abc = true
+  hap_profile = "./src/main/config.json"
+  source_dir = "./src/main/js"
 }
 ohos_resources("uri_resources") {
   sources = [ "./src/main/resources" ]

commonlibrary/ets_utils/uri_lib_standard/Test.json

 {
     "description": "Configuration for startup uri js api Tests",
     "driver": {
-        "type": "JSUnitTest",
+        "type": "OHJSUnitTest",
         "test-timeout": "800000",
-        "package": "com.example.uri",
-        "shell-timeout": "90000"
+        "bundle-name": "com.example.uri",
+        "package-name": "com.example.uri",
+        "shell-timeout": "800000"
     },
     "kits": [
         {

commonlibrary/ets_utils/uri_lib_standard/src/main/config.json

@@ -14,8 +14,8 @@
   "deviceConfig": {},
   "module": {
     "package": "com.example.uri",
-    "name": ".MyApplication",
-    "mainAbility": "com.example.uri.MainAbility",
+    "name": ".entry",
+    "mainAbility": ".MainAbility",
     "deviceType": [
       "phone"
     ],
@@ -37,12 +37,29 @@
             ]
           }
         ],
+        "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,
-        "name": "com.example.uri.MainAbility",
+        "launchType": "standard"
+    },
+    {
+        "orientation": "unspecified",
+        "formsEnabled": false,
+        "name": ".TestAbility",
+        "srcLanguage": "js",
+        "srcPath": "TestAbility",
         "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:entry_MainAbility",
+        "description": "$string:TestAbility_desc",
+        "label": "$string:TestAbility_label",
         "type": "page",
+        "visible": true,
         "launchType": "standard"
     }
     ],
@@ -56,7 +73,22 @@
                 "designWidth": 720,
                 "autoDesignWidth": true
             }
+        },
+        {
+            "pages": [
+                "pages/index/index"
+            ],
+            "name": ".TestAbility",
+            "window": {
+                "designWidth": 720,
+                "autoDesignWidth": false
             }
-    ]
         }
+    ],
+    "testRunner": {
+        "name": "OpenHarmonyTestRunner",
+        "srcPath": "TestRunner"
+    },
+    "srcPath": ""
+}
 }
\ No newline at end of file

sensors/miscdevice_standard/src/main/js/default/pages/index/index.js → commonlibrary/ets_utils/uri_lib_standard/src/main/js/MainAbility/pages/index/index.js

 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * 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
@@ -12,35 +12,29 @@
  * 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'
+import app from '@system.app'
+import device from '@system.device'
+import router from '@system.router'
 
-import {Core, ExpectExtend} from 'deccjsunit/index'
-
-const injectRef = Object.getPrototypeOf(global) || global
-injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
 
 export default {
     data: {
-        title: ""
+        title: ''
     },
     onInit() {
         this.title = this.$t('strings.world');
     },
     onShow() {
         console.info('onShow finish')
-        const core = Core.getInstance()
-        const expectExtend = new ExpectExtend({
-            'id': 'extend'
-        })
-        core.addService('expect', expectExtend)
-        core.init()
-
-        const configService = core.getDefaultService('config')
-        this.timeout = 5000
-        configService.setConfig(this)
-
-        require('../../test/List.test')
-        core.execute()
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        console.info('start run testcase!!!')
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
     },
     onReady() {
     },
 }
+

sensors/miscdevice_standard/src/main/js/default/app.js → commonlibrary/ets_utils/uri_lib_standard/src/main/js/TestAbility/app.js

 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * 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

commonlibrary/ets_utils/uri_lib_standard/src/main/js/TestAbility/i18n/en-US.json

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

commonlibrary/ets_utils/uri_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json

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

commonlibrary/ets_utils/uri_lib_standard/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

commonlibrary/ets_utils/uri_lib_standard/src/main/js/TestAbility/pages/index/index.hml

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

sensors/miscdevice_standard/src/main/js/default/test/List.test.js → commonlibrary/ets_utils/uri_lib_standard/src/main/js/TestAbility/pages/index/index.js

 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * 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
@@ -13,5 +13,14 @@
  * limitations under the License.
  */
 
-require('./Vibrator_old.test.js')
-require('./Vibrator_new.test.js')
+export default {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    }
+}
+
+
+

commonlibrary/ets_utils/uri_lib_standard/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);
+        })
+    }
+};

commonlibrary/ets_utils/uri_lib_standard/src/main/js/test/List.test.js

@@ -12,5 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { UriTest } from './uri.test.js'
 
-require('./uri.test.js')
+export default function testsuite() {
\ No newline at end of file
+    UriTest()
+}

commonlibrary/ets_utils/uri_lib_standard/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

distributeddatamgr/appdatamgrjstest/hap/BUILD.gn

@@ -21,8 +21,6 @@ ohos_js_hap_suite("appdatamgr_js_test") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsAppdatamagrJsTest"
-  subsystem_name = "distributeddatamgr"
-  part_name = "relational_store"
 }
 ohos_js_assets("appdatamgr_js_assets") {
   js2abc = true

distributeddatamgr/appdatamgrjstest/hap/src/main/js/test/List.test.js

@@ -12,24 +12,24 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-import dataAbilityPredicatesTest from './StorageHelperJsunit.test.js'
-import rdbStoreBackupRestoreWithFAContextTest from './StoragePromiseJsunit.test.js'
-import rdbstoreChangeEncryptKeyTest from './StorageCallBackJsunit.test.js'
-import rdbStoreDataSharePredicatesTest from './StorageSyncJsunit.test.js'
-import rdbStoreDeleteTest from './RdbstoreInsertJsunit.test.js'
-import rdbStoreDistributedTest from './RdbstoreDeleteJsunit.test.js'
-import rdbstoreInsertTest from './RdbStoreResultSetJsunit.test.js'
-import rdbStorePredicatesJoinTest from './RdbstorePredicatesJsunit.test.js'
-import rdbPredicatesTest from './RdbstoreRdbstoreJsunit.test.js'
-import rdbStoreTest from './RdbstoreStoreExcuteSqlJsunit.test.js'
-import rdbResultSetTest from './RdbstoreUpdateJsunit.test.js'
-import rdbstoreStoreExcuteSqlTest from './DataAbilityPredicatesJsunit.test.js'
+import dataAbilityPredicatesTest from './DataAbilityPredicatesJsunit.test.js'
+import rdbStoreBackupRestoreWithFAContextTest from './RdbstoreBackupRestoreWithFAContextJsunit.test.js'
+import rdbstoreChangeEncryptKeyTest from './RdbstoreChangeEncryptKeyJsunit.test.js'
+import rdbStoreDataSharePredicatesTest from './RdbStoreDataShareJsunit.test.js'
+import rdbStoreDeleteTest from './RdbstoreDeleteJsunit.test.js'
+import rdbStoreDistributedTest from './RdbStoreDistributedJsunit.test.js'
+import rdbstoreInsertTest from './RdbstoreInsertJsunit.test.js'
+import rdbStorePredicatesJoinTest from './RdbstorePredicatesJoinJsunit.test.js'
+import rdbPredicatesTest from './RdbstorePredicatesJsunit.test.js'
+import rdbStoreTest from './RdbstoreRdbstoreJsunit.test.js'
+import rdbResultSetTest from './RdbStoreResultSetJsunit.test.js'
+import rdbstoreStoreExcuteSqlTest from './RdbstoreStoreExcuteSqlJsunit.test.js'
 import rdbstoreTransactionTest from './RdbstoreTransactionJsunit.test.js'
-import rdbStoreUpdateTest from './RdbstorePredicatesJoinJsunit.test.js'
-import storageCallBackTest from './RdbStoreDistributedJsunit.test.js'
-import storageHelperTest from './RdbstoreChangeEncryptKeyJsunit.test.js'
-import storagePromiseTest from './RdbStoreDataShareJsunit.test.js'
-import storageSyncTest from './RdbstoreBackupRestoreWithFAContextJsunit.test.js'
+import rdbStoreUpdateTest from './RdbstoreUpdateJsunit.test.js'
+import storageCallBackTest from './StorageCallBackJsunit.test.js'
+import storageHelperTest from './StorageHelperJsunit.test.js'
+import storagePromiseTest from './StoragePromiseJsunit.test.js'
+import storageSyncTest from './StorageSyncJsunit.test.js'
 export default function testsuite() {
 dataAbilityPredicatesTest()
 rdbStoreBackupRestoreWithFAContextTest()

distributeddatamgr/appdatamgrjstest/hap/src/main/js/test/RdbstoreStoreExcuteSqlJsunit.test.js

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium'
 import dataRdb from '@ohos.data.rdb';
 
 const TAG = "[RDB_JSKITS_TEST]"
@@ -23,7 +23,8 @@ const STORE_CONFIG = {
 }
 var rdbStore = undefined;
 
-describe('rdbStoreInsertTest', function () {
+export default function rdbstoreStoreExcuteSqlTest() {
+    describe('rdbstoreStoreExcuteSqlTest', function () {
         beforeAll(async function () {
             console.info(TAG + 'beforeAll')
             rdbStore = await dataRdb.getRdbStore(STORE_CONFIG, 1);
@@ -362,4 +363,5 @@ describe('rdbStoreInsertTest', function () {
     
     
         console.info(TAG + "*************Unit Test End*************");
-})
+    })
\ No newline at end of file
+}

distributeddatamgr/distributeddataObjectjstest/hap/src/main/js/test/List.test.js

@@ -14,5 +14,5 @@
 */
 import objectStoreTest from './ObjectStoreJsunit.test.js'
 export default function testsuite() {
-objectStoreTest()
+    objectStoreTest()
 }

distributeddatamgr/distributeddataObjectjstest/hap/src/main/js/test/ObjectStoreJsunit.test.js

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium'
 import distributedObject from '@ohos.data.distributedDataObject';
 import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
 import bundle from '@ohos.bundle'
@@ -66,7 +66,7 @@ var tokenID = undefined;
 const TIMEOUT = 2000;
 const PERMISSION_USER_SET = 1;
 const PERMISSION_USER_NAME = "ohos.permission.DISTRIBUTED_DATASYNC";
-
+export default function objectStoreTest() {
 describe('objectStoreTest', function () {
     beforeAll(async function (done) {
         console.info("====>beforeAll start====");
@@ -775,3 +775,4 @@ describe('objectStoreTest', function () {
     })
     console.info(TAG + "*************Unit Test End*************");
 })
+}
\ No newline at end of file

sensors/miscdevice_standard/BUILD.gn

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

sensors/miscdevice_standard/Test.json

 {
     "description": "Configuration for miscdevice js api Tests",
     "driver": {
-        "type": "JSUnitTest",
+        "type": "OHJSUnitTest",
         "test-timeout": "160000",
-        "package": "ohos.acts.sensors.sensor.function",
-        "shell-timeout": "60000"
+        "shell-timeout": "160000",
+        "bundle-name": "ohos.acts.sensors.sensor.function",
+        "package-name": "ohos.acts.sensors.sensor.function"
     },
     "kits": [
         {

sensors/miscdevice_standard/src/main/config.json

@@ -14,7 +14,7 @@
     "deviceConfig": {},
     "module": {
         "package": "ohos.acts.sensors.sensor.function",
-    "name": ".MyApplication",
+        "name": ".entry",
         "deviceType": [
             "phone"
         ],
@@ -25,7 +25,6 @@
         },
         "abilities": [
             {
-        "visible": true,
                 "skills": [
                     {
                         "entities": [
@@ -36,11 +35,29 @@
                         ]
                     }
                 ],
-        "name": "ohos.acts.sensors.sensor.function.MainAbility",
+                "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:mainability_description",
-        "label": "$string:app_name",
+                "description": "$string:TestAbility_desc",
+                "label": "$string:TestAbility_label",
                 "type": "page",
+                "visible": true,
                 "launchType": "standard"
             }
         ],
@@ -54,6 +71,16 @@
                     "designWidth": 720,
                     "autoDesignWidth": false
                 }
+            },
+            {
+                "pages": [
+                    "pages/index/index"
+                ],
+                "name": ".TestAbility",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": false
+                }
             }
         ],
         "reqPermissions": [
@@ -61,6 +88,12 @@
                 "name": "ohos.permission.VIBRATE",
                 "reason": "need use ohos.permission.VIBRATE"
             }
-    ]
+        ],
+        "testRunner": {
+            "name": "OpenHarmonyTestRunner",
+            "srcPath": "TestRunner"
+        },
+        "mainAbility": ".MainAbility",
+        "srcPath": ""
     }
 }
\ No newline at end of file

sensors/miscdevice_standard/src/main/js/MainAbility/app.js

+/*
+ * Copyright (C) 2021 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");
+    }
+};

commonlibrary/ets_utils/uri_lib_standard/src/main/js/default/pages/index/index.js → sensors/miscdevice_standard/src/main/js/MainAbility/pages/index/index.js

 /*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
+ * Copyright (C) 2021 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
@@ -13,26 +13,20 @@
  * limitations under the License.
  */
 
-import app from '@system.app'
-import device from '@system.device'
-import router from '@system.router'
-import {Core} from 'deccjsunit/index'
+
+const injectRef = Object.getPrototypeOf(global) || global
+injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
 
 export default {
     data: {
-        title: ''
+        title: ""
     },
     onInit() {
         this.title = this.$t('strings.world');
     },
     onShow() {
         console.info('onShow finish')
-        const core = Core.getInstance()
-        core.init()
-        require('../../../test/List.test')
-        core.execute()
     },
     onReady() {
     },
 }
-

sensors/miscdevice_standard/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.
+ */
+
+export default {
+    onCreate() {
+        console.info('AceApplication onCreate');
+    },
+    onDestroy() {
+        console.info('AceApplication onDestroy');
+    }
+};
\ No newline at end of file

sensors/miscdevice_standard/src/main/js/TestAbility/i18n/en-US.json

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

sensors/miscdevice_standard/src/main/js/TestAbility/i18n/zh-CN.json

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

sensors/miscdevice_standard/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

sensors/miscdevice_standard/src/main/js/TestAbility/pages/index/index.hml

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

sensors/miscdevice_standard/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');
+    }
+}
+
+
+

sensors/miscdevice_standard/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);
+        })
+    }
+};

sensors/miscdevice_standard/src/main/js/test/List.test.js

+/*
+ * Copyright (C) 2021 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 VibratorJsTest_misc_1 from './Vibrator_old.test.js'
+import VibratorJsTest_misc_2 from './Vibrator_new.test.js'
+export default function testsuite() {
+    VibratorJsTest_misc_1()
+    VibratorJsTest_misc_2()
+}

sensors/miscdevice_standard/src/main/js/default/test/Vibrator_new.test.js → sensors/miscdevice_standard/src/main/js/test/Vibrator_new.test.js

@@ -14,8 +14,9 @@
  */
 import vibrator from '@ohos.vibrator'
 
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect, TestType, Size, Level } from '@ohos/hypium'
 
+export default function VibratorJsTest_misc_2() {
 describe("VibratorJsTest_misc_2", function () {
     beforeAll(function () {
 
@@ -54,7 +55,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0010
      */
-    it("VibratorJsTest001", FUNCTION|MEDIUMTEST|LEVEL0, async function (done) {
+    it("VibratorJsTest001", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL0, async function (done) {
         function vibrateCallback(error) {
             if (error) {
                 console.info('VibratorJsTest001  vibrator error');
@@ -75,7 +76,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0020
      */
-    it("VibratorJsTest002", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest002", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         function vibrateCallback(error) {
             if (error) {
                 console.info('VibratorJsTest002  vibrator success');
@@ -96,7 +97,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0030
      */
-    it("VibratorJsTest003", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest003", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         function vibrateCallback(error) {
             if (error) {
                 console.info('VibratorJsTest003  vibrator success');
@@ -117,7 +118,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0040
      */
-    it("VibratorJsTest004", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest004", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         function vibrateCallback(error) {
             if (error) {
                 console.info('VibratorJsTest004  vibrator error');
@@ -138,7 +139,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0050
      */
-    it("VibratorJsTest005", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest005", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         function vibrateCallback(error) {
             if (error) {
                 console.info('VibratorJsTest005  vibrator success');
@@ -159,7 +160,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0060
      */
-    it("VibratorJsTest006", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest006", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         function vibrateCallback(error) {
             if (error) {
                 console.info('VibratorJsTest006  vibrator success');
@@ -180,7 +181,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0070
      */
-    it("VibratorJsTest007", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest007", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         function vibrateCallback(error) {
             if (error) {
                 console.info('VibratorJsTest007  vibrator error');
@@ -201,7 +202,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0080
      */
-    it("VibratorJsTest008", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest008", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         function vibrateCallback(error) {
             if (error) {
                 console.info('VibratorJsTest008  stop error');
@@ -222,7 +223,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0090
      */
-    it("VibratorJsTest009", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest009", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         console.info('----------------------VibratorJsTest001---------------------------');
         function stopPromise() {
             return new Promise((resolve, reject) => {
@@ -275,7 +276,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0100
      */
-    it("VibratorJsTest010", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest010", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         function vibrateCallback(error) {
             if (error) {
                 console.info('VibratorJsTest010  stop success');
@@ -296,7 +297,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0110
      */
-    it("VibratorJsTest011", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest011", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         vibrator.vibrate(1000).then(() => {
             console.log("VibratorJsTest011  vibrate success");
             expect(true).assertTrue();
@@ -317,7 +318,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0120
      */
-    it("VibratorJsTest012", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest012", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         vibrator.vibrate(-1).then(() => {
             console.log("VibratorJsTest012  vibrate error");
             expect(false).assertTrue();
@@ -338,7 +339,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0130
      */
-    it("VibratorJsTest013", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest013", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         vibrator.vibrate(1800000 + 1).then(() => {
             console.log("VibratorJsTest013  vibrate error");
             expect(false).assertTrue();
@@ -359,7 +360,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0140
      */
-    it("VibratorJsTest014", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest014", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         vibrator.vibrate(vibrator.EffectId.EFFECT_CLOCK_TIMER).then(() => {
             console.log("VibratorJsTest014  vibrate success");
             expect(true).assertTrue();
@@ -380,7 +381,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0150
      */
-    it("VibratorJsTest015", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest015", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         vibrator.vibrate("").then(() => {
             console.log("VibratorJsTest015  vibrate error");
             expect(false).assertTrue();
@@ -401,7 +402,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0160
      */
-    it("VibratorJsTest016", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest016", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         vibrator.stop("").then(() => {
             console.log("VibratorJsTest016  stop error");
             expect(false).assertTrue();
@@ -422,7 +423,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0170
      */
-    it("VibratorJsTest017", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest017", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         vibrator.stop("preset").then(() => {
             console.log("VibratorJsTest017  off success");
             expect(true).assertTrue();
@@ -443,7 +444,7 @@ describe("VibratorJsTest_misc_2", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0180
      */
-    it("VibratorJsTest018", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("VibratorJsTest018", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         function stopPromise() {
             return new Promise((resolve, reject) => {
                 vibrator.stop(vibrator.VibratorStopMode.VIBRATOR_STOP_MODE_TIME).then(() => {
@@ -486,3 +487,4 @@ describe("VibratorJsTest_misc_2", function () {
         done();
     })
 })
+}

sensors/miscdevice_standard/src/main/js/default/test/Vibrator_old.test.js → sensors/miscdevice_standard/src/main/js/test/Vibrator_old.test.js

@@ -14,8 +14,9 @@
  */
 import vibrator from '@system.vibrator';
 
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect, TestType, Size, Level } from '@ohos/hypium'
 
+export default function VibratorJsTest_misc_1() {
 describe("VibratorJsTest_misc_1", function () {
      beforeAll(function () {
 
@@ -59,7 +60,7 @@ describe("VibratorJsTest_misc_1", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0190
      */
-    it("SubVibratorJsTest0001", FUNCTION|MEDIUMTEST|LEVEL0, async function (done) {
+    it("SubVibratorJsTest0001", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL0, async function (done) {
         console.info('----------------------SubVibratorJsTest0001---------------------------');
         vibrator.vibrate({
             mode: 'long',
@@ -82,7 +83,7 @@ describe("VibratorJsTest_misc_1", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0200
      */
-    it("SubVibratorJsTest0002", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("SubVibratorJsTest0002", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         console.info('----------------------SubVibratorJsTest0002---------------------------');
         vibrator.vibrate({
             mode: 'short',
@@ -105,7 +106,7 @@ describe("VibratorJsTest_misc_1", function () {
     * @tc.desc:Verification results of the incorrect parameters of the test interface.
     * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0210
     */
-    it("SubVibratorJsTest0003", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("SubVibratorJsTest0003", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         console.info('----------------------SubVibratorJsTest0003---------------------------');
         vibrator.vibrate({
             mode: 'short',
@@ -125,7 +126,7 @@ describe("VibratorJsTest_misc_1", function () {
     * @tc.desc:Verification results of the incorrect parameters of the test interface.
     * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0220
     */
-    it("SubVibratorJsTest0004", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("SubVibratorJsTest0004", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         console.info('----------------------SubVibratorJsTest0004---------------------------');
         vibrator.vibrate({
             mode: 'short',
@@ -141,7 +142,7 @@ describe("VibratorJsTest_misc_1", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0230
      */
-    it("SubVibratorJsTest0005", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("SubVibratorJsTest0005", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         console.info('----------------------SubVibratorJsTest0005---------------------------');
         vibrator.vibrate({
             success: function () {
@@ -160,7 +161,7 @@ describe("VibratorJsTest_misc_1", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0240
      */
-    it("SubVibratorJsTest0006", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("SubVibratorJsTest0006", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         console.info('----------------------SubVibratorJsTest0006---------------------------');
         vibrator.vibrate({
             mode: 'long',
@@ -181,7 +182,7 @@ describe("VibratorJsTest_misc_1", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0250
      */
-    it("SubVibratorJsTest0007", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("SubVibratorJsTest0007", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         console.info('----------------------SubVibratorJsTest0007---------------------------');
         try {
             vibrator.vibrate({
@@ -205,7 +206,7 @@ describe("VibratorJsTest_misc_1", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0260
      */
-    it("SubVibratorJsTest0008", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("SubVibratorJsTest0008", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         console.info('----------------------SubVibratorJsTest0008---------------------------');
         vibrator.vibrate({
             mode: 'short',
@@ -237,7 +238,7 @@ describe("VibratorJsTest_misc_1", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0270
      */
-    it("SubVibratorJsTest0009", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("SubVibratorJsTest0009", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         console.info('----------------------SubVibratorJsTest0009---------------------------');
         try {
             vibrator.vibrate();
@@ -254,7 +255,7 @@ describe("VibratorJsTest_misc_1", function () {
      * @tc.desc:Verification results of the incorrect parameters of the test interface.
      * @tc.number:SUB_SensorSystem_Vibrator_JsTest_0280
      */
-    it("SubVibratorJsTest0010", FUNCTION|MEDIUMTEST|LEVEL3, async function (done) {
+    it("SubVibratorJsTest0010", TestType.FUNCTION | Size.MEDIUMTEST | Level.LEVEL3, async function (done) {
         console.info('----------------------SubVibratorJsTest0010---------------------------');
         try {
             vibrator.vibrate({
@@ -275,4 +276,4 @@ describe("VibratorJsTest_misc_1", function () {
     })
 })
 	
-	
+	}
\ No newline at end of file

sensors/miscdevice_standard/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