From e289caf6b4ac409ba85a5481937eeeb1e1016bb5 Mon Sep 17 00:00:00 2001 From: panzhenyu1 Date: Sat, 7 May 2022 15:44:32 +0800 Subject: [PATCH] fixed cfa5464 from https://gitee.com/panzhenyu1/xts_acts/pulls/3127 Delete intl xts testcase under compileruntime related issue: https://gitee.com/openharmony/xts_acts/issues/I569LN Signed-off-by: panzhenyu1 Change-Id: Id7e29d58f73e42d2a7d782817b6344c80d87d5eb --- compileruntime/BUILD.gn | 1 - .../ark_intl_standard/intljs/BUILD.gn | 31 -- .../ark_intl_standard/intljs/Test.json | 30 -- .../intljs/signature/openharmony_sx.p7b | Bin 3437 -> 0 bytes .../intljs/src/main/config.json | 60 --- .../intljs/src/main/js/default/app.js | 22 -- .../src/main/js/default/i18n/en-US.json | 8 - .../src/main/js/default/i18n/zh-CN.json | 8 - .../src/main/js/default/pages/index/index.css | 9 - .../src/main/js/default/pages/index/index.hml | 5 - .../src/main/js/default/pages/index/index.js | 43 --- .../src/main/js/default/test/List.test.js | 18 - .../main/js/default/test/intlCollator_test.js | 74 ---- .../default/test/intlDateTimeFormat_test.js | 354 ------------------ .../main/js/default/test/intlLocale_test.js | 31 -- .../main/js/default/test/numberFormat_test.js | 106 ------ .../main/resources/base/element/string.json | 12 - .../src/main/resources/base/media/icon.png | Bin 6790 -> 0 bytes 18 files changed, 812 deletions(-) delete mode 100644 compileruntime/ark_intl_standard/intljs/BUILD.gn delete mode 100644 compileruntime/ark_intl_standard/intljs/Test.json delete mode 100644 compileruntime/ark_intl_standard/intljs/signature/openharmony_sx.p7b delete mode 100644 compileruntime/ark_intl_standard/intljs/src/main/config.json delete mode 100644 compileruntime/ark_intl_standard/intljs/src/main/js/default/app.js delete mode 100644 compileruntime/ark_intl_standard/intljs/src/main/js/default/i18n/en-US.json delete mode 100644 compileruntime/ark_intl_standard/intljs/src/main/js/default/i18n/zh-CN.json delete mode 100644 compileruntime/ark_intl_standard/intljs/src/main/js/default/pages/index/index.css delete mode 100644 compileruntime/ark_intl_standard/intljs/src/main/js/default/pages/index/index.hml delete mode 100644 compileruntime/ark_intl_standard/intljs/src/main/js/default/pages/index/index.js delete mode 100644 compileruntime/ark_intl_standard/intljs/src/main/js/default/test/List.test.js delete mode 100644 compileruntime/ark_intl_standard/intljs/src/main/js/default/test/intlCollator_test.js delete mode 100644 compileruntime/ark_intl_standard/intljs/src/main/js/default/test/intlDateTimeFormat_test.js delete mode 100644 compileruntime/ark_intl_standard/intljs/src/main/js/default/test/intlLocale_test.js delete mode 100644 compileruntime/ark_intl_standard/intljs/src/main/js/default/test/numberFormat_test.js delete mode 100644 compileruntime/ark_intl_standard/intljs/src/main/resources/base/element/string.json delete mode 100644 compileruntime/ark_intl_standard/intljs/src/main/resources/base/media/icon.png diff --git a/compileruntime/BUILD.gn b/compileruntime/BUILD.gn index 91b8dcf27..94653556e 100644 --- a/compileruntime/BUILD.gn +++ b/compileruntime/BUILD.gn @@ -16,7 +16,6 @@ group("compileruntime") { testonly = true if (is_standard_system) { deps = [ - "ark_intl_standard/intljs:intljs_test", "containerLine_lib_standard:containerLine_js_test", "containerRelation_lib_standard:containerRelation_js_test", "convertxml_lib_standard:convertxml_js_test", diff --git a/compileruntime/ark_intl_standard/intljs/BUILD.gn b/compileruntime/ark_intl_standard/intljs/BUILD.gn deleted file mode 100644 index ce9fa83f3..000000000 --- a/compileruntime/ark_intl_standard/intljs/BUILD.gn +++ /dev/null @@ -1,31 +0,0 @@ -# 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("//test/xts/tools/build/suite.gni") - -ohos_js_hap_suite("intljs_test") { - hap_profile = "./src/main/config.json" - deps = [ - ":intljs_assets", - ":intljs_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsIntlJsApiTest" -} -ohos_js_assets("intljs_assets") { - source_dir = "./src/main/js/default" -} -ohos_resources("intljs_resources") { - sources = [ "./src/main/resources" ] - hap_profile = "./src/main/config.json" -} diff --git a/compileruntime/ark_intl_standard/intljs/Test.json b/compileruntime/ark_intl_standard/intljs/Test.json deleted file mode 100644 index 5ba0ad721..000000000 --- a/compileruntime/ark_intl_standard/intljs/Test.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "description": "Configuration for intljs Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "300000", - "package": "ohos.intl.test", - "shell-timeout": "60000" - }, - "kits": [ - { - "test-file-name": [ - "ActsIntlJsApiTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - }, - { - "type": "PushKit", - "push": [ - "resource/global/white_languages.xml->/system/usr/ohos_locale_config/white_languages.xml" - ] - }, - { - "type": "ShellKit", - "run-command": [ - "chmod 644 /system/usr/ohos_locale_config/white_languages.xml" - ] - } - ] -} diff --git a/compileruntime/ark_intl_standard/intljs/signature/openharmony_sx.p7b b/compileruntime/ark_intl_standard/intljs/signature/openharmony_sx.p7b deleted file mode 100644 index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3437 zcmcgvX>b$g8MY4FF(5FQyMT=#m||qU)nQ9cId-MBB-<-lvSdq&snM}IENNF>t+bK| zgowuF2vC|SxSZxNN5eHhV%(WPpbeB9Fc3;JDMtzMBv1-XAc2N~c2_tCXW&OCGw6qQ z-s9VS-tT?h=bI0tMS+~WDXqHJyCPmLzdbE-fV8Nd&*MRZfG8(#POFZG3xs@Lb{0ry z=R8j3wWo!5g=yjKx#BoZMFS)uA)H}cTp@-^K`9VV?RC3J59@}eik*>n|pRKOLZ zxdn7G!Yv@9O#y<&eUy{)vMXb;fQR)ffVAADQsEMXm;IBMDLfLD0w^U;6%HVo-0Q_5 zCHEa?DBuauNpZzoF+tK27w#n~?u%toS-DhR4k@Q*{7x^8Q=D6&kd^_~J#VVG2LXkL zaAy=}U*?Jto)9hx5MGjdp9hcQAu@tfk_;l!PeyxPY<8b&+&D!CyaBh9=8BSVKLpk4 z4Ml3yY|&Th)vyK4cpC{!uU8v2YBlVV`d~(nz&<@{G1oe*DHub1z7~J5*;s2bX<)_* zV_GbsPQg`(&rpxRb_*Od7}++3+liSw-$!1 zs5*g}EHWhI3i|!-FcfzYL0`SL-rq>LENC;PMl)G(0(1U2%Va|smp0UFx0xd@soZA* zD5LYc4OlbE7@ARt#h}rr3>K@bf%B#^-c+xz8Hr)0D5ExIFltezN@Hn8>o5d~bSfYtkc+_Z&kI#-N5_GhCg*V-^TSO=!G~ z(fXy{n2XV+k}6w_W`dTOP2a4u0ly;ANZ>4OxSKAzFB!yBzdo`gX zO?o|H@WiAw$y6l?=^3jA_Hy0S)nTYs12;4hKE&ekQ|>?|ZLJ}#F`2BczC7kdE4@xV zZBD_)Otwjhz+NSaz?d45!;FsGSu-#qh#hStD%B}f!mCT!KqzSo>I`NGH_9Dea$1Qi zg29Ydt!~lQVR99_T7#Hije~(12drl-P)SV?QR*9sus`8th-8^OQ7@xI$(Yp|^;bL1 zR50O$mDXw6P>i7B(TJ)ciPzTE>XY%X6HAa)b#OBRXv&~%Bw|J#Y><i4=e%95bjtw|cJp=#P#Pf#*luqI_wR;fISDCJhAqSG6R%xItn%~QtZ@m%&u zjGGLX;t6Ls62eQvNmf@v+}J%54^CygxRZ`?8X#r|wkev7(s;Ou4T#y1XNNf)h;o7z z8a^Lfq<1uH`E{G9E z*(=)Css_LSk=>E9jr)s5^2-!+MN=Ds}>1hRma4`uCIz9%p3O77839E{xf z4c_I?**|1`K2tg4!Hvyrou4BsJQuv*UfF)<%CelYIS>D^o?X)3+MK%la6kooW8&G@BU)Y0hT`+mOm$Z_%rB=a%o>I z!2c6lHyKQN)VjiFwa!eE^p8jc$sy$vB+8i25lI~6KPFFh$!o$avA~rj#L6xvR|Z83 z*WD6T9e+5Pyy=F+)pNTf{ny3cy>7Rkd3o*TS?TZJ`NS^NF2%HMkyS{?uJ$`!P4_L^ z1`NFDUbNyg_qREifgktnp1_v{Jbb`7m}2PTyUdOmtJj~m z9bB=ecw4_^rw1IW=of+>nrW5=d3k`3qHCxsIN_F{T1A545};;+fsyC&qChi+YV zr~M63H8ZLCPYmsjY>ls9cL%I)F|JIW-#+48$+lD4k*(P*kDM%zx_fvu4u5ZYUnI}5 zdrycFq>xFU)&X3p@pP2u%$o}}YcRn(MhJ&B2o?KS@cIVz>Ye%o^xV?CB{_Qhu z;}_q1bvO^g{8<3!gYbo4Di{8qzV+(9 zdlmksohQmRTs@qB;(Wo?dER_ux6XQb@q$tQPW?CMu6GVQd;R=iR;-S{Kr%Zks7>b1 zNs{|-+jhObYE}NR&`TGGr^h^4bjh%c>R#@=8nM&Md>_a+zVulsl;){flFekV1t9ob z+SqfV_Pv3$2f)bQ8%Ul2>fdYR^1zs0BQF~olsOj5AodC&Q_7SMFzsz2 z9newxE&jodk~tNHwl%LBMMDbrk=(^b diff --git a/compileruntime/ark_intl_standard/intljs/src/main/config.json b/compileruntime/ark_intl_standard/intljs/src/main/config.json deleted file mode 100644 index bc4f2d4a0..000000000 --- a/compileruntime/ark_intl_standard/intljs/src/main/config.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "app": { - "bundleName": "ohos.intl.test", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "package": "ohos.intl.test", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "visible": true, - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "name": "ohos.intl.test.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "MyApplication", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } -} diff --git a/compileruntime/ark_intl_standard/intljs/src/main/js/default/app.js b/compileruntime/ark_intl_standard/intljs/src/main/js/default/app.js deleted file mode 100644 index 044bffa75..000000000 --- a/compileruntime/ark_intl_standard/intljs/src/main/js/default/app.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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. - */ -export default { - onCreate() { - console.info('TestApplication onCreate'); - }, - onDestroy() { - console.info('TestApplication onDestroy'); - } -}; diff --git a/compileruntime/ark_intl_standard/intljs/src/main/js/default/i18n/en-US.json b/compileruntime/ark_intl_standard/intljs/src/main/js/default/i18n/en-US.json deleted file mode 100644 index 55561b837..000000000 --- a/compileruntime/ark_intl_standard/intljs/src/main/js/default/i18n/en-US.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - }, - "Files": { - } -} \ No newline at end of file diff --git a/compileruntime/ark_intl_standard/intljs/src/main/js/default/i18n/zh-CN.json b/compileruntime/ark_intl_standard/intljs/src/main/js/default/i18n/zh-CN.json deleted file mode 100644 index cce1af067..000000000 --- a/compileruntime/ark_intl_standard/intljs/src/main/js/default/i18n/zh-CN.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - }, - "Files": { - } -} \ No newline at end of file diff --git a/compileruntime/ark_intl_standard/intljs/src/main/js/default/pages/index/index.css b/compileruntime/ark_intl_standard/intljs/src/main/js/default/pages/index/index.css deleted file mode 100644 index 6fda79275..000000000 --- a/compileruntime/ark_intl_standard/intljs/src/main/js/default/pages/index/index.css +++ /dev/null @@ -1,9 +0,0 @@ -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 100px; -} diff --git a/compileruntime/ark_intl_standard/intljs/src/main/js/default/pages/index/index.hml b/compileruntime/ark_intl_standard/intljs/src/main/js/default/pages/index/index.hml deleted file mode 100644 index f64b040a5..000000000 --- a/compileruntime/ark_intl_standard/intljs/src/main/js/default/pages/index/index.hml +++ /dev/null @@ -1,5 +0,0 @@ -
- - {{ $t('strings.hello') }} {{ title }} - -
diff --git a/compileruntime/ark_intl_standard/intljs/src/main/js/default/pages/index/index.js b/compileruntime/ark_intl_standard/intljs/src/main/js/default/pages/index/index.js deleted file mode 100644 index 30456d5b7..000000000 --- a/compileruntime/ark_intl_standard/intljs/src/main/js/default/pages/index/index.js +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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 {Core, ExpectExtend} from 'deccjsunit/index' - -export default { - data: { - 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') - configService.setConfig(this) - - require('../../test/List.test') - core.execute() - - }, - onReady() { - }, -} \ No newline at end of file diff --git a/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/List.test.js b/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/List.test.js deleted file mode 100644 index 70efc8295..000000000 --- a/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/List.test.js +++ /dev/null @@ -1,18 +0,0 @@ -/* - * 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. - */ -require('./intlLocale_test.js') -require('./intlCollator_test.js') -require('./intlDateTimeFormat_test.js') -require('./numberFormat_test.js') diff --git a/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/intlCollator_test.js b/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/intlCollator_test.js deleted file mode 100644 index 7e7ff77e9..000000000 --- a/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/intlCollator_test.js +++ /dev/null @@ -1,74 +0,0 @@ -/* - * 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 Intl from '@ohos.intl'; -import {describe,beforeAll,beforeEach,afterEach,afterAll,it,expect}from 'deccjsunit/index' -describe('intlDateTimeFormatTest', function () { - console.log("*******test start*******") - - /* * - * @tc.number ARK_INTL_JS_DATETIME_004 - * @tc.name the locale in de - * @tc.desc check the sort in de - */ - it('collator_info_test_004', 0, function () { - var collator1= new Intl.Collator('de').compare('ä', 'z'); - console.log(collator1); - expect(collator1).assertEqual(-1); - - var collator2= new Intl.Collator('sv').compare('ä', 'z'); - console.log(collator2); - expect(collator2).assertEqual(1); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_005 - * @tc.name the locale in de and sv - * @tc.desc check the sort in de and sv - */ - it('collator_info_test_005', 0, function () { - var collator1= new Intl.Collator('de',{sensitivity:'base'}).compare('ä', 'a'); - console.log(collator1); - - var collator2= new Intl.Collator('sv',{sensitivity:'base'}).compare('ä', 'a'); - console.log(collator2); - expect(collator1).assertEqual(0); - expect(collator2).assertEqual(1); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_006 - * @tc.name the locale in zh-Hans - * @tc.desc check the resolvedOptions of collator - */ - it('collator_info_test_006', 0, function () { - var collator = new Intl.Collator("zh-Hans",{sensitivity:'base',caseFirst:'upper',ignorePunctuation:'true'}); - var options = collator.resolvedOptions(); - console.log("collator_info_test_006:",options.caseFirst); - expect(options.caseFirst).assertEqual('upper'); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_007 - * @tc.name the locale in zh-Hans - * @tc.desc check the resolvedOptions of collator - */ - it('collator_info_test_007', 0, function () { - var collator = new Intl.Collator("zh-Hans",{sensitivity:'base',caseFirst:'upper',ignorePunctuation:'true'}); - var options = collator.resolvedOptions(); - console.log("collator_info_test_007:",options.sensitivity); - expect(options.sensitivity).assertEqual('base'); - }) - -}) diff --git a/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/intlDateTimeFormat_test.js b/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/intlDateTimeFormat_test.js deleted file mode 100644 index 73271ce9d..000000000 --- a/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/intlDateTimeFormat_test.js +++ /dev/null @@ -1,354 +0,0 @@ -/* - * 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 Intl from '@ohos.intl'; -import {describe,beforeAll,beforeEach,afterEach,afterAll,it,expect}from 'deccjsunit/index' -describe('intlDateTimeFormatTest_1', function () { - console.log('******test start******') - - /* * - * @tc.number ARK_INTL_JS_DATETIME_001 - * @tc.name format the datetime with en-GB locale - * @tc.desc check the datetime is not null - */ - it('dateTimeFormat_test_001', 0, function () { - let datefmt = new Intl.DateTimeFormat('en-GB'); - expect(datefmt !== null).assertTrue(); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_002 - * @tc.name format the datetime with en-GB locale - * @tc.desc check the datetime is not null - */ - it('dateTimeFormat_test_002', 0, function () { - let datefmt = new Intl.DateTimeFormat(); - expect(datefmt !== null).assertTrue(); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_003 - * @tc.name format the date with zh locale - * @tc.desc check the date - */ - it('dateTimeFormat_test_003', 0, function () { - let date = new Date(2021, 11, 17, 3, 24, 0); - let datefmt = new Intl.DateTimeFormat('zh'); - console.log('dateTimeFormat_test_003 ' + datefmt.format(date)); - expect(datefmt.format(date)).assertEqual('2021/12/17'); - }) - -}) - -describe('intlDateTimeFormatTest_2', function () { - console.log('******test start******') - - /* * - * @tc.number ARK_INTL_JS_DATETIME_005 - * @tc.name format the date with da locale - * @tc.desc check the date - */ - it('dateTimeFormat_test_005', 0, function () { - let date = new Date(2021, 11, 17, 3, 24, 0); - let datefmt = new Intl.DateTimeFormat('da'); - console.log('dateTimeFormat_test_005 ' + datefmt.format(date)); - expect(datefmt.format(date)).assertEqual('17.12.2021'); -}) - -/* * - * @tc.number ARK_INTL_JS_DATETIME_006 - * @tc.name format the date with en-GB locale - * @tc.desc check the date - */ -it('dateTimeFormat_test_006', 0, function () { - let date = new Date(2021, 11, 17, 3, 24, 0); - let datefmt = new Intl.DateTimeFormat('en-GB'); - console.log('dateTimeFormat_test_006 ' + datefmt.format(date)); - expect(datefmt.format(date)).assertEqual('17/12/2021'); -}) -}) - -describe('intlDateTimeFormatTest_3', function () { - console.log('******test start******') - - /* * - * @tc.number ARK_INTL_JS_DATETIME_007 - * @tc.name format the date with aa locale - * @tc.desc check the date - */ - it('dateTimeFormat_test_007', 0, function () { - let date = new Date(2021, 11, 17, 3, 24, 0); - let datefmt = new Intl.DateTimeFormat('aa'); - let value = datefmt.format(date); - console.log('dateTimeFormat_test_007 ' + value); - expect(value).assertInstanceOf('String'); -}) - -/* * - * @tc.number ARK_INTL_JS_DATETIME_008 - * @tc.name format the hour with ban and zh locale - * @tc.desc check the hour with ban and zh locale - */ -it('dateTimeFormat_test_008', 0, function () { - let date = new Date(2020, 11, 20, 14, 23, 16); - let option = { dateStyle: 'full' }; - let datefmt = new Intl.DateTimeFormat(['ban', 'zh'],option); - console.log('dateTimeFormat_test_008 ' + datefmt.format(date)); - expect(datefmt.format(date)).assertEqual('2020年12月20日星期日'); -}) - -/* * - * @tc.number ARK_INTL_JS_DATETIME_009 - * @tc.name format the hour with en and zh locale - * @tc.desc check the hour with en and zh locale - */ -it('dateTimeFormat_test_009', 0, function () { - let date = new Date(2020, 11, 20, 14, 23, 16); - let option = { dateStyle: 'full' }; - let datefmt = new Intl.DateTimeFormat(['en', 'zh'], option); - console.log('dateTimeFormat_test_009 ' + datefmt.format(date)); - expect(datefmt.format(date)).assertEqual('Sunday, December 20, 2020'); -}) -}) - -describe('intlDateTimeFormatTest_4', function () { - console.log('******test start******') - -/* * - * @tc.number ARK_INTL_JS_DATETIME_010 - * @tc.name format the hour with en and ban locale - * @tc.desc check the hour with en and ban locale - */ -it('dateTimeFormat_test_010', 0, function () { - let date = new Date(2020, 11, 20, 14, 23, 16); - let option = { dateStyle: 'full' }; - let datefmt = new Intl.DateTimeFormat(['en', 'ban'], option); - console.log('dateTimeFormat_test_010 ' + datefmt.format(date)); - expect(datefmt.format(date)).assertEqual('Sunday, December 20, 2020'); -}) - -/* * - * @tc.number ARK_INTL_JS_DATETIME_013 - * @tc.name format the date dateStyle with long style - * @tc.desc check the dateStyle with long style - */ -it('dateTimeFormat_test_013', 0, function () { - let date = new Date(2020, 11, 20, 14, 23, 16); - let option = { dateStyle: 'long', timeStyle: 'long' }; - let datefmt = new Intl.DateTimeFormat('zh-CN', option); - console.log('dateTimeFormat_test_013 ' + datefmt.resolvedOptions().dateStyle); - expect(datefmt.resolvedOptions().dateStyle).assertEqual('long'); -}) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_014 - * @tc.name format the date dateStyle with medium style - * @tc.desc check the dateStyle with medium style - */ - it('dateTimeFormat_test_014', 0, function () { - let date = new Date(2020, 11, 20, 14, 23, 16); - let option = { dateStyle: 'medium', timeStyle: 'medium' }; - let datefmt = new Intl.DateTimeFormat('zh-CN', option); - console.log('dateTimeFormat_test_014 ' + datefmt.resolvedOptions().dateStyle); - expect(datefmt.resolvedOptions().dateStyle).assertEqual('medium'); - expect(datefmt.format(date)).assertEqual('2020年12月20日 下午2:23:16'); - }) -}) - -describe('intlDateTimeFormatTest_5', function () { - console.log('******test start******') - - /* * - * @tc.number ARK_INTL_JS_DATETIME_017 - * @tc.name format the date with daterange when the start and end date is equal - * @tc.desc check the daterange when the start and end date is equal - */ - it('dateTimeFormat_test_017', 0, function () { - let startdate = new Date(2020, 11, 20, 14, 23, 16); - let enddate = new Date(2020, 11, 20, 14, 23, 16); - let datefmt = new Intl.DateTimeFormat('en-GB'); - console.log('dateTimeFormat_test_017 ' + datefmt.formatRange(startdate, enddate)); - expect(datefmt.formatRange(startdate, enddate)).assertEqual('20/12/2020'); -}) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_016 - * @tc.name format the date with daterange - * @tc.desc check the daterange - */ - it('dateTimeFormat_test_016', 0, function () { - let startdate = new Date(2020, 11, 20, 14, 23, 16); - let enddate = new Date(2020, 11, 21, 14, 23, 16); - let datefmt = new Intl.DateTimeFormat('en-GB'); - console.log('dateTimeFormat_test_016 ' + datefmt.formatRange(startdate, enddate)); - expect(datefmt.formatRange(startdate, enddate)).assertEqual('20/12/2020 – 21/12/2020'); -}) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_015 - * @tc.name format the date dateStyle with short style - * @tc.desc check the dateStyle with short style - */ - it('dateTimeFormat_test_015', 0, function () { - let date = new Date(2020, 11, 20, 14, 23, 16); - let option = { dateStyle: 'short', timeStyle: 'short' }; - let datefmt = new Intl.DateTimeFormat('zh-CN', option); - console.log('dateTimeFormat_test_015 ' + datefmt.resolvedOptions().dateStyle); - expect(datefmt.resolvedOptions().dateStyle).assertEqual('short'); -}) - -}) - -describe('intlDateTimeFormatTest_6', function () { - console.log('******test start******') - -/* * - * @tc.number ARK_INTL_JS_DATETIME_018 - * @tc.name format the year、month、day、weekday - * @tc.desc check the year、month、day、weekday - */ -it('dateTimeFormat_test_018', 0, function () { - let date = new Date(2020, 11, 20, 14, 23, 16); - let option = { year: 'numeric', month: 'long', day: 'numeric', weekday: 'long' }; - let datefmt = new Intl.DateTimeFormat('ja', option); - console.log('dateTimeFormat_test_018 ' + datefmt.format(date)); - expect(datefmt.format(date)).assertEqual('2020年12月20日日曜日'); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_019 - * @tc.name format the timerange with year、month、day、weekday - * @tc.desc check the timerange with year、month、day、weekday - */ - it('dateTimeFormat_test_019', 0, function () { - let startdate = new Date(2020, 11, 20, 14, 23, 16); - let enddate = new Date(2021, 4, 5, 10, 5, 3); - let option = { year: 'numeric', month: 'long', day: 'numeric', weekday: 'long' }; - let datefmt = new Intl.DateTimeFormat('en', option); - console.log('dateTimeFormat_test_019 ' + datefmt.formatRange(startdate, enddate)); - expect(datefmt.formatRange(startdate, enddate)).assertEqual( - 'Sunday, December 20, 2020 – Wednesday, May 5, 2021'); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_020 - * @tc.name format the hour&minute&second - * @tc.desc check the hour&minute&second - */ - it('dateTimeFormat_test_020', 0, function () { - let date = new Date(2020, 11, 20, 14, 23, 16); - let option = { year: 'numeric', month: 'long', day: 'numeric', - hour: 'numeric', minute: '2-digit', second: 'numeric', weekday: 'long', era: 'short' }; - let datefmt = new Intl.DateTimeFormat('zh-CN-u-hc-h12', option); - console.log('dateTimeFormat_test_020 ' + datefmt.format(date)); - expect(datefmt.format(date)).assertEqual('公元2020年12月20日星期日 下午2:23:16'); - }) -}) - -describe('intlDateTimeFormatTest_7', function () { - console.log('******test start******') - -/* * - * @tc.number ARK_INTL_JS_DATETIME_021 - * @tc.name format the timeZone - * @tc.desc check the timeZone - */ -it('dateTimeFormat_test_021', 0, function () { - let date = new Date(2020, 3, 14, 15, 5, 3); - let option = { timeZone: 'America/Los_Angeles', timeZoneName: 'long' }; - let datefmt = new Intl.DateTimeFormat('zh-CN-u-hc-h12', option); - console.log('dateTimeFormat_test_021 ' + datefmt.format(date)); - expect(datefmt.format(date).indexOf('北美太平洋夏令时间') !== -1).assertTrue(); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_022 - * @tc.name format the America/Los_Angeles timeZone - * @tc.desc check the America/Los_Angeles timeZone - */ - it('dateTimeFormat_test_022', 0, function () { - let option = { timeZone: 'America/Los_Angeles', timeZoneName: 'long' }; - let datefmt = new Intl.DateTimeFormat('zh-CN-u-hc-h12', option); - console.log('dateTimeFormat_test_022 ' + datefmt.resolvedOptions().timeZone); - expect(datefmt.resolvedOptions().timeZone).assertEqual('America/Los_Angeles'); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_023 - * @tc.name format the America/Los_Angeles timeZoneName - * @tc.desc check the America/Los_Angeles timeZoneName - */ - it('dateTimeFormat_test_023', 0, function () { - let option = { timeZone: 'America/Los_Angeles', timeZoneName: 'long' }; - let datefmt = new Intl.DateTimeFormat('zh-CN-u-hc-h12', option); - console.log('dateTimeFormat_test_023 ' + datefmt.resolvedOptions().timeZoneName); - expect(datefmt.resolvedOptions().timeZoneName).assertEqual('long'); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_024 - * @tc.name format the year - * @tc.desc check the year - */ - it('dateTimeFormat_test_024', 0, function () { - let option = { year: 'numeric', month: 'long', day: 'numeric', - hour: 'numeric', minute: '2-digit', second: 'numeric', weekday: 'long', era: 'short' }; - let datefmt = new Intl.DateTimeFormat('zh-CN-u-hc-h12', option); - console.log('dateTimeFormat_test_024 ' + datefmt.resolvedOptions().year); - expect(datefmt.resolvedOptions().year).assertEqual('numeric'); - }) -}) - -describe('intlDateTimeFormatTest_7', function () { - console.log('******test start******') - -/* * - * @tc.number ARK_INTL_JS_DATETIME_025 - * @tc.name format the weekday - * @tc.desc check the weekday - */ -it('dateTimeFormat_test_025', 0, function () { - let option = { year: 'numeric', month: 'long', day: 'numeric', - hour: 'numeric', minute: '2-digit', second: 'numeric', weekday: 'long', era: 'short' }; - let datefmt = new Intl.DateTimeFormat('zh-CN-u-hc-h12', option); - console.log('dateTimeFormat_test_025 ' + datefmt.resolvedOptions().weekday); - expect(datefmt.resolvedOptions().weekday).assertEqual('long'); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_026 - * @tc.name format the hour in zh-CN-u-hc-h12 - * @tc.desc check the hour in zh-CN-u-hc-h12 - */ - it('dateTimeFormat_test_026', 0, function () { - let option = { year: 'numeric', month: 'long', day: 'numeric', - hour: 'numeric', minute: '2-digit', second: 'numeric', weekday: 'long', era: 'short' }; - let datefmt = new Intl.DateTimeFormat('zh-CN-u-hc-h12', option); - console.log('dateTimeFormat_test_026 ' + datefmt.resolvedOptions().hour); - expect(datefmt.resolvedOptions().hour).assertEqual('numeric'); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_027 - * @tc.name format the hour in fr-Latn-FR-u-nu-mong - * @tc.desc check the hour in fr-Latn-FR-u-nu-mong - */ - it('dateTimeFormat_test_027', 0, function () { - let date = new Date(2020, 11, 20, 14, 23, 16); - let option = { dateStyle: 'full' }; - let datefmt = new Intl.DateTimeFormat('fr-Latn-FR-u-nu-mong', option); - console.log('dateTimeFormat_test_027 ' + datefmt.format(date)); - expect(datefmt.format(date)).assertEqual('dimanche ᠒᠐ décembre ᠒᠐᠒᠐'); - }) -}) \ No newline at end of file diff --git a/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/intlLocale_test.js b/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/intlLocale_test.js deleted file mode 100644 index 42e3b7655..000000000 --- a/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/intlLocale_test.js +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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 Intl from '@ohos.intl'; -import {describe,beforeAll,beforeEach,afterEach,afterAll,it,expect}from 'deccjsunit/index' -describe('intlDateTimeFormatTest', function () { - console.log('******* start IntlLocale_Test ******') - - /* * - * @tc.number ARK_INTL_JS_DATETIME_001 - * @tc.name the locale in en-Latn-GB - * @tc.desc check the locale in en-Latn-GB - */ - it('locale_test_001', 0, function () { - let locale = new Intl.Locale('en-Latn-GB'); - console.log('locale_test_001 ' + locale.language); - expect(locale.language).assertEqual('en'); - }) - -}) \ No newline at end of file diff --git a/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/numberFormat_test.js b/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/numberFormat_test.js deleted file mode 100644 index 9ffe78bba..000000000 --- a/compileruntime/ark_intl_standard/intljs/src/main/js/default/test/numberFormat_test.js +++ /dev/null @@ -1,106 +0,0 @@ -/* - * 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 Intl from '@ohos.intl'; -import {describe,beforeAll,beforeEach,afterEach,afterAll,it,expect}from 'deccjsunit/index' -describe('intlDateTimeFormatTest', function () { - console.log('******test start********'); - - /* * - * @tc.number ARK_INTL_JS_DATETIME_001 - * @tc.name format the number in en-GB and zh - * @tc.desc check the number in en-GB and zh - */ - it('numberFormat_info_test_001', 0, function () { - var numfmt = new Intl.NumberFormat(["en-GB", "zh"], { style: 'decimal', notation: "scientific" }); - console.log(numfmt.format(1223)); - expect(numfmt.format(1223)).assertEqual('1.223E3'); - // console.log(numfmt.resolvedOptions().locale); - // console.log(numfmt.resolvedOptions().currency); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_003 - * @tc.name format the number in ar-EG - * @tc.desc check the style of number in ar-EG - */ - it('numberFormat_info_test_003', 0, function () { - var number = 123456.789; - var numfmt =new Intl.NumberFormat('ar-EG'); - console.log(numfmt.format(number)); - expect(numfmt.format(number)).assertEqual('١٢٣٬٤٥٦٫٧٨٩'); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_004 - * @tc.name format the number in en-IN - * @tc.desc check the format of number in en-IN - */ - it('numberFormat_info_test_004', 0, function () { - var number = 123456.789; - var numfmt =new Intl.NumberFormat('en-IN'); - console.log(numfmt.format(number)); - expect(numfmt.format(number)).assertEqual('1,23,456.789'); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_005 - * @tc.name format the number in zh-Hans-CN-u-nu-hanidec - * @tc.desc check the format of number in zh-Hans-CN-u-nu-hanidec - */ - it('numberFormat_info_test_005', 0, function () { - var number = 123456.789; - // 通过编号系统中的nu扩展键请求, 例如中文十进制数字 - var numfmt =new Intl.NumberFormat('zh-Hans-CN-u-nu-hanidec') - console.log(numfmt.format(number)); - expect(numfmt.format(number)).assertEqual('一二三,四五六.七八九') - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_006 - * @tc.name format the number in ban and id - * @tc.desc check the format of number in ban and id - */ - it('numberFormat_info_test_006', 0, function () { - var number = 123456.789; - var numfmt=new Intl.NumberFormat('ban'); - console.log('numberFormat_info_test_006 '+numfmt.format(number)); - expect(numfmt.format(number)).assertEqual('123,456.789') - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_008 - * @tc.name format the number in ja-JP - * @tc.desc check the format of number in ja-JP - */ - it('numberFormat_info_test_008', 0, function () { - var number = 123456.789; - var numfmt=new Intl.NumberFormat('ja', { style: 'currency', currency: 'JPY' }); - console.log('numberFormat_info_test_008 '+numfmt.format(number)); - expect(numfmt.format(number)).assertEqual('￥123,457'); - }) - - /* * - * @tc.number ARK_INTL_JS_DATETIME_009 - * @tc.name format the number in en-IN - * @tc.desc check the format of number in en-IN - */ - it('numberFormat_info_test_009', 0, function () { - var number = 123456.789; - var numfmt=new Intl.NumberFormat('en-IN', { maximumSignificantDigits: 3 }) - console.log('numberFormat_info_test_009 '+numfmt.format(number)); - expect(numfmt.format(number)).assertEqual('1,23,000') - }) - -}) \ No newline at end of file diff --git a/compileruntime/ark_intl_standard/intljs/src/main/resources/base/element/string.json b/compileruntime/ark_intl_standard/intljs/src/main/resources/base/element/string.json deleted file mode 100644 index fac1f3a7c..000000000 --- a/compileruntime/ark_intl_standard/intljs/src/main/resources/base/element/string.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "L2Test" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] -} \ No newline at end of file diff --git a/compileruntime/ark_intl_standard/intljs/src/main/resources/base/media/icon.png b/compileruntime/ark_intl_standard/intljs/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6790 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