加解密测试套适配

Signed-off-by: Nqiaozzzh <qiaozhang@huawei.com>
Change-Id: Iee3a332d3f52e41a9c69c7e75a785fbb14b50ceb

security/BUILD.gn

@@ -18,9 +18,9 @@ group("security") {
   if (is_standard_system) {
     deps = [
       "access_token/AccessTokenTest_Normal_js:ActsAccessTokenApiJSNormalTest",
+      "certificate_framework/js_api_test_one:ActsCertificateFrameworkJSNormalTest",
       "cipher/datacipher:datacipher",
       "cryptoFramework/js_api_test_one:ActsCryptoFrameworkJSNormalTest",
-      "cryptoFramework/js_api_test_two:ActsCryptoFrameworkJSNormalTwoTest",
       "huks_napi_BasicTest:ActsHuksNAPITest",
       "security_huks_basic",
       "security_huks_reformed_test",

security/cryptoFramework/js_api_test_two/BUILD.gn → security/certificate_framework/js_api_test_one/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsCryptoFrameworkJSNormalTwoTest") {
+ohos_js_hap_suite("ActsCertificateFrameworkJSNormalTest") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsCryptoFrameworkJSNormalTwoTest"
+  hap_name = "ActsCertificateFrameworkJSNormalTest"
   subsystem_name = "security"
   part_name = "crypto_framework"
 }

security/cryptoFramework/js_api_test_two/Test.json → security/certificate_framework/js_api_test_one/Test.json

@@ -5,12 +5,12 @@
     "test-timeout": "900000",
     "shell-timeout": "900000",
     "testcase-timeout": "60000",
-    "bundle-name": "com.openharmony.cryptoFramework2",
-    "package-name": "com.openharmony.cryptoFramework2"
+    "bundle-name": "com.openharmony.certificateframework",
+    "package-name": "com.openharmony.certificateframework"
   },
   "kits": [
     {
-      "test-file-name": ["ActsCryptoFrameworkJSNormalTwoTest.hap"],
+      "test-file-name": ["ActsCertificateFrameworkJSNormalTest.hap"],
       "type": "AppInstallKit",
       "cleanup-apps": true
     },
@@ -21,7 +21,7 @@
     {
       "type": "PushKit",
       "push": [
-        "ActsCryptoFrameworkJSNormalTwoTest.hap->/data/test/ActsCryptoFrameworkJSNormalTwoTest.hap"
+        "ActsCertificateFrameworkJSNormalTest.hap->/data/test/ActsCertificateFrameworkJSNormalTest.hap"
       ]
     },
     {

security/cryptoFramework/js_api_test_two/src/main/config.json → security/certificate_framework/js_api_test_one/src/main/config.json

 {
   "app": {
-    "bundleName": "com.openharmony.cryptoFramework2",
+    "bundleName": "com.openharmony.certificateframework",
     "vendor": "acts",
     "version": {
       "code": 12,
@@ -14,7 +14,7 @@
   },
   "deviceConfig": {},
   "module": {
-    "package": "com.openharmony.cryptoFramework2",
+    "package": "com.openharmony.certificateframework",
     "name": ".entry",
     "mainAbility": ".MainAbility",
     "deviceType": ["default", "tablet", "tv", "wearable", "phone"],

security/cryptoFramework/js_api_test_two/src/main/js/test/List.test.js → security/certificate_framework/js_api_test_one/src/main/js/test/List.test.js

@@ -13,12 +13,10 @@
  * limitations under the License.
  */
 
-import SecurityRandomJsunit from "./SecurityRandom.test";
 import CertificateJsunit from "./Certificate.test";
 import CertificateCrlJsunit from "./CertificateCrl.test";
 
 export default function testsuite() {
-  SecurityRandomJsunit();
   CertificateJsunit();
   CertificateCrlJsunit();
 }

security/cryptoFramework/js_api_test_one/src/main/js/test/List.test.js

@@ -16,9 +16,11 @@
 import SymmetricCryptographyJsunit from "./SymmetricCryptography.test";
 import AsymmetricCryptographyJsunit from "./AsymmetricCryptography.test";
 import DigestAlgorithmJsunit from "./DigestAlgorithm.test";
+import SecurityRandomJsunit from "./SecurityRandom.test";
 
 export default function testsuite() {
   SymmetricCryptographyJsunit();
   AsymmetricCryptographyJsunit();
   DigestAlgorithmJsunit();
+  SecurityRandomJsunit();
 }