From a5ba8b9ae7d38a73fe6acb7dd5cbe034f7ca611d Mon Sep 17 00:00:00 2001
From: hu-jixiang1 <hujixiang1@huawei.com>
Date: Sun, 24 Apr 2022 18:48:04 +0800
Subject: [PATCH] huks code

Signed-off-by: hu-jixiang1 <hujixiang1@huawei.com>
Change-Id: I5f81e9796dee9c8d172186a6d311c30dfefcc33f
---
 .../huks_agree_callback_BasicTest/BUILD.gn                    | 4 ++--
 .../huks_agree_callback_BasicTest/Test.json                   | 4 ++--
 .../security_huks_basic/huks_agree_promise_BasicTest/BUILD.gn | 4 ++--
 .../huks_agree_promise_BasicTest/Test.json                    | 4 ++--
 .../huks_cipher_callback_BasicTest/BUILD.gn                   | 4 ++--
 .../huks_cipher_callback_BasicTest/Test.json                  | 4 ++--
 .../huks_cipher_promise_BasicTest/BUILD.gn                    | 4 ++--
 .../huks_cipher_promise_BasicTest/Test.json                   | 4 ++--
 .../huks_derive_callback_BasicTest/BUILD.gn                   | 4 ++--
 .../huks_derive_callback_BasicTest/Test.json                  | 4 ++--
 .../huks_derive_promise_BasicTest/BUILD.gn                    | 4 ++--
 .../huks_derive_promise_BasicTest/Test.json                   | 4 ++--
 .../security_huks_basic/huks_hmac_callback_BasicTest/BUILD.gn | 4 ++--
 .../huks_hmac_callback_BasicTest/Test.json                    | 4 ++--
 .../security_huks_basic/huks_hmac_promise_BasicTest/BUILD.gn  | 4 ++--
 .../security_huks_basic/huks_hmac_promise_BasicTest/Test.json | 4 ++--
 .../huks_signverify_callback_BasicTest/BUILD.gn               | 4 ++--
 .../huks_signverify_callback_BasicTest/Test.json              | 4 ++--
 .../huks_signverify_promise_BasicTest/BUILD.gn                | 4 ++--
 .../huks_signverify_promise_BasicTest/Test.json               | 4 ++--
 20 files changed, 40 insertions(+), 40 deletions(-)

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..dd1fab665 100644
--- a/security/security_huks_basic/huks_agree_callback_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_agree_callback_BasicTest/BUILD.gn
@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("huksagree_callback_basic_js_test") {
+ohos_js_hap_suite("acts_huksagree_callback_basic_js_test") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":huks_js_assets",
     ":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..d339724ca 100644
--- a/security/security_huks_basic/huks_agree_callback_BasicTest/Test.json
+++ b/security/security_huks_basic/huks_agree_callback_BasicTest/Test.json
@@ -2,14 +2,14 @@
   "description": "Configuration for huksAgreeBasicCallback js api Tests",
   "driver": {
     "type": "JSUnitTest",
-    "test-timeout": "4200000",
+    "test-timeout": "180000",
     "package": "com.example.huksagreebasiccallback",
     "shell-timeout": "60000"
   },
   "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..ce92aa296 100644
--- a/security/security_huks_basic/huks_agree_promise_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_agree_promise_BasicTest/BUILD.gn
@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("huksagree_promise_basic_js_test") {
+ohos_js_hap_suite("acts_huksagree_promise_basic_js_test") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":huks_js_assets",
     ":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..e3c263ce7 100644
--- a/security/security_huks_basic/huks_cipher_callback_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_cipher_callback_BasicTest/BUILD.gn
@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("hukscipher_callback_basic_js_test") {
+ohos_js_hap_suite("acts_hukscipher_callback_basic_js_test") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":huks_js_assets",
     ":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..2c6721af0 100644
--- a/security/security_huks_basic/huks_cipher_promise_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_cipher_promise_BasicTest/BUILD.gn
@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("hukscipher_promise_basic_js_test") {
+ohos_js_hap_suite("acts_hukscipher_promise_basic_js_test") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":huks_js_assets",
     ":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..08e8ebc9b 100644
--- a/security/security_huks_basic/huks_derive_callback_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_derive_callback_BasicTest/BUILD.gn
@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("huksderive_callback_basic_js_test") {
+ohos_js_hap_suite("acts_huksderive_callback_basic_js_test") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":huks_js_assets",
     ":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..ef2510a80 100644
--- a/security/security_huks_basic/huks_derive_promise_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_derive_promise_BasicTest/BUILD.gn
@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("huksderive_promise_basic_js_test") {
+ohos_js_hap_suite("acts_huksderive_promise_basic_js_test") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":huks_js_assets",
     ":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..e0818ddc1 100644
--- a/security/security_huks_basic/huks_hmac_callback_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_hmac_callback_BasicTest/BUILD.gn
@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("hukshmac_callback_basic_js_test") {
+ohos_js_hap_suite("acts_hukshmac_callback_basic_js_test") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":huks_js_assets",
     ":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..b16dccb57 100644
--- a/security/security_huks_basic/huks_hmac_promise_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_hmac_promise_BasicTest/BUILD.gn
@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("hukshmac_promise_basic_js_test") {
+ohos_js_hap_suite("acts_hukshmac_promise_basic_js_test") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":huks_js_assets",
     ":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..d1f80d1d4 100644
--- a/security/security_huks_basic/huks_signverify_callback_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_signverify_callback_BasicTest/BUILD.gn
@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("hukssignverify_callback_basic_js_test") {
+ohos_js_hap_suite("acts_hukssignverify_callback_basic_js_test") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":huks_js_assets",
     ":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..c33854cb2 100644
--- a/security/security_huks_basic/huks_signverify_callback_BasicTest/Test.json
+++ b/security/security_huks_basic/huks_signverify_callback_BasicTest/Test.json
@@ -2,14 +2,14 @@
   "description": "Configuration for huksSignVerifyBasicCallback js api Tests",
   "driver": {
     "type": "JSUnitTest",
-    "test-timeout": "12600000",
+    "test-timeout": "180000",
     "package": "com.example.hukssignverifybasiccallback",
     "shell-timeout": "60000"
   },
   "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..00abb389a 100644
--- a/security/security_huks_basic/huks_signverify_promise_BasicTest/BUILD.gn
+++ b/security/security_huks_basic/huks_signverify_promise_BasicTest/BUILD.gn
@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("hukssignverify_promise_basic_js_test") {
+ohos_js_hap_suite("acts_hukssignverify_promise_basic_js_test") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":huks_js_assets",
     ":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