From 255ff97f426c3e489a350d0ddd61d6bec7fe7e88 Mon Sep 17 00:00:00 2001 From: hu-jixiang1 Date: Thu, 26 May 2022 19:40:44 +0800 Subject: [PATCH] basic update Signed-off-by: hu-jixiang1 Change-Id: I0073ab9dd20b2c14cab4276aa3812ec6d2b3a87d --- security/BUILD.gn | 1 + security/cipher/datacipher/BUILD.gn | 2 +- security/cipher/datacipher/cipher/BUILD.gn | 4 +- security/cipher/datacipher/cipher/Test.json | 4 +- .../src/main/js/test/Agree/cipher1.test.js | 4 +- .../src/main/js/test/Agree/cipher2.test.js | 4 +- .../src/main/js/test/Agree/hitscipher.test.js | 6 +- .../entry/src/main/js/test/List.test.js | 2 + security/cipher/datacipher2/BUILD.gn | 20 ------ security/cipher/datacipher2/cipher/BUILD.gn | 30 -------- security/cipher/datacipher2/cipher/Test.json | 18 ----- .../cipher/entry/src/main/config.json | 64 ------------------ .../entry/src/main/js/MainAbility/app.js | 23 ------- .../src/main/js/MainAbility/i18n/en-US.json | 7 -- .../src/main/js/MainAbility/i18n/zh-CN.json | 7 -- .../main/js/MainAbility/pages/index/index.css | 46 ------------- .../main/js/MainAbility/pages/index/index.hml | 5 -- .../main/js/MainAbility/pages/index/index.js | 40 ----------- .../js/resources/base/element/string.json | 12 ---- .../src/main/js/resources/base/media/icon.png | Bin 6790 -> 0 bytes .../entry/src/main/js/test/List.test.js | 16 ----- .../cipher/signature/openharmony_sx.p7b | Bin 3437 -> 0 bytes .../huks_agree_callback_BasicTest/BUILD.gn | 2 +- .../huks_agree_callback_BasicTest/Test.json | 2 +- .../huks_agree_promise_BasicTest/BUILD.gn | 2 +- .../huks_agree_promise_BasicTest/Test.json | 4 +- .../huks_cipher_callback_BasicTest/BUILD.gn | 2 +- .../huks_cipher_callback_BasicTest/Test.json | 4 +- .../huks_cipher_promise_BasicTest/BUILD.gn | 2 +- .../huks_cipher_promise_BasicTest/Test.json | 4 +- .../huks_derive_callback_BasicTest/BUILD.gn | 2 +- .../huks_derive_callback_BasicTest/Test.json | 4 +- .../huks_derive_promise_BasicTest/BUILD.gn | 2 +- .../huks_derive_promise_BasicTest/Test.json | 4 +- .../huks_hmac_callback_BasicTest/BUILD.gn | 2 +- .../huks_hmac_callback_BasicTest/Test.json | 4 +- .../huks_hmac_promise_BasicTest/BUILD.gn | 2 +- .../huks_hmac_promise_BasicTest/Test.json | 4 +- .../BUILD.gn | 2 +- .../Test.json | 2 +- .../BUILD.gn | 2 +- .../Test.json | 4 +- 42 files changed, 43 insertions(+), 328 deletions(-) rename security/cipher/{datacipher2 => datacipher}/cipher/entry/src/main/js/test/Agree/cipher1.test.js (96%) rename security/cipher/{datacipher2 => datacipher}/cipher/entry/src/main/js/test/Agree/cipher2.test.js (96%) delete mode 100644 security/cipher/datacipher2/BUILD.gn delete mode 100644 security/cipher/datacipher2/cipher/BUILD.gn delete mode 100644 security/cipher/datacipher2/cipher/Test.json delete mode 100644 security/cipher/datacipher2/cipher/entry/src/main/config.json delete mode 100644 security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/app.js delete mode 100644 security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/i18n/en-US.json delete mode 100644 security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/i18n/zh-CN.json delete mode 100644 security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.css delete mode 100644 security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.hml delete mode 100644 security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.js delete mode 100644 security/cipher/datacipher2/cipher/entry/src/main/js/resources/base/element/string.json delete mode 100644 security/cipher/datacipher2/cipher/entry/src/main/js/resources/base/media/icon.png delete mode 100644 security/cipher/datacipher2/cipher/entry/src/main/js/test/List.test.js delete mode 100644 security/cipher/datacipher2/cipher/signature/openharmony_sx.p7b diff --git a/security/BUILD.gn b/security/BUILD.gn index 1076ea483..3dead9bca 100644 --- a/security/BUILD.gn +++ b/security/BUILD.gn @@ -18,6 +18,7 @@ group("security") { if (is_standard_system) { deps = [ "access_token/AccessTokenTest_Normal_js:ActsAccessTokenJSApiTestNormal", + "cipher/datacipher:datacipher", "huks_standard", "security_huks_basic", ] diff --git a/security/cipher/datacipher/BUILD.gn b/security/cipher/datacipher/BUILD.gn index 32f35557b..46fdd8a64 100644 --- a/security/cipher/datacipher/BUILD.gn +++ b/security/cipher/datacipher/BUILD.gn @@ -15,6 +15,6 @@ import("//test/xts/tools/build/suite.gni") group("datacipher") { testonly = true if (is_standard_system) { - deps = [ "cipher:HitsSecurityCipherTest" ] + deps = [ "cipher:ActsSecurityCipherTest" ] } } diff --git a/security/cipher/datacipher/cipher/BUILD.gn b/security/cipher/datacipher/cipher/BUILD.gn index e1115ea2a..241c6a918 100644 --- a/security/cipher/datacipher/cipher/BUILD.gn +++ b/security/cipher/datacipher/cipher/BUILD.gn @@ -12,14 +12,14 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("HitsSecurityCipherTest") { +ohos_js_hap_suite("ActsSecurityCipherTest") { hap_profile = "./entry/src/main/config.json" deps = [ ":huks_js_assets", ":huks_js_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "HitsSecurityCipherTest" + hap_name = "ActsSecurityCipherTest" } ohos_js_assets("huks_js_assets") { source_dir = "./entry/src/main/js/MainAbility" diff --git a/security/cipher/datacipher/cipher/Test.json b/security/cipher/datacipher/cipher/Test.json index 39fcb66ab..01e3f208c 100644 --- a/security/cipher/datacipher/cipher/Test.json +++ b/security/cipher/datacipher/cipher/Test.json @@ -2,14 +2,14 @@ "description": "Configuration for keystoretest js api Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "4200000", + "test-timeout": "300000", "package": "com.huawei.keystoretest", "shell-timeout": "60000" }, "kits": [ { "test-file-name": [ - "HitsSecurityCipherTest.hap" + "ActsSecurityCipherTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/test/Agree/cipher1.test.js b/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/cipher1.test.js similarity index 96% rename from security/cipher/datacipher2/cipher/entry/src/main/js/test/Agree/cipher1.test.js rename to security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/cipher1.test.js index f03b7ea07..ebc56656e 100644 --- a/security/cipher/datacipher2/cipher/entry/src/main/js/test/Agree/cipher1.test.js +++ b/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/cipher1.test.js @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/lite/interface' +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' import cipher from '@system.cipher'; -describe('hitscipher.test.js', function () { +describe('cipher1.test.js', function () { let plainTextRsa; let cipherTextRsa; let rsaPublicKey; diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/test/Agree/cipher2.test.js b/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/cipher2.test.js similarity index 96% rename from security/cipher/datacipher2/cipher/entry/src/main/js/test/Agree/cipher2.test.js rename to security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/cipher2.test.js index 315052b78..d675c9ba8 100644 --- a/security/cipher/datacipher2/cipher/entry/src/main/js/test/Agree/cipher2.test.js +++ b/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/cipher2.test.js @@ -12,9 +12,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/lite/interface' +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' import cipher from '@system.cipher'; -describe('hitscipher.test.js', function () { +describe('cipher2.test.js', function () { let plainTextRsa; let cipherTextRsa; let rsaPublicKey; diff --git a/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/hitscipher.test.js b/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/hitscipher.test.js index 82e9b69d7..0c8185a17 100644 --- a/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/hitscipher.test.js +++ b/security/cipher/datacipher/cipher/entry/src/main/js/test/Agree/hitscipher.test.js @@ -1,4 +1,4 @@ -/* +/*plainTextAes * 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. @@ -19,7 +19,7 @@ describe('hitscipher.test.js', function () { let cipherTextRsa; let rsaPublicKey; let rsaPrivateKey; - let plainTestAes; + let plainTextAes; let cipherTextAes; let aesKey; let cipherResultFail; @@ -44,7 +44,7 @@ describe('hitscipher.test.js', function () { 'Zt8MkPdAh87mD8jdlsSzh3v2RxkbJTgzFmRotsd2dCfNdykYtRN5EBmbYM54GhBh\n' + 'dYZlnX92HHBDLRCL8y0CQQDuKZNoBooqVUwcrCFqpeAX/bGYiVmFxcIqyu5vYzVJ\n' + 'Ff5Fpkxm4FLmrjhiGwL1CKIm5RRL9kT6tsv4do6ALylb'; - plainTestAes = '%%%%Hello,World! 123 aes key2###(^^^)'; + plainTextAes = '%%%%Hello,World! 123 aes key2###(^^^)'; cipherTextAes = 'IclkeCOt6pPODqNyprSZizYdJLBFLwXsEFJo34IJwZp7JmfQJXDbqGpexINBMke4'; aesKey = 'MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjMONTY3ODkwMzI='; cipherResultFail = false; diff --git a/security/cipher/datacipher/cipher/entry/src/main/js/test/List.test.js b/security/cipher/datacipher/cipher/entry/src/main/js/test/List.test.js index 57e03c70f..44fc82db2 100644 --- a/security/cipher/datacipher/cipher/entry/src/main/js/test/List.test.js +++ b/security/cipher/datacipher/cipher/entry/src/main/js/test/List.test.js @@ -14,3 +14,5 @@ */ require('./Agree/hitscipher.test.js'); +require('./Agree/cipher1.test.js'); +require('./Agree/cipher2.test.js'); diff --git a/security/cipher/datacipher2/BUILD.gn b/security/cipher/datacipher2/BUILD.gn deleted file mode 100644 index c927b93e6..000000000 --- a/security/cipher/datacipher2/BUILD.gn +++ /dev/null @@ -1,20 +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") - -group("datacipher2") { - testonly = true - if (is_standard_system) { - deps = [ "cipher:HitsSecurityCipherTest2" ] - } -} diff --git a/security/cipher/datacipher2/cipher/BUILD.gn b/security/cipher/datacipher2/cipher/BUILD.gn deleted file mode 100644 index d4c7ad070..000000000 --- a/security/cipher/datacipher2/cipher/BUILD.gn +++ /dev/null @@ -1,30 +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("HitsSecurityCipherTest2") { - hap_profile = "./entry/src/main/config.json" - deps = [ - ":huks_js_assets", - ":huks_js_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "HitsSecurityCipherTest2" -} -ohos_js_assets("huks_js_assets") { - source_dir = "./entry/src/main/js/MainAbility" -} -ohos_resources("huks_js_resources") { - sources = [ "./entry/src/main/js/resources" ] - hap_profile = "./entry/src/main/config.json" -} diff --git a/security/cipher/datacipher2/cipher/Test.json b/security/cipher/datacipher2/cipher/Test.json deleted file mode 100644 index b47091c77..000000000 --- a/security/cipher/datacipher2/cipher/Test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "description": "Configuration for keystoretest js api Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "4200000", - "package": "com.huawei.keystoretest", - "shell-timeout": "60000" - }, - "kits": [ - { - "test-file-name": [ - "HitsSecurityCipherTest2.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} \ No newline at end of file diff --git a/security/cipher/datacipher2/cipher/entry/src/main/config.json b/security/cipher/datacipher2/cipher/entry/src/main/config.json deleted file mode 100644 index a533ea4d2..000000000 --- a/security/cipher/datacipher2/cipher/entry/src/main/config.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "app": { - "bundleName": "com.huawei.keystoretest", - "vendor": "huawei", - "version": { - "code": 1, - "name": "1.0.0" - }, - "apiVersion": { - "compatible": 6, - "target": 6, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.huawei.keystoretest", - "name": ".MyApplication", - "mainAbility": "com.huawei.keystoretest.MainAbility", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": true - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "name": "com.huawei.keystoretest.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard", - "visible": true, - "isVisible": "true" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true - } - } - ] - } -} \ No newline at end of file diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/app.js b/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/app.js deleted file mode 100644 index bd5ae64a2..000000000 --- a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/app.js +++ /dev/null @@ -1,23 +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('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - }, -}; diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/i18n/en-US.json b/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/i18n/en-US.json deleted file mode 100644 index 7f21065f1..000000000 --- a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/i18n/en-US.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "world", - "start": "test start" - } -} \ No newline at end of file diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/i18n/zh-CN.json b/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/i18n/zh-CN.json deleted file mode 100644 index 29bea0fd9..000000000 --- a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/i18n/zh-CN.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "世界", - "start": "测试开始" - } -} \ No newline at end of file diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.css b/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.css deleted file mode 100644 index 50637f89a..000000000 --- a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.css +++ /dev/null @@ -1,46 +0,0 @@ -.container { - flex-direction: column; - justify-content: center; - align-items: center; - width: 100%; - height: 100%; -} - -.title { - font-size: 40px; - color: #000000; - opacity: 0.9; -} - -@media screen and (device-type: tablet) and (orientation: landscape) { - .title { - font-size: 100px; - } -} - -@media screen and (device-type: wearable) { - .title { - font-size: 28px; - color: #ffffff; - } -} - -@media screen and (device-type: tv) { - .container { - background-image: url('/common/images/Wallpaper.png'); - background-size: cover; - background-repeat: no-repeat; - background-position: center; - } - - .title { - font-size: 100px; - color: #ffffff; - } -} - -@media screen and (device-type: phone) and (orientation: landscape) { - .title { - font-size: 60px; - } -} diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.hml b/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.hml deleted file mode 100644 index 201249a90..000000000 --- a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.hml +++ /dev/null @@ -1,5 +0,0 @@ -
- - {{ $t('strings.hello') }} {{ title }} - -
\ No newline at end of file diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.js b/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.js deleted file mode 100644 index 764001cef..000000000 --- a/security/cipher/datacipher2/cipher/entry/src/main/js/MainAbility/pages/index/index.js +++ /dev/null @@ -1,40 +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() { - const core = Core.getInstance(); - const expectExtend = new ExpectExtend({ - id: 'extend', - }); - core.addService('expect', expectExtend); - core.init(); - const configService = core.getDefaultService('config'); - this.timeout = 1500000; - configService.setConfig(this); - console.log('test start'); - require('../../../test/List.test'); - core.execute(); - }, - onReady() {}, -}; diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/resources/base/element/string.json b/security/cipher/datacipher2/cipher/entry/src/main/js/resources/base/element/string.json deleted file mode 100644 index c0dd3a09e..000000000 --- a/security/cipher/datacipher2/cipher/entry/src/main/js/resources/base/element/string.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "entry_MainAbility" - }, - { - "name": "mainability_description", - "value": "JS_Empty Ability" - } - ] -} \ No newline at end of file diff --git a/security/cipher/datacipher2/cipher/entry/src/main/js/resources/base/media/icon.png b/security/cipher/datacipher2/cipher/entry/src/main/js/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6790 zcmX|G1ymHk)?T_}Vd;>R?p|tHQo6fg38|$UVM!6BLrPFWk?s;$LOP{GmJpBl$qoSA!PUg~PA65-S00{{S`XKG6NkG0RgjEntPrmV+?0|00mu7;+5 zrdpa{2QLqPJ4Y{j7=Mrl{BaxrkdY69+c~(w{Fv-v&aR%aEI&JYSeRTLWm!zbv;?)_ ziZB;fwGbbeL5Q}YLx`J$lp~A09KK8t_z}PZ=4ZzgdeKtgoc+o5EvN9A1K1_<>M?MBqb#!ASf&# zEX?<)!RH(7>1P+j=jqG(58}TVN-$psA6K}atCuI!KTJD&FMmH-78ZejBm)0qc{ESp z|LuG1{QnBUJRg_E=h1#XMWt2%fcoN@l7eAS!Es?Q+;XsRNPhiiE=@AqlLkJzF`O18 zbsbSmKN=aaq8k3NFYZfDWpKmM!coBU0(XnL8R{4=i|wi{!uWYM2je{U{B*K2PVdu&=E zTq*-XsEsJ$u5H4g6DIm2Y!DN`>^v|AqlwuCD;w45K0@eqauiqWf7l&o)+YLHm~|L~ z7$0v5mkobriU!H<@mVJHLlmQqzQ3d6Rh_-|%Yy2li*tHO>_vcnuZ7OR_xkAIuIU&x z-|8Y0wj|6|a6_I(v91y%k_kNw6pnkNdxjqG8!%Vz_d%c_!X+6-;1`GC9_FpjoHev5fEV7RhJ>r=mh-jp$fqbqRJ=obwdgLDVP5+s zy1=_DWG0Y-Jb3t^WXmkr(d9~08k-|#Ly zaNOmT(^9tIb&eb4%CzIT zAm3CUtWSr1t4?h1kk#NBi{U|pJslvME{q|_eS^3En>SOqSxyuN1x;Is@8~m?*>}** znrRFArP!K_52RpX*&JHMR<^lVdm8ypJ}0R(SD(51j;6@ni$6bQ+2XL+R^|NnSp5}(kzvMZ^(@4fD_{QVu$(&K6H|C37TG1Am9Re{<<3gd zh@`>;BqkXMW&p0T6rt|iB$)~CvFe(XC)F9WgAZn*0@t$oZo;!*}r@_`h?KKH&6A@3= zISXoQB+~`op>NP-buiA*^0n{@i{_?MRG)&k)c)k_F+-2Lud!S9pc+i`s74NpBCaGF zXN+pHkubw*msGBTY27BKHv)RRh3;nMg4&$fD_6X9Vt~;_4D+5XPH~#Kn-yjcy!$}1 zigv#FNY>TqMhtIBb@UoF!cE~Q8~;!Pek>SQQwHnHuWKoVBosAiOr}q>!>aE*Krc)V zBUMEcJ5NU0g8}-h6i1zpMY9>m4ne?=U2~`w7K7Q0gB_=p@$5K7p6}thw z-~3dMj?YNX2X$lZ+7ngQ$=s}3mizNN@kE%OtB)?c&i~2L55z8^=yz;xMHLmlY>&Q# zJj?!)M#q_SyfkQh)k?j8IfLtB)ZCp|*vf4_B zos?73yd^h-Ac+;?E4*bpf=o*^3x3-`TVjbY4n6!EN10K6o@fxdyps05Vo3PU)otB} z`3kR+2w7_C#8Z!q`J)p{Vh!+m9-UP!$STp+Hb}}#@#_u^SsUQg<}59< zTvH3%XS4G+6FF^(m6bVF&nSUIXcl;nw{=H$%fgeJ>CgDYiLdpDXr{;-AnG z8dvcrHYVMI&`R6;GWekI@Ir3!uo)oz4^{6q0m^}@f2tM9&=YHNi6-?rh0-{+k@cQm zdp`g#YdQn%MDVg2GR>wZ`n2<0l4)9nx1Wfr&!Dvz=bPwU!h2S?ez6MVc5APE4-xLB zi&W9Q8k2@0w!C53g?iAIQ}~p*3O(@zja6KQ=M3zfW*_6o5SwR-)6VBh~m7{^-=MC-owYH5-u40a}a0liho3QZZ5L{bS_xM1)4}19)zTU$$MY zq3eZML1WC{K%YFd`Be0M-rkO^l?h{kM{$2oK1*A@HVJ57*yhDkUF!2WZ&oA4Y-sK( zCY69%#`mBCi6>6uw(x4gbFaP0+FD*JKJ-q!F1E?vLJ+d35!I5d7@^eU?(CS|C^tmI5?lv@s{{*|1F zFg|OzNpZ0hxljdjaW%45O0MOttRrd(Z?h{HYbB-KFUx&9GfFL3b8NwZ$zNu)WbBD` zYkj$^UB5%3Pj1MDr>S2Ejr9pUcgA!;ZG!@{uAy12)vG=*^9-|dNQBc8&`oxBlU~#y zs!anJX&T?57Jdr^sb>e+V`MVfY>Y0ESg7MG<7W0g&bR-ZYzzZ%2H&Etcp zcd6QeXO1D!5A#zM0lx*GH}`M)2~ZFLE;sP^RSB5wVMNfiZXPd(cmO>j=OSA3`o5r& zna(|^jGXbdN7PK)U8b7^zYtYkkeb%<%F~=OqB~kXMQkq}ii|skh@WSRt>5za;cjP0 zZ~nD%6)wzedqE}BMLt~qKwlvTr33))#uP~xyw#*Eaa|DbMQ_%mG0U8numf8)0DX`r zRoG2bM;#g|p-8gWnwRV5SCW0tLjLO&9Z?K>FImeIxlGUgo0Zk`9Qzhj1eco~7XZy+hXc@YF&ZQ=? zn*^1O56yK^x{y}q`j7}blGCx%dydV!c7)g~tJzmHhV=W~jbWRRR{1<^oDK+1clprm zz$eCy7y9+?{E|YgkW~}}iB#I4XoJ*xr8R?i_Hv$=Cof5bo-Nj~f`-DLebH}&0% zfQj9@WGd4;N~Y?mzQsHJTJq6!Qzl^-vwol(+fMt#Pl=Wh#lI5Vmu@QM0=_r+1wHt` z+8WZ~c2}KQQ+q)~2Ki77QvV&`xb|xVcTms99&cD$Zz4+-^R4kvUBxG8gDk7Y`K*)JZ^2rL(+ZWV~%W(@6 z)0bPArG#BROa_PHs~&WplQ_UIrpd)1N1QGPfv!J(Z9jNT#i%H?CE6|pPZb9hJ1JW4 z^q;ft#!HRNV0YgPojzIYT`8LuET2rUe-J|c!9l4`^*;4WtY@Ew@pL>wkjmMgGfN7 ze}}GtmU0@<_#08~I-Suk=^*9GLW=H4xhsml;vAV{%hy5Eegl@!6qKqbG024%n2HHw zCc@ivW_$@5ZoHP70(7D+(`PvgjW1Pd`wsiuv-aCukMrafwDm)B!xXVy*j2opohhoU zcJz%ADmj>i3`-3-$7nQKBQQuGY;2Qt&+(L~C>vSGFj5{Mlv?T_^dql;{zkpe4R1}R z%XfZyQ}wr*sr>jrKgm*PWLjuVc%6&&`Kbf1SuFpHPN&>W)$GmqC;pIoBC`=4-hPY8 zT*>%I2fP}vGW;R=^!1be?ta2UQd2>alOFFbVl;(SQJ4Jk#)4Z0^wpWEVvY4=vyDk@ zqlModi@iVPMC+{?rm=4(n+<;|lmUO@UKYA>EPTS~AndtK^Wy^%#3<;(dQdk3WaUkRtzSMC9}7x2||CNpF#(3T4C)@ z$~RWs`BNABKX|{cmBt>Q=&gkXl&x!!NK_%5hW0LS)Z4PB>%sV?F-{Wyj#s7W%$F{D zXdK^Fp3wvy+48+GP6F_|^PCRx=ddcTO3sG;B23A49~Qaw31SZ0Rc~`r4qqt%#OGW{ zCA_(LG5^N>yzUn&kAgVmxb=EA8s&tBXC}S1CZ(KoW)(%^JjLTPo^fs`Va;`=YlVPgmB$!yB}<(4ym6OeZ3xAJJ#;)2+B%p3P1Wt+d$eo`vz`T zXfUP2))kBDPoscH;Jc7I3NU<({|@wM$&GaDt`n7WLgIY3IA7A6-_R?z8N3mz|}*i z(zl5ot--Oq@f2-nv{X(ujT2T(k1vY_qh93pK@>H-qc%2Xta)IP0Q%zt%bqYgI`o!wv!0QerB`nCN^1n|@$sVOQ!V0teVG!I z_fD%JvfDeT1cK#-{o6Gv7}& zY0#NWin~kVaf$aufV&;63Hbs|`QVZWpDX6IMk1Hj2G}fiH9e-^6u2zf^FIr^BwD<6zjw63+{yUe8PUFvk8v{sJ=R{d#`O!sz`Q13~< zPT$JS(w=yQfU2`zPCNfSw=&zup@DXc(98afjhv@1w_f!m2Z>rMJ19AB&dB%P#Ls3b z=lK7OILM+SQ&VEd=1GN6o&>YVVtIzoZ%=Z_SdqJN2}E43{bE`>w+A;=y->@^k{oCC z$F*WTY&?34;kfyFV?b*Xb1Pq`Z=%OgwEg)Rz)tx=`f%5#w_INP=x&z5!jI;#;N$ma zhO)+MDm;SxOEVL15; zGq(v2pL3&P1Sl)8P*;G-fd{l1QJsv@e@d8)1PK4w2m*M%V3j-V~L^$i|&C@b?D?9tfwE{B^}Z$k8e5FmQ>v7Xz)sG32g9t}YBt zyR$+*_00RmPx+0mW+vVG4mxd(n$(eQf3-w>JPl2UJpafrPaL5@2j}%{VE-) zBI%6Qpj*dsdH<;g!S!avA~bv^0E+ zfyJbSjPb+j;J52U)<|cIcntQBI2T#>2;tOxu{%D?kML476AErF(qN9hPva5Nkc@BF zC-tLF@3ZFb%Kpj)M<{)x*l|*Ia@ECeXo2E4h2f!aV=cHAhi_E_mfUth(sM4^hJq7B zQsGWqdZUm9S%F`$nQ*_#NcuD`&)Ek%_s{&^78{9Hm ztri&rYLOxgFdG>O@+XHy z9#;|&vBCPXH5Mon^I`jSuR$&~ZWtyB67ujzFSj!51>#C}C17~TffQ{c-!QFQkTQ%! zIR^b1`zHx|*1GU?tbBx23weFLz5H?y_Q%N&t$}k?w+``2A=aotj0;2v$~AL z{scF-cL{wsdrmPvf#a9OHyYLcwQD4Kcm)`LLwMh4WT~p29f7M!iafJSU`IV}QY5Wa z(n44-9oA}?J{a+ah*@31WTs#&J#o1`H98#6IQf;Wv0N_!);f&9g7o-k(lW5rWnDUR zQBFIRG+X=6NnsI@mxnwm;tf5;_Uxg?jZ8m-m0}&6+DA!qam(p$mN5R})yA_7m$q@| zFEd|dpS595rxQr-n#GjI5i-AhnUE>Cr;jpCqSrD~EwK_DqI^7%3#p5)%T_od!t3SOmH9MyXeeGO2(UQL;ax|x?Ncixmeo1=$ z{-);Au{*tfzOG?KQ~K|ak8-HQ?`Pekhe2WM(8s{xv-p>Zmu_6{G!-oE$7$mY`MOJorI=+mMx?H;`pr!;fVYz?5~yXBACruWB`Ph zZM}90_<^OBxIhyZ9BW$`>6JvO;%VFpqVr8|7t3~AmxYak6?`Pp#c;**_SYmi`&z23 z`p6_~ePvH)C6x-G9$hgL=eVALq`-AiamN>!3~Lxw&{H(b{B(7xSRm6<3<{%{yXiH# zos5Rv1L+8fUKJLo%P>4I&$}yb$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/security/security_huks_basic/huks_agree_callback_BasicTest/BUILD.gn b/security/security_huks_basic/huks_agree_callback_BasicTest/BUILD.gn index 416564fb1..206be2a3f 100644 --- a/security/security_huks_basic/huks_agree_callback_BasicTest/BUILD.gn +++ b/security/security_huks_basic/huks_agree_callback_BasicTest/BUILD.gn @@ -19,7 +19,7 @@ ohos_js_hap_suite("huksagree_callback_basic_js_test") { ":huks_js_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "huksAgreeBasicCallbackJSApiTest" + hap_name = "ActsHuksAgreeBasicCallbackJSApiTest" } ohos_js_assets("huks_js_assets") { source_dir = "./entry/src/main/js/MainAbility" diff --git a/security/security_huks_basic/huks_agree_callback_BasicTest/Test.json b/security/security_huks_basic/huks_agree_callback_BasicTest/Test.json index e6919e6d4..ec84c9c0c 100644 --- a/security/security_huks_basic/huks_agree_callback_BasicTest/Test.json +++ b/security/security_huks_basic/huks_agree_callback_BasicTest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "huksAgreeBasicCallbackJSApiTest.hap" + "ActsHuksAgreeBasicCallbackJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/security/security_huks_basic/huks_agree_promise_BasicTest/BUILD.gn b/security/security_huks_basic/huks_agree_promise_BasicTest/BUILD.gn index 58b425fe9..092ba9199 100644 --- a/security/security_huks_basic/huks_agree_promise_BasicTest/BUILD.gn +++ b/security/security_huks_basic/huks_agree_promise_BasicTest/BUILD.gn @@ -19,7 +19,7 @@ ohos_js_hap_suite("huksagree_promise_basic_js_test") { ":huks_js_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "huksAgreeBasicPromiseJSApiTest" + hap_name = "ActsHuksAgreeBasicPromiseJSApiTest" } ohos_js_assets("huks_js_assets") { source_dir = "./entry/src/main/js/MainAbility" diff --git a/security/security_huks_basic/huks_agree_promise_BasicTest/Test.json b/security/security_huks_basic/huks_agree_promise_BasicTest/Test.json index 223c56d5f..3aca2b281 100644 --- a/security/security_huks_basic/huks_agree_promise_BasicTest/Test.json +++ b/security/security_huks_basic/huks_agree_promise_BasicTest/Test.json @@ -2,14 +2,14 @@ "description": "Configuration for huksAgreeBasicPromise js api Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "4200000", + "test-timeout": "180000", "package": "com.example.huksagreebasicpromise", "shell-timeout": "60000" }, "kits": [ { "test-file-name": [ - "huksAgreeBasicPromiseJSApiTest.hap" + "ActsHuksAgreeBasicPromiseJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/security/security_huks_basic/huks_cipher_callback_BasicTest/BUILD.gn b/security/security_huks_basic/huks_cipher_callback_BasicTest/BUILD.gn index 16b45d101..12730c2d9 100644 --- a/security/security_huks_basic/huks_cipher_callback_BasicTest/BUILD.gn +++ b/security/security_huks_basic/huks_cipher_callback_BasicTest/BUILD.gn @@ -19,7 +19,7 @@ ohos_js_hap_suite("hukscipher_callback_basic_js_test") { ":huks_js_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "huksCipherBasicCallbackJSApiTest" + hap_name = "ActsHuksCipherBasicCallbackJSApiTest" } ohos_js_assets("huks_js_assets") { source_dir = "./entry/src/main/js/MainAbility" diff --git a/security/security_huks_basic/huks_cipher_callback_BasicTest/Test.json b/security/security_huks_basic/huks_cipher_callback_BasicTest/Test.json index 2b45fe6f6..f63b998e1 100644 --- a/security/security_huks_basic/huks_cipher_callback_BasicTest/Test.json +++ b/security/security_huks_basic/huks_cipher_callback_BasicTest/Test.json @@ -2,14 +2,14 @@ "description": "Configuration for huksCipherBasicCallback js api Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "2700000", + "test-timeout": "180000", "package": "com.example.hukscipherbasiccallback", "shell-timeout": "60000" }, "kits": [ { "test-file-name": [ - "huksCipherBasicCallbackJSApiTest.hap" + "ActsHuksCipherBasicCallbackJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/security/security_huks_basic/huks_cipher_promise_BasicTest/BUILD.gn b/security/security_huks_basic/huks_cipher_promise_BasicTest/BUILD.gn index b319404ac..bd1a2820f 100644 --- a/security/security_huks_basic/huks_cipher_promise_BasicTest/BUILD.gn +++ b/security/security_huks_basic/huks_cipher_promise_BasicTest/BUILD.gn @@ -19,7 +19,7 @@ ohos_js_hap_suite("hukscipher_promise_basic_js_test") { ":huks_js_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "huksCipherBasicPromiseJSApiTest" + hap_name = "ActsHuksCipherBasicPromiseJSApiTest" } ohos_js_assets("huks_js_assets") { source_dir = "./entry/src/main/js/MainAbility" diff --git a/security/security_huks_basic/huks_cipher_promise_BasicTest/Test.json b/security/security_huks_basic/huks_cipher_promise_BasicTest/Test.json index a3afe3e0a..5d0b83066 100644 --- a/security/security_huks_basic/huks_cipher_promise_BasicTest/Test.json +++ b/security/security_huks_basic/huks_cipher_promise_BasicTest/Test.json @@ -2,14 +2,14 @@ "description": "Configuration for huksCipherBasicPromise js api Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "2700000", + "test-timeout": "180000", "package": "com.example.hukscipherbasicpromise", "shell-timeout": "60000" }, "kits": [ { "test-file-name": [ - "huksCipherBasicPromiseJSApiTest.hap" + "ActsHuksCipherBasicPromiseJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/security/security_huks_basic/huks_derive_callback_BasicTest/BUILD.gn b/security/security_huks_basic/huks_derive_callback_BasicTest/BUILD.gn index 45bc3846e..730187b23 100644 --- a/security/security_huks_basic/huks_derive_callback_BasicTest/BUILD.gn +++ b/security/security_huks_basic/huks_derive_callback_BasicTest/BUILD.gn @@ -19,7 +19,7 @@ ohos_js_hap_suite("huksderive_callback_basic_js_test") { ":huks_js_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "huksDeriveBasicCallbackJSApiTest" + hap_name = "ActsHuksDeriveBasicCallbackJSApiTest" } ohos_js_assets("huks_js_assets") { source_dir = "./entry/src/main/js/MainAbility" diff --git a/security/security_huks_basic/huks_derive_callback_BasicTest/Test.json b/security/security_huks_basic/huks_derive_callback_BasicTest/Test.json index 2acedaf04..182fb0f29 100644 --- a/security/security_huks_basic/huks_derive_callback_BasicTest/Test.json +++ b/security/security_huks_basic/huks_derive_callback_BasicTest/Test.json @@ -2,14 +2,14 @@ "description": "Configuration for huksDeriveBasicCallback js api Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "4200000", + "test-timeout": "180000", "package": "com.example.huksderivebasiccallback", "shell-timeout": "60000" }, "kits": [ { "test-file-name": [ - "huksDeriveBasicCallbackJSApiTest.hap" + "ActsHuksDeriveBasicCallbackJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/security/security_huks_basic/huks_derive_promise_BasicTest/BUILD.gn b/security/security_huks_basic/huks_derive_promise_BasicTest/BUILD.gn index a3dc56b78..c1212c5cc 100644 --- a/security/security_huks_basic/huks_derive_promise_BasicTest/BUILD.gn +++ b/security/security_huks_basic/huks_derive_promise_BasicTest/BUILD.gn @@ -19,7 +19,7 @@ ohos_js_hap_suite("huksderive_promise_basic_js_test") { ":huks_js_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "huksDeriveBasicPromiseJSApiTest" + hap_name = "ActsHuksDeriveBasicPromiseJSApiTest" } ohos_js_assets("huks_js_assets") { source_dir = "./entry/src/main/js/MainAbility" diff --git a/security/security_huks_basic/huks_derive_promise_BasicTest/Test.json b/security/security_huks_basic/huks_derive_promise_BasicTest/Test.json index e77b6d92d..dc27c0af8 100644 --- a/security/security_huks_basic/huks_derive_promise_BasicTest/Test.json +++ b/security/security_huks_basic/huks_derive_promise_BasicTest/Test.json @@ -2,14 +2,14 @@ "description": "Configuration for huksDeriveBasicPromise js api Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "4200000", + "test-timeout": "180000", "package": "com.example.huksderivebasicpromise", "shell-timeout": "60000" }, "kits": [ { "test-file-name": [ - "huksDeriveBasicPromiseJSApiTest.hap" + "ActsHuksDeriveBasicPromiseJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/security/security_huks_basic/huks_hmac_callback_BasicTest/BUILD.gn b/security/security_huks_basic/huks_hmac_callback_BasicTest/BUILD.gn index d860b7d32..27a317886 100644 --- a/security/security_huks_basic/huks_hmac_callback_BasicTest/BUILD.gn +++ b/security/security_huks_basic/huks_hmac_callback_BasicTest/BUILD.gn @@ -19,7 +19,7 @@ ohos_js_hap_suite("hukshmac_callback_basic_js_test") { ":huks_js_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "huksHmacBasicCallbackJSApiTest" + hap_name = "ActsHuksHmacBasicCallbackJSApiTest" } ohos_js_assets("huks_js_assets") { source_dir = "./entry/src/main/js/MainAbility" diff --git a/security/security_huks_basic/huks_hmac_callback_BasicTest/Test.json b/security/security_huks_basic/huks_hmac_callback_BasicTest/Test.json index 21c4f375f..14b835e98 100644 --- a/security/security_huks_basic/huks_hmac_callback_BasicTest/Test.json +++ b/security/security_huks_basic/huks_hmac_callback_BasicTest/Test.json @@ -2,14 +2,14 @@ "description": "Configuration for huksHmacBasicCallback js api Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "600000", + "test-timeout": "180000", "package": "com.example.huksHmacbasiccallback", "shell-timeout": "60000" }, "kits": [ { "test-file-name": [ - "huksHmacBasicCallbackJSApiTest.hap" + "ActsHuksHmacBasicCallbackJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/security/security_huks_basic/huks_hmac_promise_BasicTest/BUILD.gn b/security/security_huks_basic/huks_hmac_promise_BasicTest/BUILD.gn index b67b9dc46..6b5f3b70c 100644 --- a/security/security_huks_basic/huks_hmac_promise_BasicTest/BUILD.gn +++ b/security/security_huks_basic/huks_hmac_promise_BasicTest/BUILD.gn @@ -19,7 +19,7 @@ ohos_js_hap_suite("hukshmac_promise_basic_js_test") { ":huks_js_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "huksHmacBasicPromiseJSApiTest" + hap_name = "ActsHuksHmacBasicPromiseJSApiTest" } ohos_js_assets("huks_js_assets") { source_dir = "./entry/src/main/js/MainAbility" diff --git a/security/security_huks_basic/huks_hmac_promise_BasicTest/Test.json b/security/security_huks_basic/huks_hmac_promise_BasicTest/Test.json index e4b6fac84..ce4accfe9 100644 --- a/security/security_huks_basic/huks_hmac_promise_BasicTest/Test.json +++ b/security/security_huks_basic/huks_hmac_promise_BasicTest/Test.json @@ -2,14 +2,14 @@ "description": "Configuration for huksHmacBasicPromise js api Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "600000", + "test-timeout": "180000", "package": "com.example.huksHmacbasicpromise", "shell-timeout": "60000" }, "kits": [ { "test-file-name": [ - "huksHmacBasicPromiseJSApiTest.hap" + "ActsHuksHmacBasicPromiseJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/security/security_huks_basic/huks_signverify_callback_BasicTest/BUILD.gn b/security/security_huks_basic/huks_signverify_callback_BasicTest/BUILD.gn index 5a09b2507..6563049b7 100644 --- a/security/security_huks_basic/huks_signverify_callback_BasicTest/BUILD.gn +++ b/security/security_huks_basic/huks_signverify_callback_BasicTest/BUILD.gn @@ -19,7 +19,7 @@ ohos_js_hap_suite("hukssignverify_callback_basic_js_test") { ":huks_js_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "huksSignVerifyBasicCallbackJSApiTest" + hap_name = "ActsHuksSignVerifyBasicCallbackJSApiTest" } ohos_js_assets("huks_js_assets") { source_dir = "./entry/src/main/js/MainAbility" diff --git a/security/security_huks_basic/huks_signverify_callback_BasicTest/Test.json b/security/security_huks_basic/huks_signverify_callback_BasicTest/Test.json index 943a70d0e..8d637f980 100644 --- a/security/security_huks_basic/huks_signverify_callback_BasicTest/Test.json +++ b/security/security_huks_basic/huks_signverify_callback_BasicTest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "huksSignVerifyBasicCallbackJSApiTest.hap" + "ActsHuksSignVerifyBasicCallbackJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/security/security_huks_basic/huks_signverify_promise_BasicTest/BUILD.gn b/security/security_huks_basic/huks_signverify_promise_BasicTest/BUILD.gn index 4ad729db5..e4ae8d77e 100644 --- a/security/security_huks_basic/huks_signverify_promise_BasicTest/BUILD.gn +++ b/security/security_huks_basic/huks_signverify_promise_BasicTest/BUILD.gn @@ -19,7 +19,7 @@ ohos_js_hap_suite("hukssignverify_promise_basic_js_test") { ":huks_js_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "huksSignVerifyBasicPromiseJSApiTest" + hap_name = "ActsHuksSignVerifyBasicPromiseJSApiTest" } ohos_js_assets("huks_js_assets") { source_dir = "./entry/src/main/js/MainAbility" diff --git a/security/security_huks_basic/huks_signverify_promise_BasicTest/Test.json b/security/security_huks_basic/huks_signverify_promise_BasicTest/Test.json index 304d608ba..8375b5d60 100644 --- a/security/security_huks_basic/huks_signverify_promise_BasicTest/Test.json +++ b/security/security_huks_basic/huks_signverify_promise_BasicTest/Test.json @@ -2,14 +2,14 @@ "description": "Configuration for huksSignVerifyBasicPromise js api Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "12600000", + "test-timeout": "180000", "package": "com.example.hukssignverifybasicpromise", "shell-timeout": "60000" }, "kits": [ { "test-file-name": [ - "huksSignVerifyBasicPromiseJSApiTest.hap" + "ActsHuksSignVerifyBasicPromiseJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true -- GitLab