diff --git a/test_packages.gni b/test_packages.gni index 4e09d4897f4873e8ed468c32a42a8166923a2ab6..4fbb7a7e6789c7be5895fdadc6c65b9f4c4d5428 100644 --- a/test_packages.gni +++ b/test_packages.gni @@ -15,7 +15,7 @@ import("//test/xts/tools/build/suite.gni") _all_test_packages = [ "${ACTS_ROOT}/ai:ai", - "${ACTS_ROOT}/arkXtest:arkXtest", + "${ACTS_ROOT}/testfwk:testfwk", "${ACTS_ROOT}/global:global", "${ACTS_ROOT}/security:security", "${ACTS_ROOT}/useriam:useriam", diff --git a/arkXtest/BUILD.gn b/testfwk/BUILD.gn similarity index 97% rename from arkXtest/BUILD.gn rename to testfwk/BUILD.gn index f83527ddb92de49c947d3c1739d14a6b14af627b..0dd3a777cd101ccb96fc4772d5702eb147b17501 100644 --- a/arkXtest/BUILD.gn +++ b/testfwk/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos_var.gni") -group("arkXtest") { +group("testfwk") { testonly = true if (is_standard_system) { deps = [ diff --git a/arkXtest/uitest/BUILD.gn b/testfwk/uitest/BUILD.gn similarity index 86% rename from arkXtest/uitest/BUILD.gn rename to testfwk/uitest/BUILD.gn index 0a3f1dea51e82b932112cf25b3a7876e066f85de..8a920036fa4f017ebcde99c090ff9fcefd9efb9d 100644 --- a/arkXtest/uitest/BUILD.gn +++ b/testfwk/uitest/BUILD.gn @@ -20,10 +20,10 @@ ohos_js_hap_suite("ActsUiTest") { ":uitest_ets_resources", ] ets2abc = true - certificate_profile = "//test/xts/acts/arkXtest/uitest/signature/auto_ohos_default_com.uitest.test.p7b" + certificate_profile = "//test/xts/acts/testfwk/uitest/signature/auto_ohos_default_com.uitest.test.p7b" hap_name = "ActsUiTest" - part_name = "arkXtest" - subsystem_name = "arkXtest" + part_name = "arkxtest" + subsystem_name = "testfwk" } ohos_js_assets("uitest_ets_assets") { diff --git a/arkXtest/uitest/Test.json b/testfwk/uitest/Test.json similarity index 100% rename from arkXtest/uitest/Test.json rename to testfwk/uitest/Test.json diff --git a/arkXtest/uitest/signature/auto_ohos_default_com.uitest.test.p7b b/testfwk/uitest/signature/auto_ohos_default_com.uitest.test.p7b similarity index 100% rename from arkXtest/uitest/signature/auto_ohos_default_com.uitest.test.p7b rename to testfwk/uitest/signature/auto_ohos_default_com.uitest.test.p7b diff --git a/arkXtest/uitest/src/main/config.json b/testfwk/uitest/src/main/config.json similarity index 100% rename from arkXtest/uitest/src/main/config.json rename to testfwk/uitest/src/main/config.json diff --git a/arkXtest/uitest/src/main/ets/MainAbility/app.ets b/testfwk/uitest/src/main/ets/MainAbility/app.ets similarity index 100% rename from arkXtest/uitest/src/main/ets/MainAbility/app.ets rename to testfwk/uitest/src/main/ets/MainAbility/app.ets diff --git a/arkXtest/uitest/src/main/ets/MainAbility/pages/index.ets b/testfwk/uitest/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from arkXtest/uitest/src/main/ets/MainAbility/pages/index.ets rename to testfwk/uitest/src/main/ets/MainAbility/pages/index.ets diff --git a/arkXtest/uitest/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/testfwk/uitest/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts similarity index 100% rename from arkXtest/uitest/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts rename to testfwk/uitest/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts diff --git a/arkXtest/uitest/src/main/ets/test/List.test.ets b/testfwk/uitest/src/main/ets/test/List.test.ets similarity index 100% rename from arkXtest/uitest/src/main/ets/test/List.test.ets rename to testfwk/uitest/src/main/ets/test/List.test.ets diff --git a/arkXtest/uitest/src/main/ets/test/uitest.test.ets b/testfwk/uitest/src/main/ets/test/uitest.test.ets similarity index 100% rename from arkXtest/uitest/src/main/ets/test/uitest.test.ets rename to testfwk/uitest/src/main/ets/test/uitest.test.ets diff --git a/arkXtest/uitest/src/main/resources/base/element/string.json b/testfwk/uitest/src/main/resources/base/element/string.json similarity index 100% rename from arkXtest/uitest/src/main/resources/base/element/string.json rename to testfwk/uitest/src/main/resources/base/element/string.json diff --git a/arkXtest/uitest/src/main/resources/base/media/icon.png b/testfwk/uitest/src/main/resources/base/media/icon.png similarity index 100% rename from arkXtest/uitest/src/main/resources/base/media/icon.png rename to testfwk/uitest/src/main/resources/base/media/icon.png diff --git a/arkXtest/uitestScene/BUILD.gn b/testfwk/uitestScene/BUILD.gn similarity index 86% rename from arkXtest/uitestScene/BUILD.gn rename to testfwk/uitestScene/BUILD.gn index 82fb621e186d0d04baab352e6c1f40b5feae2a87..052ee481b2e2e0b757a3ad7da5073615f42c1599 100644 --- a/arkXtest/uitestScene/BUILD.gn +++ b/testfwk/uitestScene/BUILD.gn @@ -22,10 +22,10 @@ ohos_hap_assist_suite("ActsUiTestScene") { ets2abc = true js_build_mode = "debug" testonly = true - certificate_profile = "//test/xts/acts/arkXtest/uitestScene/signature/auto_ohos_default_com.uitestScene.test.p7b" + certificate_profile = "//test/xts/acts/testfwk/uitestScene/signature/auto_ohos_default_com.uitestScene.test.p7b" hap_name = "ActsUiTestScene" - part_name = "arkXtest" - subsystem_name = "arkXtest" + part_name = "arkxtest" + subsystem_name = "testfwk" } ohos_js_assets("uitest_scene_ets_assets") { diff --git a/arkXtest/uitestScene/signature/auto_ohos_default_com.uitestScene.test.p7b b/testfwk/uitestScene/signature/auto_ohos_default_com.uitestScene.test.p7b similarity index 100% rename from arkXtest/uitestScene/signature/auto_ohos_default_com.uitestScene.test.p7b rename to testfwk/uitestScene/signature/auto_ohos_default_com.uitestScene.test.p7b diff --git a/arkXtest/uitestScene/src/main/config.json b/testfwk/uitestScene/src/main/config.json similarity index 100% rename from arkXtest/uitestScene/src/main/config.json rename to testfwk/uitestScene/src/main/config.json diff --git a/arkXtest/uitestScene/src/main/ets/MainAbility/app.ets b/testfwk/uitestScene/src/main/ets/MainAbility/app.ets similarity index 100% rename from arkXtest/uitestScene/src/main/ets/MainAbility/app.ets rename to testfwk/uitestScene/src/main/ets/MainAbility/app.ets diff --git a/arkXtest/uitestScene/src/main/ets/MainAbility/pages/drag.ets b/testfwk/uitestScene/src/main/ets/MainAbility/pages/drag.ets similarity index 100% rename from arkXtest/uitestScene/src/main/ets/MainAbility/pages/drag.ets rename to testfwk/uitestScene/src/main/ets/MainAbility/pages/drag.ets diff --git a/arkXtest/uitestScene/src/main/ets/MainAbility/pages/fourth.ets b/testfwk/uitestScene/src/main/ets/MainAbility/pages/fourth.ets similarity index 100% rename from arkXtest/uitestScene/src/main/ets/MainAbility/pages/fourth.ets rename to testfwk/uitestScene/src/main/ets/MainAbility/pages/fourth.ets diff --git a/arkXtest/uitestScene/src/main/ets/MainAbility/pages/index.ets b/testfwk/uitestScene/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from arkXtest/uitestScene/src/main/ets/MainAbility/pages/index.ets rename to testfwk/uitestScene/src/main/ets/MainAbility/pages/index.ets diff --git a/arkXtest/uitestScene/src/main/ets/MainAbility/pages/screen.ets b/testfwk/uitestScene/src/main/ets/MainAbility/pages/screen.ets similarity index 100% rename from arkXtest/uitestScene/src/main/ets/MainAbility/pages/screen.ets rename to testfwk/uitestScene/src/main/ets/MainAbility/pages/screen.ets diff --git a/arkXtest/uitestScene/src/main/ets/MainAbility/pages/second.ets b/testfwk/uitestScene/src/main/ets/MainAbility/pages/second.ets similarity index 100% rename from arkXtest/uitestScene/src/main/ets/MainAbility/pages/second.ets rename to testfwk/uitestScene/src/main/ets/MainAbility/pages/second.ets diff --git a/arkXtest/uitestScene/src/main/ets/MainAbility/pages/third.ets b/testfwk/uitestScene/src/main/ets/MainAbility/pages/third.ets similarity index 100% rename from arkXtest/uitestScene/src/main/ets/MainAbility/pages/third.ets rename to testfwk/uitestScene/src/main/ets/MainAbility/pages/third.ets diff --git a/arkXtest/uitestScene/src/main/resources/base/element/string.json b/testfwk/uitestScene/src/main/resources/base/element/string.json similarity index 100% rename from arkXtest/uitestScene/src/main/resources/base/element/string.json rename to testfwk/uitestScene/src/main/resources/base/element/string.json diff --git a/arkXtest/uitestScene/src/main/resources/base/media/computer.png b/testfwk/uitestScene/src/main/resources/base/media/computer.png similarity index 100% rename from arkXtest/uitestScene/src/main/resources/base/media/computer.png rename to testfwk/uitestScene/src/main/resources/base/media/computer.png diff --git a/arkXtest/uitestScene/src/main/resources/base/media/icon.png b/testfwk/uitestScene/src/main/resources/base/media/icon.png similarity index 100% rename from arkXtest/uitestScene/src/main/resources/base/media/icon.png rename to testfwk/uitestScene/src/main/resources/base/media/icon.png