From 4a03f37486f356780798c40b47b8a926cb89a464 Mon Sep 17 00:00:00 2001
From: hu0475 <huyanqiang5@huawei.com>
Date: Thu, 13 Jul 2023 19:28:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9hap=E5=8C=85=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: hu0475 <huyanqiang5@huawei.com>
---
 commonlibrary/BUILD.gn                                 |  2 +-
 .../commonlibraryxmletstest/AppScope/app.json          |  6 +++---
 .../crossplatform/commonlibraryxmletstest/BUILD.gn     |  6 +++---
 .../crossplatform/commonlibraryxmletstest/Test.json    | 10 +---------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/commonlibrary/BUILD.gn b/commonlibrary/BUILD.gn
index 8c24c3edd..8be5c3b97 100644
--- a/commonlibrary/BUILD.gn
+++ b/commonlibrary/BUILD.gn
@@ -16,9 +16,9 @@ group("commonlibrary") {
   testonly = true
   if (is_standard_system) {
     deps = [
+      "crossplatform/commonlibraryxmletstest:ActsCrossplatformXmlTest",
       "ets_utils:ets_utils",
       "toolchain:toolchain",
-      "crossplatform/commonlibraryxmletstest:xml_ets_test"
     ]
   }
 }
diff --git a/commonlibrary/crossplatform/commonlibraryxmletstest/AppScope/app.json b/commonlibrary/crossplatform/commonlibraryxmletstest/AppScope/app.json
index b0ff7210a..6f58491dd 100644
--- a/commonlibrary/crossplatform/commonlibraryxmletstest/AppScope/app.json
+++ b/commonlibrary/crossplatform/commonlibraryxmletstest/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
     }
   }
diff --git a/commonlibrary/crossplatform/commonlibraryxmletstest/BUILD.gn b/commonlibrary/crossplatform/commonlibraryxmletstest/BUILD.gn
index 421e401b5..1e30153a2 100644
--- a/commonlibrary/crossplatform/commonlibraryxmletstest/BUILD.gn
+++ b/commonlibrary/crossplatform/commonlibraryxmletstest/BUILD.gn
@@ -12,7 +12,7 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("xml_ets_test") {
+ohos_js_hap_suite("ActsCrossplatformXmlTest") {
   hap_profile = "src/main/module.json"
   deps = [
     ":windowStage_js_assets",
@@ -20,7 +20,7 @@ ohos_js_hap_suite("xml_ets_test") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "xml_ets_test"
+  hap_name = "ActsCrossplatformXmlTest"
   subsystem_name = "commonlibrary"
   part_name = "ets_utils"
 }
@@ -35,4 +35,4 @@ ohos_resources("windowStage_resources") {
   sources = [ "src/main/resources" ]
   deps = [ ":windowStage_app_profile" ]
   hap_profile = "src/main/module.json"
-}
\ No newline at end of file
+}
diff --git a/commonlibrary/crossplatform/commonlibraryxmletstest/Test.json b/commonlibrary/crossplatform/commonlibraryxmletstest/Test.json
index e81514b04..b15bd1daf 100644
--- a/commonlibrary/crossplatform/commonlibraryxmletstest/Test.json
+++ b/commonlibrary/crossplatform/commonlibraryxmletstest/Test.json
@@ -1,24 +1,16 @@
 {
     "description": "Configuration for hjunit demo Tests",
-    // 指定设备执行的驱动
     "driver": {
         "type": "OHJSUnitTest",
-        //test-timeout: 测试hap 整体执行用例的执行时长
         "test-timeout": "60000",
-        //shell-timeout: aa test 拉起命令执行时长
         "shell-timeout": "60000",
-        //bundle-name: 与HAP的app.json 中 bundleName 保持一致
         "bundle-name": "ohos.acts.commonlibrary.crossplatform.convertxml.normal",
-        //module-name: 与HAP的module.json 中"module"字段的 name 保持一致
         "module-name": "entry_test"
-        //testcase-timeout: 测试hap 单条用例的执行时长
-        //"testcase-timeout": 5000
     },
-    // kit的作用主要是为了支撑测试执行活动，在测试前执行预制操作(Setup)，在测试后执行清理操作(Teardown)
     "kits": [
         {
             "test-file-name": [
-                "ActsDemoStageTest.hap"
+                "ActsCrossplatformXmlTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
-- 
GitLab