From 2c69b14193683bdc55391ae09c6a2c234db255b9 Mon Sep 17 00:00:00 2001 From: jiangkai43 Date: Fri, 29 Jul 2022 15:52:49 +0800 Subject: [PATCH] Test cases of util adaptation to the new framework https://gitee.com/openharmony/xts_acts/issues/I5JM4Z Signed-off-by: jiangkai43 --- .../ets_utils/util_lib_standard/BUILD.gn | 4 +- .../ets_utils/util_lib_standard/Test.json | 7 +- .../util_lib_standard/src/main/config.json | 146 +++++++++++------- .../main/js/{default => MainAbility}/app.js | 0 .../{default => MainAbility}/i18n/en-US.json | 0 .../{default => MainAbility}/i18n/zh-CN.json | 0 .../pages/index/index.css | 0 .../pages/index/index.hml | 6 +- .../pages/index/index.js | 5 - .../src/main/js/TestAbility/app.js | 31 ++++ .../src/main/js/TestAbility/i18n/en-US.json | 8 + .../src/main/js/TestAbility/i18n/zh-CN.json | 8 + .../main/js/TestAbility/pages/index/index.css | 30 ++++ .../main/js/TestAbility/pages/index/index.hml | 5 + .../main/js/TestAbility/pages/index/index.js | 26 ++++ .../js/TestRunner/OpenHarmonyTestRunner.js | 59 +++++++ .../src/main/js/test/List.test.js | 6 +- .../src/main/js/test/util.test.js | 131 ++++++++-------- .../main/resources/base/element/string.json | 16 ++ 19 files changed, 351 insertions(+), 137 deletions(-) rename commonlibrary/ets_utils/util_lib_standard/src/main/js/{default => MainAbility}/app.js (100%) rename commonlibrary/ets_utils/util_lib_standard/src/main/js/{default => MainAbility}/i18n/en-US.json (100%) rename commonlibrary/ets_utils/util_lib_standard/src/main/js/{default => MainAbility}/i18n/zh-CN.json (100%) rename commonlibrary/ets_utils/util_lib_standard/src/main/js/{default => MainAbility}/pages/index/index.css (100%) rename commonlibrary/ets_utils/util_lib_standard/src/main/js/{default => MainAbility}/pages/index/index.hml (87%) rename commonlibrary/ets_utils/util_lib_standard/src/main/js/{default => MainAbility}/pages/index/index.js (84%) create mode 100644 commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/app.js create mode 100644 commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/i18n/en-US.json create mode 100644 commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json create mode 100644 commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/pages/index/index.css create mode 100644 commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/pages/index/index.hml create mode 100644 commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/pages/index/index.js create mode 100644 commonlibrary/ets_utils/util_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js diff --git a/commonlibrary/ets_utils/util_lib_standard/BUILD.gn b/commonlibrary/ets_utils/util_lib_standard/BUILD.gn index 1657feb59..5f77e4936 100644 --- a/commonlibrary/ets_utils/util_lib_standard/BUILD.gn +++ b/commonlibrary/ets_utils/util_lib_standard/BUILD.gn @@ -31,7 +31,9 @@ ohos_js_hap_suite("util_js_test") { # subsystem_name = "xts" } ohos_js_assets("util_js_assets") { - source_dir = "./src/main/js/default" + js2abc = true + hap_profile = "./src/main/config.json" + source_dir = "./src/main/js" } ohos_resources("util_resources") { sources = [ "./src/main/resources" ] diff --git a/commonlibrary/ets_utils/util_lib_standard/Test.json b/commonlibrary/ets_utils/util_lib_standard/Test.json index f84f77834..91dd38bd2 100644 --- a/commonlibrary/ets_utils/util_lib_standard/Test.json +++ b/commonlibrary/ets_utils/util_lib_standard/Test.json @@ -1,10 +1,11 @@ { "description": "Configuration for startup util js api Tests", "driver": { - "type": "JSUnitTest", + "type": "OHJSUnitTest", "test-timeout": "800000", - "package": "com.example.util", - "shell-timeout": "90000" + "shell-timeout": "800000", + "bundle-name": "com.example.util", + "package-name": "com.example.util" }, "kits": [ { diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/config.json b/commonlibrary/ets_utils/util_lib_standard/src/main/config.json index f87d8ee4a..6b006d2f5 100644 --- a/commonlibrary/ets_utils/util_lib_standard/src/main/config.json +++ b/commonlibrary/ets_utils/util_lib_standard/src/main/config.json @@ -1,62 +1,94 @@ { - "app": { - "bundleName": "com.example.util", - "vendor": "example", - "version": { - "code": 1000000, - "name": "1.0.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.util", - "name": ".MyApplication", - "mainAbility": "com.example.util.MainAbility", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false + "app": { + "bundleName": "com.example.util", + "vendor": "example", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5 + } }, - "abilities": [ - { - "skills": [ + "deviceConfig": {}, + "module": { + "package": "com.example.util", + "name": ".entry", + "srcPath": "", + "mainAbility": ".MainAbility", + "deviceType": [ + "phone" + ], + "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": [ { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": true + } + }, + { + "pages": [ + "pages/index/index" + ], + "name": ".TestAbility", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } } - ], - "visible": true, - "name": "com.example.util.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true + ], + "testRunner": { + "name": "OpenHarmonyTestRunner", + "srcPath": "TestRunner" } - } - ] - } -} \ No newline at end of file + } +} \ No newline at end of file diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/default/app.js b/commonlibrary/ets_utils/util_lib_standard/src/main/js/MainAbility/app.js similarity index 100% rename from commonlibrary/ets_utils/util_lib_standard/src/main/js/default/app.js rename to commonlibrary/ets_utils/util_lib_standard/src/main/js/MainAbility/app.js diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/default/i18n/en-US.json b/commonlibrary/ets_utils/util_lib_standard/src/main/js/MainAbility/i18n/en-US.json similarity index 100% rename from commonlibrary/ets_utils/util_lib_standard/src/main/js/default/i18n/en-US.json rename to commonlibrary/ets_utils/util_lib_standard/src/main/js/MainAbility/i18n/en-US.json diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/default/i18n/zh-CN.json b/commonlibrary/ets_utils/util_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json similarity index 100% rename from commonlibrary/ets_utils/util_lib_standard/src/main/js/default/i18n/zh-CN.json rename to commonlibrary/ets_utils/util_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/default/pages/index/index.css b/commonlibrary/ets_utils/util_lib_standard/src/main/js/MainAbility/pages/index/index.css similarity index 100% rename from commonlibrary/ets_utils/util_lib_standard/src/main/js/default/pages/index/index.css rename to commonlibrary/ets_utils/util_lib_standard/src/main/js/MainAbility/pages/index/index.css diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/default/pages/index/index.hml b/commonlibrary/ets_utils/util_lib_standard/src/main/js/MainAbility/pages/index/index.hml similarity index 87% rename from commonlibrary/ets_utils/util_lib_standard/src/main/js/default/pages/index/index.hml rename to commonlibrary/ets_utils/util_lib_standard/src/main/js/MainAbility/pages/index/index.hml index 81d7b7d18..a2614561b 100644 --- a/commonlibrary/ets_utils/util_lib_standard/src/main/js/default/pages/index/index.hml +++ b/commonlibrary/ets_utils/util_lib_standard/src/main/js/MainAbility/pages/index/index.hml @@ -13,8 +13,8 @@ limitations under the License. --> -
+
- {{ $t('strings.hello') }} {{title}} + {{ $t('strings.hello') }} {{ title }} -
\ No newline at end of file +
diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/default/pages/index/index.js b/commonlibrary/ets_utils/util_lib_standard/src/main/js/MainAbility/pages/index/index.js similarity index 84% rename from commonlibrary/ets_utils/util_lib_standard/src/main/js/default/pages/index/index.js rename to commonlibrary/ets_utils/util_lib_standard/src/main/js/MainAbility/pages/index/index.js index e104eaf7a..5b51de777 100644 --- a/commonlibrary/ets_utils/util_lib_standard/src/main/js/default/pages/index/index.js +++ b/commonlibrary/ets_utils/util_lib_standard/src/main/js/MainAbility/pages/index/index.js @@ -16,7 +16,6 @@ import app from '@system.app' import device from '@system.device' import router from '@system.router' -import {Core} from 'deccjsunit/index' export default { data: { @@ -27,10 +26,6 @@ export default { }, onShow() { console.info('onShow finish') - const core = Core.getInstance() - core.init() - require('../../../test/List.test') - core.execute() }, onReady() { }, diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/app.js b/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/app.js new file mode 100644 index 000000000..d5ee271df --- /dev/null +++ b/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/app.js @@ -0,0 +1,31 @@ +/* + * 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"); + } +}; diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/i18n/en-US.json b/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/i18n/en-US.json new file mode 100644 index 000000000..55561b837 --- /dev/null +++ b/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/i18n/en-US.json @@ -0,0 +1,8 @@ +{ + "strings": { + "hello": "Hello", + "world": "World" + }, + "Files": { + } +} \ No newline at end of file diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json b/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json new file mode 100644 index 000000000..cce1af067 --- /dev/null +++ b/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json @@ -0,0 +1,8 @@ +{ + "strings": { + "hello": "您好", + "world": "世界" + }, + "Files": { + } +} \ No newline at end of file diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/pages/index/index.css b/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/pages/index/index.css new file mode 100644 index 000000000..b21c92c62 --- /dev/null +++ b/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/pages/index/index.css @@ -0,0 +1,30 @@ +.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 diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/pages/index/index.hml b/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/pages/index/index.hml new file mode 100644 index 000000000..f64b040a5 --- /dev/null +++ b/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/pages/index/index.hml @@ -0,0 +1,5 @@ +
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/pages/index/index.js b/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/pages/index/index.js new file mode 100644 index 000000000..d94b75c08 --- /dev/null +++ b/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestAbility/pages/index/index.js @@ -0,0 +1,26 @@ +/* + * 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'); + } +} + + + diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js new file mode 100644 index 000000000..b9e78ce7c --- /dev/null +++ b/commonlibrary/ets_utils/util_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js @@ -0,0 +1,59 @@ +/* + * 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); + }) + } +}; diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/test/List.test.js b/commonlibrary/ets_utils/util_lib_standard/src/main/js/test/List.test.js index f7b342457..2155d70e1 100644 --- a/commonlibrary/ets_utils/util_lib_standard/src/main/js/test/List.test.js +++ b/commonlibrary/ets_utils/util_lib_standard/src/main/js/test/List.test.js @@ -12,5 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -require('./util.test.js'); \ No newline at end of file +import UtilFunTest from './util.test.js' +export default function testsuite() { + UtilFunTest() +} \ No newline at end of file diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/js/test/util.test.js b/commonlibrary/ets_utils/util_lib_standard/src/main/js/test/util.test.js index e0a1692be..c6c7c7dcf 100644 --- a/commonlibrary/ets_utils/util_lib_standard/src/main/js/test/util.test.js +++ b/commonlibrary/ets_utils/util_lib_standard/src/main/js/test/util.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 util from '@ohos.util' import url from '@ohos.url' import app from '@system.app' @@ -45,7 +45,7 @@ var rangeFir = new util.Scope(tempMiDF, tempMidS); var rangeSec = new util.Scope(tempLess, tempMore); var rangeThi = new util.Scope(tempLess, tempMiDF); var rangeFif = new util.Scope(tempMiDF, tempMore); - +export default function UtilFunTest() { describe('TextEncoderTest', function () { /** @@ -175,17 +175,17 @@ describe('TextEncoderTest', function () { * @tc.author: shikai */ it('testUtilPromisify_new_001', 0, async function () { - function aysnFun(str, callback) { - if (typeof str === 'string') { - callback(null, str); + function fn(val, callback) { + if (typeof val === 'string') { + callback(null, val); } else { callback('type err'); } } - let newPromiseObj = util.promisify(aysnFun); - newPromiseObj("Hello").then(res => { - expect(res).strictEqual('Hello'); - }) + (async () => { + const value = await util.promisify(fn); + expect(value(null, "Hello")).strictEqual('Hello'); + })(); }) /** @@ -195,17 +195,17 @@ describe('TextEncoderTest', function () { * @tc.author: shikai */ it('testUtilPromisify_new_002', 0, async function () { - function aysnFun(str, callback) { + function fn(str, callback) { if (typeof str === 'string') { callback(null, str); } else { callback('type err'); } } - let newPromiseObj = util.promisify(aysnFun); - newPromiseObj([1, 2]).catch(err => { - expect(err).strictEqual('type err'); - }) + (async () => { + const value = await util.promisify(fn); + expect(value(null, [1, 2])).strictEqual('type err'); + })(); }) /** @@ -231,17 +231,17 @@ describe('TextEncoderTest', function () { * @tc.author: shikai */ it('testUtilPromisify_new_004', 0, async function () { - function aysnFun(str1, str2, callback) { - if (typeof str1 === 'string' && typeof str1 === 'string') { - callback(null, str1 + str2); + function fn(val, callback) { + if (typeof val === 'boolen') { + callback(null, val); } else { callback('type err'); } } - let newPromiseObj = util.promisify(aysnFun); - newPromiseObj("Hello", 'World').then(res => { - expect(res).strictEqual('HelloWorld'); - }) + (async () => { + const value = await util.promisify(fn); + expect(value(null, true)).strictEqual(true); + })(); }) /** @@ -251,19 +251,19 @@ describe('TextEncoderTest', function () { * @tc.author: shikai */ it('testUtilPromisify_new_005', 0, async function () { - function aysnFun(str1, str2, callback) { - if (typeof str1 === 'string' && typeof str1 === 'string') { - callback(null, str1 + str2); + function fn(val, callback) { + if (typeof val === 'number') { + callback(null, val); } else { callback('type err'); } } - let newPromiseObj = util.promisify(aysnFun); - newPromiseObj([1, 2], 'World').catch(err => { - expect(err).strictEqual('type err'); - }) + (async () => { + const value = await util.promisify(fn); + expect(value(null, 100)).strictEqual(100); + })(); }) - + /** * @tc.name: testUtilPromiseWrapper001 * @tc.desc: Takes a function following the common error-first callback style, @@ -311,18 +311,6 @@ describe('TextEncoderTest', function () { * @tc.author: shikai */ it('testUtilPromiseWrapper003', 0, async function () { - const a = util.promiseWrapper(function() {}); - const b = util.promiseWrapper(a); - expect(a).strictEqual(b); - }) - - /** - * @tc.name: testUtilPromiseWrapper004 - * @tc.desc: Takes a function following the common error-first callback style, - taking an callback as the last argument, and return a version that returns promises. - * @tc.author: shikai - */ - it('testUtilPromiseWrapper004', 0, async function () { let errToThrow; const thrower = util.promiseWrapper(function(a, b, c, cb) { errToThrow = new Error(); @@ -334,12 +322,12 @@ describe('TextEncoderTest', function () { }) /** - * @tc.name: testUtilPromiseWrapper005 + * @tc.name: testUtilPromiseWrapper004 * @tc.desc: Takes a function following the common error-first callback style, taking an callback as the last argument, and return a version that returns promises. * @tc.author: shikai */ - it('testUtilPromiseWrapper005', 0, async function () { + it('testUtilPromiseWrapper004', 0, async function () { const err = new Error(); const a = util.promiseWrapper((cb) => cb(err))(); const b = util.promiseWrapper(() => {throw err;})(); @@ -354,12 +342,12 @@ describe('TextEncoderTest', function () { }) /** - * @tc.name: testUtilPromiseWrapper006 + * @tc.name: testUtilPromiseWrapper005 * @tc.desc: Takes a function following the common error-first callback style, taking an callback as the last argument, and return a version that returns promises. * @tc.author: shikai */ - it('testUtilPromiseWrapper006', 0, async function () { + it('testUtilPromiseWrapper005', 0, async function () { const err = new Error('callback with the error.'); const stack = err.stack; const fn = util.promiseWrapper(function(cb) { @@ -374,12 +362,12 @@ describe('TextEncoderTest', function () { }) /** - * @tc.name: testUtilPromiseWrapper007 + * @tc.name: testUtilPromiseWrapper006 * @tc.desc: Takes a function following the common error-first callback style, taking an callback as the last argument, and return a version that returns promises. * @tc.author: shikai */ - it('testUtilPromiseWrapper007', 0, async function () { + it('testUtilPromiseWrapper006', 0, async function () { function fn(err, val, callback) { callback(err, val); } @@ -400,7 +388,7 @@ describe('TextEncoderTest', function () { try { util.callbackWrapper(promiseFn); } catch(e) { - expect(e.message).strictEqual('original is not function'); + expect(e.message).assertEqual('original is not function'); } }) @@ -415,10 +403,12 @@ describe('TextEncoderTest', function () { return Promise.resolve('value'); } var cb = util.callbackWrapper(promiseFn); - cb((err, ret) => { - expect(err).strictEqual(null); - expect(ret).strictEqual('value'); - }) + (async () => { + cb((err, ret) => { + expect(err).assertEqual(null); + expect(ret).assertEqual('value'); + }) + })(); }) /** @@ -432,10 +422,12 @@ describe('TextEncoderTest', function () { return 42; } var cb = util.callbackWrapper(promiseFn); - cb((err, ret) => { - expect(err).strictEqual(null); - expect(ret).strictEqual(42); - }) + (async () => { + cb((err, ret) => { + expect(err).assertEqual(null); + expect(ret).assertEqual(42); + }) + })(); }) /** @@ -450,10 +442,12 @@ describe('TextEncoderTest', function () { return Promise.reject(err); } var cb = util.callbackWrapper(promiseFn); - cb((err, ret) => { - expect(err.message).strictEqual('value'); - expect(ret).strictEqual(undefined); - }) + (async () => { + cb((err, ret) => { + expect(err.message).strictEqual('value'); + expect(ret).assertEqual(undefined); + }) + })(); }) /** @@ -467,10 +461,12 @@ describe('TextEncoderTest', function () { return a + b; } var cb = util.callbackWrapper(promiseFn); - cb(1, 2, (err, ret) => { - expect(err).strictEqual(null); - expect(ret).strictEqual(3); - }) + (async () => { + cb(1, 2, (err, ret) => { + expect(err).assertEqual(null); + expect(ret).assertEqual(3); + }) + })(); }) /** @@ -485,9 +481,11 @@ describe('TextEncoderTest', function () { } var cb = util.callbackWrapper(promiseFn); try { - cb([1, 2]) + (async () => { + cb([1, 2]) + })(); } catch(err) { - expect(err.message).strictEqual('maybe is not function'); + expect(err.message).assertEqual('maybe is not function'); } }) @@ -7009,3 +7007,4 @@ describe('TypesTest', function() { expect(result).assertEqual(false); }) }) +} diff --git a/commonlibrary/ets_utils/util_lib_standard/src/main/resources/base/element/string.json b/commonlibrary/ets_utils/util_lib_standard/src/main/resources/base/element/string.json index 0bae6bd40..d6ab4eb2a 100644 --- a/commonlibrary/ets_utils/util_lib_standard/src/main/resources/base/element/string.json +++ b/commonlibrary/ets_utils/util_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 -- GitLab