From c9fde5c9bcd1264bf02040cd5eea2d03baa1c056 Mon Sep 17 00:00:00 2001 From: hu0475 Date: Thu, 13 Jul 2023 16:48:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: hu0475 --- commonlibrary/crossplatform/BUILD.gn | 18 +++++++++--------- .../commonlibraryconvertxmletstest/BUILD.gn | 4 ++-- .../commonlibraryconvertxmletstest/Test.json | 2 +- .../commonlibrarydequeetstest/BUILD.gn | 4 ++-- .../commonlibrarydequeetstest/Test.json | 2 +- .../commonlibraryhashmapetstest/BUILD.gn | 4 ++-- .../commonlibraryhashmapetstest/Test.json | 2 +- .../commonlibraryhashsetetstest/BUILD.gn | 4 ++-- .../commonlibraryhashsetetstest/Test.json | 2 +- .../commonlibraryplainarrayetstest/BUILD.gn | 4 ++-- .../commonlibraryplainarrayetstest/Test.json | 2 +- .../commonlibrarytreesetetstest/BUILD.gn | 4 ++-- .../commonlibrarytreesetetstest/Test.json | 2 +- .../commonlibraryurietstest/BUILD.gn | 4 ++-- .../commonlibraryurietstest/Test.json | 2 +- .../commonlibraryurletstest/BUILD.gn | 4 ++-- .../commonlibraryurletstest/Test.json | 2 +- .../commonlibraryutiletstest/BUILD.gn | 4 ++-- .../commonlibraryutiletstest/Test.json | 2 +- 19 files changed, 36 insertions(+), 36 deletions(-) diff --git a/commonlibrary/crossplatform/BUILD.gn b/commonlibrary/crossplatform/BUILD.gn index f32844ecb..d1c3c8a0d 100644 --- a/commonlibrary/crossplatform/BUILD.gn +++ b/commonlibrary/crossplatform/BUILD.gn @@ -16,15 +16,15 @@ group("crossplatform") { testonly = true if (is_standard_system) { deps = [ - "commonlibraryconvertxmletstest:ActsConvertxmlTest", - "commonlibrarydequeetstest:ActsDequeTest", - "commonlibraryhashmapetstest:ActsHashMapTest", - "commonlibraryhashsetetstest:ActsHashSetTest", - "commonlibraryplainarrayetstest:ActsPlainArrayTest", - "commonlibrarytreesetetstest:ActsTreeSetTest", - "commonlibraryurietstest:ActsUriTest", - "commonlibraryurletstest:ActsUrlTest", - "commonlibraryutiletstest:ActsUtilTest", + "commonlibraryconvertxmletstest:ActsCrossplatformConvertxmlTest", + "commonlibrarydequeetstest:ActsCrossplatformDequeTest", + "commonlibraryhashmapetstest:ActsCrossplatformHashMapTest", + "commonlibraryhashsetetstest:ActsCrossplatformHashSetTest", + "commonlibraryplainarrayetstest:ActsCrossplatformPlainArrayTest", + "commonlibrarytreesetetstest:ActsCrossplatformTreeSetTest", + "commonlibraryurietstest:ActsCrossplatformUriTest", + "commonlibraryurletstest:ActsCrossplatformUrlTest", + "commonlibraryutiletstest:ActsCrossplatformUtilTest", ] } } diff --git a/commonlibrary/crossplatform/commonlibraryconvertxmletstest/BUILD.gn b/commonlibrary/crossplatform/commonlibraryconvertxmletstest/BUILD.gn index 60552c137..b067b76ea 100644 --- a/commonlibrary/crossplatform/commonlibraryconvertxmletstest/BUILD.gn +++ b/commonlibrary/crossplatform/commonlibraryconvertxmletstest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsConvertxmlTest") { +ohos_js_hap_suite("ActsCrossplatformConvertxmlTest") { hap_profile = "src/main/module.json" deps = [ ":windowStage_js_assets", @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsConvertxmlTest") { certificate_profile = "./signature/openharmony_sx.p7b" # hap_name: HAP的名字，可选，默认为目标名 - hap_name = "ActsConvertxmlTest" + hap_name = "ActsCrossplatformConvertxmlTest" subsystem_name = "commonlibrary" part_name = "ets_utils" } diff --git a/commonlibrary/crossplatform/commonlibraryconvertxmletstest/Test.json b/commonlibrary/crossplatform/commonlibraryconvertxmletstest/Test.json index a24937f75..adb1ba84a 100644 --- a/commonlibrary/crossplatform/commonlibraryconvertxmletstest/Test.json +++ b/commonlibrary/crossplatform/commonlibraryconvertxmletstest/Test.json @@ -18,7 +18,7 @@ "kits": [ { "test-file-name": [ - "ActsConvertxmlTest.hap" + "ActsCrossplatformConvertxmlTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/commonlibrary/crossplatform/commonlibrarydequeetstest/BUILD.gn b/commonlibrary/crossplatform/commonlibrarydequeetstest/BUILD.gn index 2c4785eaa..900f27ebc 100644 --- a/commonlibrary/crossplatform/commonlibrarydequeetstest/BUILD.gn +++ b/commonlibrary/crossplatform/commonlibrarydequeetstest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsDequeTest") { +ohos_js_hap_suite("ActsCrossplatformDequeTest") { hap_profile = "src/main/module.json" deps = [ ":windowStage_js_assets", @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsDequeTest") { certificate_profile = "./signature/openharmony_sx.p7b" # hap_name: HAP的名字，可选，默认为目标名 - hap_name = "ActsDequeTest" + hap_name = "ActsCrossplatformDequeTest" subsystem_name = "commonlibrary" part_name = "ets_utils" } diff --git a/commonlibrary/crossplatform/commonlibrarydequeetstest/Test.json b/commonlibrary/crossplatform/commonlibrarydequeetstest/Test.json index c07323311..a417beae0 100644 --- a/commonlibrary/crossplatform/commonlibrarydequeetstest/Test.json +++ b/commonlibrary/crossplatform/commonlibrarydequeetstest/Test.json @@ -18,7 +18,7 @@ "kits": [ { "test-file-name": [ - "ActsDequeTest.hap" + "ActsCrossplatformDequeTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/commonlibrary/crossplatform/commonlibraryhashmapetstest/BUILD.gn b/commonlibrary/crossplatform/commonlibraryhashmapetstest/BUILD.gn index 95ba50e54..abcfb0567 100644 --- a/commonlibrary/crossplatform/commonlibraryhashmapetstest/BUILD.gn +++ b/commonlibrary/crossplatform/commonlibraryhashmapetstest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsHashMapTest") { +ohos_js_hap_suite("ActsCrossplatformHashMapTest") { hap_profile = "src/main/module.json" deps = [ ":windowStage_js_assets", @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsHashMapTest") { certificate_profile = "./signature/openharmony_sx.p7b" # hap_name: HAP的名字，可选，默认为目标名 - hap_name = "ActsHashMapTest" + hap_name = "ActsCrossplatformHashMapTest" subsystem_name = "commonlibrary" part_name = "ets_utils" } diff --git a/commonlibrary/crossplatform/commonlibraryhashmapetstest/Test.json b/commonlibrary/crossplatform/commonlibraryhashmapetstest/Test.json index f6dab7322..57bd907f8 100644 --- a/commonlibrary/crossplatform/commonlibraryhashmapetstest/Test.json +++ b/commonlibrary/crossplatform/commonlibraryhashmapetstest/Test.json @@ -18,7 +18,7 @@ "kits": [ { "test-file-name": [ - "ActsHashMapTest.hap" + "ActsCrossplatformHashMapTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/commonlibrary/crossplatform/commonlibraryhashsetetstest/BUILD.gn b/commonlibrary/crossplatform/commonlibraryhashsetetstest/BUILD.gn index 9fefa3ad5..56f5f71fb 100644 --- a/commonlibrary/crossplatform/commonlibraryhashsetetstest/BUILD.gn +++ b/commonlibrary/crossplatform/commonlibraryhashsetetstest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsHashSetTest") { +ohos_js_hap_suite("ActsCrossplatformHashSetTest") { hap_profile = "src/main/module.json" deps = [ ":windowStage_js_assets", @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsHashSetTest") { certificate_profile = "./signature/openharmony_sx.p7b" # hap_name: HAP的名字，可选，默认为目标名 - hap_name = "ActsHashSetTest" + hap_name = "ActsCrossplatformHashSetTest" subsystem_name = "commonlibrary" part_name = "ets_utils" } diff --git a/commonlibrary/crossplatform/commonlibraryhashsetetstest/Test.json b/commonlibrary/crossplatform/commonlibraryhashsetetstest/Test.json index 1b30ba498..7f14d218d 100644 --- a/commonlibrary/crossplatform/commonlibraryhashsetetstest/Test.json +++ b/commonlibrary/crossplatform/commonlibraryhashsetetstest/Test.json @@ -18,7 +18,7 @@ "kits": [ { "test-file-name": [ - "ActsHashSetTest.hap" + "ActsCrossplatformHashSetTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/commonlibrary/crossplatform/commonlibraryplainarrayetstest/BUILD.gn b/commonlibrary/crossplatform/commonlibraryplainarrayetstest/BUILD.gn index 1ad458a0c..e220b255e 100644 --- a/commonlibrary/crossplatform/commonlibraryplainarrayetstest/BUILD.gn +++ b/commonlibrary/crossplatform/commonlibraryplainarrayetstest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsPlainArrayTest") { +ohos_js_hap_suite("ActsCrossplatformPlainArrayTest") { hap_profile = "src/main/module.json" deps = [ ":windowStage_js_assets", @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsPlainArrayTest") { certificate_profile = "./signature/openharmony_sx.p7b" # hap_name: HAP的名字，可选，默认为目标名 - hap_name = "ActsPlainArrayTest" + hap_name = "ActsCrossplatformPlainArrayTest" subsystem_name = "commonlibrary" part_name = "ets_utils" } diff --git a/commonlibrary/crossplatform/commonlibraryplainarrayetstest/Test.json b/commonlibrary/crossplatform/commonlibraryplainarrayetstest/Test.json index 92916342e..a2adede2b 100644 --- a/commonlibrary/crossplatform/commonlibraryplainarrayetstest/Test.json +++ b/commonlibrary/crossplatform/commonlibraryplainarrayetstest/Test.json @@ -18,7 +18,7 @@ "kits": [ { "test-file-name": [ - "ActsPlainArrayTest.hap" + "ActsCrossplatformPlainArrayTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/commonlibrary/crossplatform/commonlibrarytreesetetstest/BUILD.gn b/commonlibrary/crossplatform/commonlibrarytreesetetstest/BUILD.gn index e7b461283..4b892be28 100644 --- a/commonlibrary/crossplatform/commonlibrarytreesetetstest/BUILD.gn +++ b/commonlibrary/crossplatform/commonlibrarytreesetetstest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsTreeSetTest") { +ohos_js_hap_suite("ActsCrossplatformTreeSetTest") { hap_profile = "src/main/module.json" deps = [ ":windowStage_js_assets", @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsTreeSetTest") { certificate_profile = "./signature/openharmony_sx.p7b" # hap_name: HAP的名字，可选，默认为目标名 - hap_name = "ActsTreeSetTest" + hap_name = "ActsCrossplatformTreeSetTest" subsystem_name = "commonlibrary" part_name = "ets_utils" } diff --git a/commonlibrary/crossplatform/commonlibrarytreesetetstest/Test.json b/commonlibrary/crossplatform/commonlibrarytreesetetstest/Test.json index 09aac14ab..6fbffe183 100644 --- a/commonlibrary/crossplatform/commonlibrarytreesetetstest/Test.json +++ b/commonlibrary/crossplatform/commonlibrarytreesetetstest/Test.json @@ -18,7 +18,7 @@ "kits": [ { "test-file-name": [ - "ActsTreeSetTest.hap" + "ActsCrossplatformTreeSetTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/commonlibrary/crossplatform/commonlibraryurietstest/BUILD.gn b/commonlibrary/crossplatform/commonlibraryurietstest/BUILD.gn index f4f0a64a2..13a9a7652 100644 --- a/commonlibrary/crossplatform/commonlibraryurietstest/BUILD.gn +++ b/commonlibrary/crossplatform/commonlibraryurietstest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsUriTest") { +ohos_js_hap_suite("ActsCrossplatformUriTest") { hap_profile = "src/main/module.json" deps = [ ":windowStage_js_assets", @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsUriTest") { certificate_profile = "./signature/openharmony_sx.p7b" # hap_name: HAP的名字，可选，默认为目标名 - hap_name = "ActsUriTest" + hap_name = "ActsCrossplatformUriTest" subsystem_name = "commonlibrary" part_name = "ets_utils" } diff --git a/commonlibrary/crossplatform/commonlibraryurietstest/Test.json b/commonlibrary/crossplatform/commonlibraryurietstest/Test.json index 294248dba..978230409 100644 --- a/commonlibrary/crossplatform/commonlibraryurietstest/Test.json +++ b/commonlibrary/crossplatform/commonlibraryurietstest/Test.json @@ -18,7 +18,7 @@ "kits": [ { "test-file-name": [ - "ActsUriTest.hap" + "ActsCrossplatformUriTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/commonlibrary/crossplatform/commonlibraryurletstest/BUILD.gn b/commonlibrary/crossplatform/commonlibraryurletstest/BUILD.gn index 1a414d98d..de2f06033 100644 --- a/commonlibrary/crossplatform/commonlibraryurletstest/BUILD.gn +++ b/commonlibrary/crossplatform/commonlibraryurletstest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsUrlTest") { +ohos_js_hap_suite("ActsCrossplatformUrlTest") { hap_profile = "src/main/module.json" deps = [ ":windowStage_js_assets", @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsUrlTest") { certificate_profile = "./signature/openharmony_sx.p7b" # hap_name: HAP的名字，可选，默认为目标名 - hap_name = "ActsUrlTest" + hap_name = "ActsCrossplatformUrlTest" subsystem_name = "commonlibrary" part_name = "ets_utils" } diff --git a/commonlibrary/crossplatform/commonlibraryurletstest/Test.json b/commonlibrary/crossplatform/commonlibraryurletstest/Test.json index 064be19b9..3e92f8d48 100644 --- a/commonlibrary/crossplatform/commonlibraryurletstest/Test.json +++ b/commonlibrary/crossplatform/commonlibraryurletstest/Test.json @@ -18,7 +18,7 @@ "kits": [ { "test-file-name": [ - "ActsUrlTest.hap" + "ActsCrossplatformUrlTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/commonlibrary/crossplatform/commonlibraryutiletstest/BUILD.gn b/commonlibrary/crossplatform/commonlibraryutiletstest/BUILD.gn index 61d3d0912..0190c57bc 100644 --- a/commonlibrary/crossplatform/commonlibraryutiletstest/BUILD.gn +++ b/commonlibrary/crossplatform/commonlibraryutiletstest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsUtilTest") { +ohos_js_hap_suite("ActsCrossplatformUtilTest") { hap_profile = "src/main/module.json" deps = [ ":windowStage_js_assets", @@ -22,7 +22,7 @@ ohos_js_hap_suite("ActsUtilTest") { certificate_profile = "./signature/openharmony_sx.p7b" # hap_name: HAP的名字，可选，默认为目标名 - hap_name = "ActsUtilTest" + hap_name = "ActsCrossplatformUtilTest" subsystem_name = "commonlibrary" part_name = "ets_utils" } diff --git a/commonlibrary/crossplatform/commonlibraryutiletstest/Test.json b/commonlibrary/crossplatform/commonlibraryutiletstest/Test.json index 24d787f6b..7111f525c 100644 --- a/commonlibrary/crossplatform/commonlibraryutiletstest/Test.json +++ b/commonlibrary/crossplatform/commonlibraryutiletstest/Test.json @@ -18,7 +18,7 @@ "kits": [ { "test-file-name": [ - "ActsUtilTest.hap" + "ActsCrossplatformUtilTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true -- GitLab