根据意见修改文件

Signed-off-by: Nhu0475 <huyanqiang5@huawei.com>

commonlibrary/crossplatform/BUILD.gn

@@ -16,15 +16,15 @@ group("crossplatform") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "commonlibraryconvertxmletstest:convertxml_ets_test",
-      "commonlibrarydequeetstest:deque_ets_test",
-      "commonlibraryhashmapetstest:hashmap_ets_test",
-      "commonlibraryhashsetetstest:hashset_ets_test",
-      "commonlibraryplainarrayetstest:plainarray_ets_test",
-      "commonlibrarytreesetetstest:treeset_ets_test",
-      "commonlibraryurietstest:uri_ets_test",
-      "commonlibraryurletstest:url_ets_test",
-      "commonlibraryutiletstest:util_ets_test",
+      "commonlibraryconvertxmletstest:ActsConvertxmlTest",
+      "commonlibrarydequeetstest:ActsDequeTest",
+      "commonlibraryhashmapetstest:ActsHashMapTest",
+      "commonlibraryhashsetetstest:ActsHashSetTest",
+      "commonlibraryplainarrayetstest:ActsPlainArrayTest",
+      "commonlibrarytreesetetstest:ActsTreeSetTest",
+      "commonlibraryurietstest:ActsUriTest",
+      "commonlibraryurletstest:ActsUrlTest",
+      "commonlibraryutiletstest:ActsUtilTest",
     ]
   }
 }

commonlibrary/crossplatform/commonlibraryconvertxmletstest/AppScope/app.json

@@ -6,10 +6,10 @@
     "versionName": "1.0.0",
     "icon": "$media:app_icon",
     "label": "$string:app_name",
-    "minAPIVersion": 9,
-    "targetAPIVersion": 9,
+    "minAPIVersion": 10,
+    "targetAPIVersion": 10,
     "car": {
-      "apiCompatibleVersion": 9,
+      "apiCompatibleVersion": 10,
       "singleUser": false
     }
   }

commonlibrary/crossplatform/commonlibraryconvertxmletstest/BUILD.gn

