diff --git a/security/BUILD.gn b/security/BUILD.gn index d6f7e11697120c1a8a117230a7e993d38d10495e..ee3da331fbb0a1ff42e7992a17c04c7a7110157a 100644 --- a/security/BUILD.gn +++ b/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", diff --git a/security/cryptoFramework/js_api_test_two/BUILD.gn b/security/certificate_framework/js_api_test_one/BUILD.gn similarity index 90% rename from security/cryptoFramework/js_api_test_two/BUILD.gn rename to security/certificate_framework/js_api_test_one/BUILD.gn index 89c1cd59dd0656d326b71bd737122fd004414071..c4bd78f9ab290d85f575a1d6af3d9eff1556f364 100644 --- a/security/cryptoFramework/js_api_test_two/BUILD.gn +++ b/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" } diff --git a/security/cryptoFramework/js_api_test_two/Test.json b/security/certificate_framework/js_api_test_one/Test.json similarity index 63% rename from security/cryptoFramework/js_api_test_two/Test.json rename to security/certificate_framework/js_api_test_one/Test.json index f6d21ed1a87f817a001aaa3395b4f72e1fc0bff7..35271e3fa09bb226b3ecba9364791d623e638c3e 100644 --- a/security/cryptoFramework/js_api_test_two/Test.json +++ b/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" ] }, { diff --git a/security/cryptoFramework/js_api_test_two/signature/openharmony_sx.p7b b/security/certificate_framework/js_api_test_one/signature/openharmony_sx.p7b similarity index 86% rename from security/cryptoFramework/js_api_test_two/signature/openharmony_sx.p7b rename to security/certificate_framework/js_api_test_one/signature/openharmony_sx.p7b index 36abac301ab0eea93cbf9d3cd61b75060ce74c51..3781c426c56a13cf8054adc975a2d5e29cba77a0 100644 Binary files a/security/cryptoFramework/js_api_test_two/signature/openharmony_sx.p7b and b/security/certificate_framework/js_api_test_one/signature/openharmony_sx.p7b differ diff --git a/security/cryptoFramework/js_api_test_two/src/main/config.json b/security/certificate_framework/js_api_test_one/src/main/config.json similarity index 90% rename from security/cryptoFramework/js_api_test_two/src/main/config.json rename to security/certificate_framework/js_api_test_one/src/main/config.json index c585893881fd0d244b5d955e568529e3135e6047..ec36b83cefce00d61be072f6097b59d2340eb3a2 100644 --- a/security/cryptoFramework/js_api_test_two/src/main/config.json +++ b/security/certificate_framework/js_api_test_one/src/main/config.json @@ -1,6 +1,6 @@ { "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"], diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/MainAbility/app.js b/security/certificate_framework/js_api_test_one/src/main/js/MainAbility/app.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/MainAbility/app.js rename to security/certificate_framework/js_api_test_one/src/main/js/MainAbility/app.js diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/MainAbility/i18n/en-US.json b/security/certificate_framework/js_api_test_one/src/main/js/MainAbility/i18n/en-US.json similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/MainAbility/i18n/en-US.json rename to security/certificate_framework/js_api_test_one/src/main/js/MainAbility/i18n/en-US.json diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/MainAbility/i18n/zh-CN.json b/security/certificate_framework/js_api_test_one/src/main/js/MainAbility/i18n/zh-CN.json similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/MainAbility/i18n/zh-CN.json rename to security/certificate_framework/js_api_test_one/src/main/js/MainAbility/i18n/zh-CN.json diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/MainAbility/pages/index/index.css b/security/certificate_framework/js_api_test_one/src/main/js/MainAbility/pages/index/index.css similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/MainAbility/pages/index/index.css rename to security/certificate_framework/js_api_test_one/src/main/js/MainAbility/pages/index/index.css diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/MainAbility/pages/index/index.hml b/security/certificate_framework/js_api_test_one/src/main/js/MainAbility/pages/index/index.hml similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/MainAbility/pages/index/index.hml rename to security/certificate_framework/js_api_test_one/src/main/js/MainAbility/pages/index/index.hml diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/MainAbility/pages/index/index.js b/security/certificate_framework/js_api_test_one/src/main/js/MainAbility/pages/index/index.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/MainAbility/pages/index/index.js rename to security/certificate_framework/js_api_test_one/src/main/js/MainAbility/pages/index/index.js diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/TestAbility/app.js b/security/certificate_framework/js_api_test_one/src/main/js/TestAbility/app.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/TestAbility/app.js rename to security/certificate_framework/js_api_test_one/src/main/js/TestAbility/app.js diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/TestAbility/i18n/en-US.json b/security/certificate_framework/js_api_test_one/src/main/js/TestAbility/i18n/en-US.json similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/TestAbility/i18n/en-US.json rename to security/certificate_framework/js_api_test_one/src/main/js/TestAbility/i18n/en-US.json diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/TestAbility/i18n/zh-CN.json b/security/certificate_framework/js_api_test_one/src/main/js/TestAbility/i18n/zh-CN.json similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/TestAbility/i18n/zh-CN.json rename to security/certificate_framework/js_api_test_one/src/main/js/TestAbility/i18n/zh-CN.json diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/TestAbility/pages/index/index.css b/security/certificate_framework/js_api_test_one/src/main/js/TestAbility/pages/index/index.css similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/TestAbility/pages/index/index.css rename to security/certificate_framework/js_api_test_one/src/main/js/TestAbility/pages/index/index.css diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/TestAbility/pages/index/index.hml b/security/certificate_framework/js_api_test_one/src/main/js/TestAbility/pages/index/index.hml similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/TestAbility/pages/index/index.hml rename to security/certificate_framework/js_api_test_one/src/main/js/TestAbility/pages/index/index.hml diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/TestAbility/pages/index/index.js b/security/certificate_framework/js_api_test_one/src/main/js/TestAbility/pages/index/index.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/TestAbility/pages/index/index.js rename to security/certificate_framework/js_api_test_one/src/main/js/TestAbility/pages/index/index.js diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/security/certificate_framework/js_api_test_one/src/main/js/TestRunner/OpenHarmonyTestRunner.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/TestRunner/OpenHarmonyTestRunner.js rename to security/certificate_framework/js_api_test_one/src/main/js/TestRunner/OpenHarmonyTestRunner.js diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/test/Certificate.test.js b/security/certificate_framework/js_api_test_one/src/main/js/test/Certificate.test.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/test/Certificate.test.js rename to security/certificate_framework/js_api_test_one/src/main/js/test/Certificate.test.js diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/test/CertificateCrl.test.js b/security/certificate_framework/js_api_test_one/src/main/js/test/CertificateCrl.test.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/test/CertificateCrl.test.js rename to security/certificate_framework/js_api_test_one/src/main/js/test/CertificateCrl.test.js diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/test/List.test.js b/security/certificate_framework/js_api_test_one/src/main/js/test/List.test.js similarity index 90% rename from security/cryptoFramework/js_api_test_two/src/main/js/test/List.test.js rename to security/certificate_framework/js_api_test_one/src/main/js/test/List.test.js index 830530f9fcf17b7dac1f5a43472f32b6ae8c222f..55b4e70f2eb48cec2dab88b82087675897d0a449 100644 --- a/security/cryptoFramework/js_api_test_two/src/main/js/test/List.test.js +++ b/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(); } diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/test/utils/certificate/publicCertificateCallback.js b/security/certificate_framework/js_api_test_one/src/main/js/test/utils/certificate/publicCertificateCallback.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/test/utils/certificate/publicCertificateCallback.js rename to security/certificate_framework/js_api_test_one/src/main/js/test/utils/certificate/publicCertificateCallback.js diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/test/utils/certificate/publicCertificatePromise.js b/security/certificate_framework/js_api_test_one/src/main/js/test/utils/certificate/publicCertificatePromise.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/test/utils/certificate/publicCertificatePromise.js rename to security/certificate_framework/js_api_test_one/src/main/js/test/utils/certificate/publicCertificatePromise.js diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/test/utils/common/publicDoString.js b/security/certificate_framework/js_api_test_one/src/main/js/test/utils/common/publicDoString.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/test/utils/common/publicDoString.js rename to security/certificate_framework/js_api_test_one/src/main/js/test/utils/common/publicDoString.js diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/test/utils/common/publicParam.js b/security/certificate_framework/js_api_test_one/src/main/js/test/utils/common/publicParam.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/test/utils/common/publicParam.js rename to security/certificate_framework/js_api_test_one/src/main/js/test/utils/common/publicParam.js diff --git a/security/cryptoFramework/js_api_test_two/src/main/resources/base/element/string.json b/security/certificate_framework/js_api_test_one/src/main/resources/base/element/string.json similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/resources/base/element/string.json rename to security/certificate_framework/js_api_test_one/src/main/resources/base/element/string.json diff --git a/security/cryptoFramework/js_api_test_two/src/main/resources/base/media/icon.png b/security/certificate_framework/js_api_test_one/src/main/resources/base/media/icon.png similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/resources/base/media/icon.png rename to security/certificate_framework/js_api_test_one/src/main/resources/base/media/icon.png diff --git a/security/cryptoFramework/js_api_test_one/src/main/js/test/List.test.js b/security/cryptoFramework/js_api_test_one/src/main/js/test/List.test.js index 1bbe4a625ce4894ecd45bf1af09d13f4d9a4780d..628efc6671cdfd8b5c1cd1f66b31a6924222c7e9 100644 --- a/security/cryptoFramework/js_api_test_one/src/main/js/test/List.test.js +++ b/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(); } diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/test/SecurityRandom.test.js b/security/cryptoFramework/js_api_test_one/src/main/js/test/SecurityRandom.test.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/test/SecurityRandom.test.js rename to security/cryptoFramework/js_api_test_one/src/main/js/test/SecurityRandom.test.js diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/test/utils/securityrandom/publicSecurityRandomCallback.js b/security/cryptoFramework/js_api_test_one/src/main/js/test/utils/securityrandom/publicSecurityRandomCallback.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/test/utils/securityrandom/publicSecurityRandomCallback.js rename to security/cryptoFramework/js_api_test_one/src/main/js/test/utils/securityrandom/publicSecurityRandomCallback.js diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/test/utils/securityrandom/publicSecurityRandomCommon.js b/security/cryptoFramework/js_api_test_one/src/main/js/test/utils/securityrandom/publicSecurityRandomCommon.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/test/utils/securityrandom/publicSecurityRandomCommon.js rename to security/cryptoFramework/js_api_test_one/src/main/js/test/utils/securityrandom/publicSecurityRandomCommon.js diff --git a/security/cryptoFramework/js_api_test_two/src/main/js/test/utils/securityrandom/publicSecurityRandomPromise.js b/security/cryptoFramework/js_api_test_one/src/main/js/test/utils/securityrandom/publicSecurityRandomPromise.js similarity index 100% rename from security/cryptoFramework/js_api_test_two/src/main/js/test/utils/securityrandom/publicSecurityRandomPromise.js rename to security/cryptoFramework/js_api_test_one/src/main/js/test/utils/securityrandom/publicSecurityRandomPromise.js