@@ -12,7 +12,7 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("convertxml_ets_test") {
+ohos_js_hap_suite("ActsConvertxmlTest") {
   hap_profile = "src/main/module.json"
   deps = [
     ":windowStage_js_assets",
@@ -22,7 +22,7 @@ ohos_js_hap_suite("convertxml_ets_test") {
   certificate_profile = "./signature/openharmony_sx.p7b"
 
   # hap_name: HAP的名字，可选，默认为目标名
-  hap_name = "convertxml_ets_test"
+  hap_name = "ActsConvertxmlTest"
   subsystem_name = "commonlibrary"
   part_name = "ets_utils"
 }

commonlibrary/crossplatform/commonlibraryconvertxmletstest/Test.json

@@ -18,7 +18,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsDemoStageTest.hap"
+                "ActsConvertxmlTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

commonlibrary/crossplatform/commonlibrarydequeetstest/AppScope/app.json

@@ -6,10 +6,10 @@
     "versionName": "1.0.0",
     "icon": "$media:app_icon",
     "label": "$string:app_name",
-    "minAPIVersion": 9,
-    "targetAPIVersion": 9,
+    "minAPIVersion": 10,
+    "targetAPIVersion": 10,
     "car": {
-      "apiCompatibleVersion": 9,
+      "apiCompatibleVersion": 10,
       "singleUser": false
     }
   }

commonlibrary/crossplatform/commonlibrarydequeetstest/BUILD.gn

@@ -12,7 +12,7 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("deque_ets_test") {
+ohos_js_hap_suite("ActsDequeTest") {
   hap_profile = "src/main/module.json"
   deps = [
     ":windowStage_js_assets",
@@ -22,7 +22,7 @@ ohos_js_hap_suite("deque_ets_test") {
   certificate_profile = "./signature/openharmony_sx.p7b"
 
   # hap_name: HAP的名字，可选，默认为目标名
-  hap_name = "deque_ets_test"
+  hap_name = "ActsDequeTest"
   subsystem_name = "commonlibrary"
   part_name = "ets_utils"
 }

commonlibrary/crossplatform/commonlibrarydequeetstest/Test.json

@@ -18,7 +18,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsDemoStageTest.hap"
+                "ActsDequeTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

commonlibrary/crossplatform/commonlibraryhashmapetstest/AppScope/app.json

@@ -6,10 +6,10 @@
     "versionName": "1.0.0",
     "icon": "$media:app_icon",
     "label": "$string:app_name",
-    "minAPIVersion": 9,
-    "targetAPIVersion": 9,
+    "minAPIVersion": 10,
+    "targetAPIVersion": 10,
     "car": {
-      "apiCompatibleVersion": 9,
+      "apiCompatibleVersion": 10,
       "singleUser": false
     }
   }

commonlibrary/crossplatform/commonlibraryhashmapetstest/BUILD.gn

@@ -12,7 +12,7 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("hashmap_ets_test") {
+ohos_js_hap_suite("ActsHashMapTest") {
   hap_profile = "src/main/module.json"
   deps = [
     ":windowStage_js_assets",
@@ -22,7 +22,7 @@ ohos_js_hap_suite("hashmap_ets_test") {
   certificate_profile = "./signature/openharmony_sx.p7b"
 
   # hap_name: HAP的名字，可选，默认为目标名
-  hap_name = "hashmap_ets_test"
+  hap_name = "ActsHashMapTest"
   subsystem_name = "commonlibrary"
   part_name = "ets_utils"
 }

commonlibrary/crossplatform/commonlibraryhashmapetstest/Test.json

@@ -18,7 +18,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsDemoStageTest.hap"
+                "ActsHashMapTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

commonlibrary/crossplatform/commonlibraryhashsetetstest/AppScope/app.json

@@ -6,10 +6,10 @@
     "versionName": "1.0.0",
     "icon": "$media:app_icon",
     "label": "$string:app_name",
-    "minAPIVersion": 9,
-    "targetAPIVersion": 9,
+    "minAPIVersion": 10,
+    "targetAPIVersion": 10,
     "car": {
-      "apiCompatibleVersion": 9,
+      "apiCompatibleVersion": 10,
       "singleUser": false
     }
   }

commonlibrary/crossplatform/commonlibraryhashsetetstest/BUILD.gn

@@ -12,7 +12,7 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("hashset_ets_test") {
+ohos_js_hap_suite("ActsHashSetTest") {
   hap_profile = "src/main/module.json"
   deps = [
     ":windowStage_js_assets",
@@ -22,7 +22,7 @@ ohos_js_hap_suite("hashset_ets_test") {
   certificate_profile = "./signature/openharmony_sx.p7b"
 
   # hap_name: HAP的名字，可选，默认为目标名
-  hap_name = "hashset_ets_test"
+  hap_name = "ActsHashSetTest"
   subsystem_name = "commonlibrary"
   part_name = "ets_utils"
 }

commonlibrary/crossplatform/commonlibraryhashsetetstest/Test.json

@@ -18,7 +18,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsDemoStageTest.hap"
+                "ActsHashSetTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

commonlibrary/crossplatform/commonlibraryplainarrayetstest/AppScope/app.json

@@ -6,10 +6,10 @@
     "versionName": "1.0.0",
     "icon": "$media:app_icon",
     "label": "$string:app_name",
-    "minAPIVersion": 9,
-    "targetAPIVersion": 9,
+    "minAPIVersion": 10,
+    "targetAPIVersion": 10,
     "car": {
-      "apiCompatibleVersion": 9,
+      "apiCompatibleVersion": 10,
       "singleUser": false
     }
   }

commonlibrary/crossplatform/commonlibraryplainarrayetstest/BUILD.gn

@@ -12,7 +12,7 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("plainarray_ets_test") {
+ohos_js_hap_suite("ActsPlainArrayTest") {
   hap_profile = "src/main/module.json"
   deps = [
     ":windowStage_js_assets",
@@ -22,7 +22,7 @@ ohos_js_hap_suite("plainarray_ets_test") {
   certificate_profile = "./signature/openharmony_sx.p7b"
 
   # hap_name: HAP的名字，可选，默认为目标名
-  hap_name = "plainarray_ets_test"
+  hap_name = "ActsPlainArrayTest"
   subsystem_name = "commonlibrary"
   part_name = "ets_utils"
 }

commonlibrary/crossplatform/commonlibraryplainarrayetstest/Test.json

@@ -18,7 +18,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsDemoStageTest.hap"
+                "ActsPlainArrayTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

commonlibrary/crossplatform/commonlibrarytreesetetstest/AppScope/app.json

@@ -6,10 +6,10 @@
     "versionName": "1.0.0",
     "icon": "$media:app_icon",
     "label": "$string:app_name",
-    "minAPIVersion": 9,
-    "targetAPIVersion": 9,
+    "minAPIVersion": 10,
+    "targetAPIVersion": 10,
     "car": {
-      "apiCompatibleVersion": 9,
+      "apiCompatibleVersion": 10,
       "singleUser": false
     }
   }

commonlibrary/crossplatform/commonlibrarytreesetetstest/BUILD.gn

@@ -12,7 +12,7 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("treeset_ets_test") {
+ohos_js_hap_suite("ActsTreeSetTest") {
   hap_profile = "src/main/module.json"
   deps = [
     ":windowStage_js_assets",
@@ -22,7 +22,7 @@ ohos_js_hap_suite("treeset_ets_test") {
   certificate_profile = "./signature/openharmony_sx.p7b"
 
   # hap_name: HAP的名字，可选，默认为目标名
-  hap_name = "treeset_ets_test"
+  hap_name = "ActsTreeSetTest"
   subsystem_name = "commonlibrary"
   part_name = "ets_utils"
 }

commonlibrary/crossplatform/commonlibrarytreesetetstest/Test.json

@@ -18,7 +18,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsDemoStageTest.hap"
+                "ActsTreeSetTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

commonlibrary/crossplatform/commonlibraryurietstest/AppScope/app.json

@@ -6,10 +6,10 @@
     "versionName": "1.0.0",
     "icon": "$media:app_icon",
     "label": "$string:app_name",
-    "minAPIVersion": 9,
-    "targetAPIVersion": 9,
+    "minAPIVersion": 10,
+    "targetAPIVersion": 10,
     "car": {
-      "apiCompatibleVersion": 9,
+      "apiCompatibleVersion": 10,
       "singleUser": false
     }
   }

commonlibrary/crossplatform/commonlibraryurietstest/BUILD.gn

@@ -12,7 +12,7 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("uri_ets_test") {
+ohos_js_hap_suite("ActsUriTest") {
   hap_profile = "src/main/module.json"
   deps = [
     ":windowStage_js_assets",
@@ -22,7 +22,7 @@ ohos_js_hap_suite("uri_ets_test") {
   certificate_profile = "./signature/openharmony_sx.p7b"
 
   # hap_name: HAP的名字，可选，默认为目标名
-  hap_name = "uri_ets_test"
+  hap_name = "ActsUriTest"
   subsystem_name = "commonlibrary"
   part_name = "ets_utils"
 }

commonlibrary/crossplatform/commonlibraryurietstest/Test.json

@@ -18,7 +18,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsDemoStageTest.hap"
+                "ActsUriTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

commonlibrary/crossplatform/commonlibraryurletstest/AppScope/app.json

@@ -6,10 +6,10 @@
     "versionName": "1.0.0",
     "icon": "$media:app_icon",
     "label": "$string:app_name",
-    "minAPIVersion": 9,
-    "targetAPIVersion": 9,
+    "minAPIVersion": 10,
+    "targetAPIVersion": 10,
     "car": {
-      "apiCompatibleVersion": 9,
+      "apiCompatibleVersion": 10,
       "singleUser": false
     }
   }

commonlibrary/crossplatform/commonlibraryurletstest/BUILD.gn

@@ -12,7 +12,7 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("url_ets_test") {
+ohos_js_hap_suite("ActsUrlTest") {
   hap_profile = "src/main/module.json"
   deps = [
     ":windowStage_js_assets",
@@ -22,7 +22,7 @@ ohos_js_hap_suite("url_ets_test") {
   certificate_profile = "./signature/openharmony_sx.p7b"
 
   # hap_name: HAP的名字，可选，默认为目标名
-  hap_name = "url_ets_test"
+  hap_name = "ActsUrlTest"
   subsystem_name = "commonlibrary"
   part_name = "ets_utils"
 }

commonlibrary/crossplatform/commonlibraryurletstest/Test.json

@@ -18,7 +18,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsDemoStageTest.hap"
+                "ActsUrlTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

commonlibrary/crossplatform/commonlibraryutiletstest/AppScope/app.json

@@ -6,10 +6,10 @@
     "versionName": "1.0.0",
     "icon": "$media:app_icon",
     "label": "$string:app_name",
-    "minAPIVersion": 9,
-    "targetAPIVersion": 9,
+    "minAPIVersion": 10,
+    "targetAPIVersion": 10,
     "car": {
-      "apiCompatibleVersion": 9,
+      "apiCompatibleVersion": 10,
       "singleUser": false
     }
   }

commonlibrary/crossplatform/commonlibraryutiletstest/BUILD.gn

@@ -12,7 +12,7 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("util_ets_test") {
+ohos_js_hap_suite("ActsUtilTest") {
   hap_profile = "src/main/module.json"
   deps = [
     ":windowStage_js_assets",
@@ -22,7 +22,7 @@ ohos_js_hap_suite("util_ets_test") {
   certificate_profile = "./signature/openharmony_sx.p7b"
 
   # hap_name: HAP的名字，可选，默认为目标名
-  hap_name = "util_ets_test"
+  hap_name = "ActsUtilTest"
   subsystem_name = "commonlibrary"
   part_name = "ets_utils"
 }

commonlibrary/crossplatform/commonlibraryutiletstest/Test.json

@@ -18,7 +18,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsDemoStageTest.hap"
+                "ActsUtilTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true