diff --git a/aafwk/aafwk_standard/amszipfileunzipfilest/BUILD.gn b/aafwk/aafwk_standard/amszipfileunzipfilest/BUILD.gn index 789f3fbc1c3a322431c53df5550e7945f0b8afaf..a67792b1664301036310e91ab78eca4bc26d8962 100644 --- a/aafwk/aafwk_standard/amszipfileunzipfilest/BUILD.gn +++ b/aafwk/aafwk_standard/amszipfileunzipfilest/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("amsZipfileUnzipfileST") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "amsZipfileUnzipfileST" + hap_name = "ActsAmsZipfileUnzipfileSTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/aafwk/aafwk_standard/amszipfileunzipfilest/Test.json b/aafwk/aafwk_standard/amszipfileunzipfilest/Test.json index 99047c16a867e13f3966da395f16744a196e08b4..a65ee8fdc87d68077510fc94bbcebde2966ea291 100644 --- a/aafwk/aafwk_standard/amszipfileunzipfilest/Test.json +++ b/aafwk/aafwk_standard/amszipfileunzipfilest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "amsZipfileUnzipfileST.hap" + "ActsAmsZipfileUnzipfileSTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/aafwk/aafwk_standard/fwkdataaccessor/BUILD.gn b/aafwk/aafwk_standard/fwkdataaccessor/BUILD.gn index 8fe06e236be760074901982ee529b755bfea39a6..542612ba25e8ac634864a70af84ae5f52a73d49e 100644 --- a/aafwk/aafwk_standard/fwkdataaccessor/BUILD.gn +++ b/aafwk/aafwk_standard/fwkdataaccessor/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("FWKDataAccessor") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "FWKDataAccessor" + hap_name = "ActsFWKDataAccessorTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/aafwk/aafwk_standard/fwkdataaccessor/Test.json b/aafwk/aafwk_standard/fwkdataaccessor/Test.json index 9d96803aaaf2bf52cd284eb322e16e18c18e2a4b..c29113c7491b592aae42a926ce0642a26d0938ab 100644 --- a/aafwk/aafwk_standard/fwkdataaccessor/Test.json +++ b/aafwk/aafwk_standard/fwkdataaccessor/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "FWKDataAccessor.hap", + "ActsFWKDataAccessorTest.hap", "./resource/appexecfwk/amsStDataAbility.hap" ], "type": "AppInstallKit", diff --git a/account/BUILD.gn b/account/BUILD.gn index 23bee6b47551d95607f8428cf58020cd1ee3aa8f..cc1f608953c01d071448268d841c61c557edd3a3 100755 --- a/account/BUILD.gn +++ b/account/BUILD.gn @@ -15,7 +15,7 @@ import("//build/ohos_var.gni") group("account") { testonly = true if (is_standard_system) { - deps = [ "OsAccountTest_js:osaccount_js_test" ] + deps = [ "OsAccountTest_js:ActsOsAccountJSApiTest" ] } else { deps = [ "appaccount:appaccount_hap", diff --git a/account/OsAccountTest_js/BUILD.gn b/account/OsAccountTest_js/BUILD.gn index 477067e11a6e4e437d8d97eb2cebdd0595deb26f..1029b594c0a6f9d2f463fa61a8b291f8f20625b5 100755 --- a/account/OsAccountTest_js/BUILD.gn +++ b/account/OsAccountTest_js/BUILD.gn @@ -12,20 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("osaccount_js_test") { + +ohos_js_hap_suite("ActsOsAccountJSApiTest") { hap_profile = "./src/main/config.json" deps = [ ":osaccount_js_assets", ":osaccount_resources", ] -# shared_libraries = [ - # "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "OsAccountJSApiTest" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" + hap_name = "ActsOsAccountJSApiTest" } ohos_js_assets("osaccount_js_assets") { source_dir = "./src/main/js/default" diff --git a/account/OsAccountTest_js/Test.json b/account/OsAccountTest_js/Test.json index 3419b1b36650561c96a95c3ce79e52ed8a67a3ab..48740b5768136aae5c1833ee57bb1640427d36d1 100755 --- a/account/OsAccountTest_js/Test.json +++ b/account/OsAccountTest_js/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "OsAccountJSApiTest.hap" + "ActsOsAccountJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ace/BUILD.gn b/ace/BUILD.gn index 5ce5e15cdf5eccda3df63ff73b9863921057fd88..46e05a85ed6f7c18fa350e4c9cd3d6f7fef11a7d 100755 --- a/ace/BUILD.gn +++ b/ace/BUILD.gn @@ -13,7 +13,5 @@ group("ace") { testonly = true - deps = [ - "ace_standard:ace_standard_test", - ] + deps = [ "ace_standard:ace_standard_test" ] } diff --git a/ace/ace_standard/BUILD.gn b/ace/ace_standard/BUILD.gn index 43f2d46aa2e29a69682160099b3ccd8e45b7dfed..16026150700f8d51717243f5ad1f28c0de34097b 100755 --- a/ace/ace_standard/BUILD.gn +++ b/ace/ace_standard/BUILD.gn @@ -11,22 +11,16 @@ # See the License for the specific language governing permissions and # limitations under the License. - import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("ace_standard_test") { hap_profile = "./src/main/config.json" deps = [ ":ace_js_assets", ":ace_resources", ] -# shared_libraries = [ - # "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ace_standard" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" + hap_name = "ActsAceStandardTest" } ohos_js_assets("ace_js_assets") { source_dir = "./src/main/js/default" diff --git a/ace/ace_standard/Test.json b/ace/ace_standard/Test.json index bed98a783698e270ed85a85ac136b2b4594073ee..5b76efdfbfa0d016a74b185e9c28e19c5b4bea1a 100755 --- a/ace/ace_standard/Test.json +++ b/ace/ace_standard/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ace_standard.hap" + "ActsAceStandardTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/ai_lite/ai_engine_posix/base/BUILD.gn b/ai_lite/ai_engine_posix/base/BUILD.gn index 44e4405731ac51f1e0edb71aeabe7671a89ba428..1ce6592683d79a6e8d3c427b5e4dbc3dfacb6e19 100644 --- a/ai_lite/ai_engine_posix/base/BUILD.gn +++ b/ai_lite/ai_engine_posix/base/BUILD.gn @@ -67,5 +67,6 @@ hcpptest_suite("ActsAiEngineTest") { ldflags = [ "-lstdc++", "-ldl", - "-lpthread",] + "-lpthread", + ] } diff --git a/appexecfwk/bundle_standard/bundlemanager/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/BUILD.gn index 1644609df31721c4f5de425e86bfebce3f121cee..bfe84098eca2a371c6d625d9f1794fd0b1f0abc0 100755 --- a/appexecfwk/bundle_standard/bundlemanager/BUILD.gn +++ b/appexecfwk/bundle_standard/bundlemanager/BUILD.gn @@ -27,7 +27,7 @@ group("bundlemanager") { #"actsbmsmetadatatest:ActsBmsMetaDataTest", "actsbmsmoduleusagerecordtest:ActsBmsModuleUsageRecordTest", "actsbundlemanagertest:ActsBundleManagerTest", - "actsbundlemanageruninstall:ActsBundleManagerUninstall", + "actsbundlemanageruninstall:ActsBundleManagerUninstallTest", "sceneProject/bmsgetinfosfifthscene:bmsThirdBundleTest5", "sceneProject/bmsgetinfosfirstscene:bmsThirdBundleTest1", "sceneProject/bmsgetinfosfirstsceneupdate:bmsThirdBundleTestA1", diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/BUILD.gn b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/BUILD.gn index 060c6435dc1733806b63a1f8afcbad1dc9fe4aa8..ca2d062d0be200d3ccd4e4d9f7b097fb4a2065c6 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/BUILD.gn +++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/BUILD.gn @@ -13,14 +13,14 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsBundleManagerUninstall") { +ohos_js_hap_suite("ActsBundleManagerUninstallTest") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsBundleManagerUninstall" + hap_name = "ActsBundleManagerUninstallTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/Test.json b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/Test.json index be917051b4cce659794b62efcaf16e9a75db0043..b9611a3ede7341dee60de4f69f335685e29c293a 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/Test.json +++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ActsBundleManagerUninstall.hap" + "ActsBundleManagerUninstallTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/communication/wifi_standard/BUILD.gn b/communication/wifi_standard/BUILD.gn index 20c239f7f2316a55ef060dbefbab38f3042895bc..ec29255d480cd0b2e958bba53dfd86fe8538d5b9 100755 --- a/communication/wifi_standard/BUILD.gn +++ b/communication/wifi_standard/BUILD.gn @@ -12,22 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("wifi_standard_test") { hap_profile = "./src/main/config.json" deps = [ ":wifi_js_assets", ":wifi_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "WifiJSApiTest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsWifiJSApiTest" } ohos_js_assets("wifi_js_assets") { source_dir = "./src/main/js/default" diff --git a/communication/wifi_standard/Test.json b/communication/wifi_standard/Test.json index 9f65c1df601866039d710fe7e30a326edd8ade73..9e9a46470a3c8e6f2e8088792fabe72c3c0fd331 100755 --- a/communication/wifi_standard/Test.json +++ b/communication/wifi_standard/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "WifiJSApiTest.hap" + "ActsWifiJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/compileruntime/process_lib_standard/BUILD.gn b/compileruntime/process_lib_standard/BUILD.gn index 0c4e64017034ee77ca09f22d519c32ba1a790b4c..101287b11b830e124182667d9fd266141270f46f 100644 --- a/compileruntime/process_lib_standard/BUILD.gn +++ b/compileruntime/process_lib_standard/BUILD.gn @@ -12,22 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("process_js_test") { hap_profile = "./src/main/config.json" deps = [ ":process_js_assets", ":process_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ProcessJSApiTest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsProcessJSApiTest" } ohos_js_assets("process_js_assets") { source_dir = "./src/main/js/default" diff --git a/compileruntime/process_lib_standard/Test.json b/compileruntime/process_lib_standard/Test.json index 58980316e8915f8eea5c050347c26b97f1ab9773..a16a95a3396de3d5a4008b42e48ae9491d338e91 100644 --- a/compileruntime/process_lib_standard/Test.json +++ b/compileruntime/process_lib_standard/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ProcessJSApiTest.hap" + "ActsProcessJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/compileruntime/url_lib_standard/BUILD.gn b/compileruntime/url_lib_standard/BUILD.gn index 967123cbcc929b29432bf2a48625f85eaf355ede..595e22ccac223fd21a983ca25eb1033f86fef7b4 100644 --- a/compileruntime/url_lib_standard/BUILD.gn +++ b/compileruntime/url_lib_standard/BUILD.gn @@ -12,22 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("url_js_test") { hap_profile = "./src/main/config.json" deps = [ ":url_js_assets", ":url_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "UrlJsTest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsUrlJsTest" } ohos_js_assets("url_js_assets") { source_dir = "./src/main/js/default" diff --git a/compileruntime/url_lib_standard/Test.json b/compileruntime/url_lib_standard/Test.json index 7246972760202009369848a23f34724daea489d3..509cac922121ecc4c467069126977e9047bf3077 100644 --- a/compileruntime/url_lib_standard/Test.json +++ b/compileruntime/url_lib_standard/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "UrlJsTest.hap" + "ActsUrlJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/compileruntime/util_lib_standard/BUILD.gn b/compileruntime/util_lib_standard/BUILD.gn index cceaf8a1fa00455fe33f09e2d5b9f5b0beac5c4f..6b45dbc2453b600c41f2f5e33cbf8531a05ebb29 100644 --- a/compileruntime/util_lib_standard/BUILD.gn +++ b/compileruntime/util_lib_standard/BUILD.gn @@ -12,22 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("util_js_test") { hap_profile = "./src/main/config.json" deps = [ ":util_js_assets", ":util_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "UtilJsTest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsUtilJsTest" } ohos_js_assets("util_js_assets") { source_dir = "./src/main/js/default" diff --git a/compileruntime/util_lib_standard/Test.json b/compileruntime/util_lib_standard/Test.json index 111d1ab5e2d3e7b4d8a64ea0365d15fa9f193447..d8e14d1dfaa699d1032ee378f16b41f3f1353972 100644 --- a/compileruntime/util_lib_standard/Test.json +++ b/compileruntime/util_lib_standard/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "UtilJsTest.hap" + "ActsUtilJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/compileruntime/worker_lib_standard/BUILD.gn b/compileruntime/worker_lib_standard/BUILD.gn index 9fcf8c928c8b8cf68d6e0ddfdbc223f87bb417c1..4906a546e407c76c6229294ed80854e986cf907b 100644 --- a/compileruntime/worker_lib_standard/BUILD.gn +++ b/compileruntime/worker_lib_standard/BUILD.gn @@ -12,22 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("worker_js_hap") { hap_profile = "./src/main/config.json" deps = [ ":worker_js_assets", ":worker_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "WorkerJSTest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsWorkerJSTest" } ohos_js_assets("worker_js_assets") { source_dir = "./src/main/js/default" diff --git a/compileruntime/worker_lib_standard/Test.json b/compileruntime/worker_lib_standard/Test.json index 92175f082f627dea2b01176adcc35e649b81f391..b1b4bbe008e8a0ff7a33e188d16e572828f58c94 100644 --- a/compileruntime/worker_lib_standard/Test.json +++ b/compileruntime/worker_lib_standard/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "WorkerJSTest.hap" + "ActsWorkerJSTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/demo/BUILD.gn b/demo/BUILD.gn index 4493027cbea35f0a9b759ed927fbdd95b92f181a..1f4d6298093b43129f1b172e292f97fe6e427a02 100755 --- a/demo/BUILD.gn +++ b/demo/BUILD.gn @@ -16,8 +16,6 @@ import("//build/ohos_var.gni") group("demo") { testonly = true if (is_standard_system) { - deps = [ - "hjsunit_sample:hjs_demo_test", - ] + deps = [ "hjsunit_sample:hjs_demo_test" ] } } diff --git a/demo/hjsunit_sample/BUILD.gn b/demo/hjsunit_sample/BUILD.gn index e2ed3b544bba1eaa88033c3e099ee4aa3231565e..ca7ed6d21b1e8ef933fe58bdd563b7501787aa93 100755 --- a/demo/hjsunit_sample/BUILD.gn +++ b/demo/hjsunit_sample/BUILD.gn @@ -12,20 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("hjs_demo_test") { hap_profile = "./src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] -# shared_libraries = [ - # "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" hap_name = "Hjsdemotest" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./src/main/js/default" diff --git a/developtools/hiplugintest/BUILD.gn b/developtools/hiplugintest/BUILD.gn index dad1adf39035b2f8c43cad26ed584cd356569f70..fe9ce486be6ad872fa46c05ba7f46ce6b37e80da 100755 --- a/developtools/hiplugintest/BUILD.gn +++ b/developtools/hiplugintest/BUILD.gn @@ -17,14 +17,14 @@ import("../../../../../developtools/profiler/device/base/config.gni") ############################################################################### config("module_private_config") { - visibility = [":*"] + visibility = [ ":*" ] } ohos_moduletest_suite("hipluginmoduleapitest") { deps = [ - "//third_party/googletest:gtest", - "${OHOS_PROFILER_DIR}/protos/types/plugins/memory_data:memory_data_cpp", "${OHOS_PROFILER_DIR}/device/plugins/memory_plugin:memdataplugin", + "${OHOS_PROFILER_DIR}/protos/types/plugins/memory_data:memory_data_cpp", + "//third_party/googletest:gtest", ] include_dirs = [ "${OHOS_PROFILER_DIR}/interfaces/kits/", @@ -42,11 +42,9 @@ ohos_moduletest_suite("hipluginmoduleapitest") { cflags = [ "-pthread", "-Wno-inconsistent-missing-override", - "-Dprivate=public", #allow test code access private members - ] - external_deps = [ - "hiviewdfx_hilog_native:libhilog", + "-Dprivate=public", #allow test code access private members ] + external_deps = [ "hiviewdfx_hilog_native:libhilog" ] subsystem_name = "${OHOS_PROFILER_SUBSYS_NAME}" - defines = [ "HAVE_HILOG", ] + defines = [ "HAVE_HILOG" ] } diff --git a/distributed_schedule_lite/distributed_schedule_posix/BUILD.gn b/distributed_schedule_lite/distributed_schedule_posix/BUILD.gn index 68febbed212f7abcd6cc48dec4ee3fbbedf2e8d1..b274cca845efde0a442e39d37e33af86b0d1f656 100755 --- a/distributed_schedule_lite/distributed_schedule_posix/BUILD.gn +++ b/distributed_schedule_lite/distributed_schedule_posix/BUILD.gn @@ -44,8 +44,8 @@ hcpptest_suite("ActsDMSTest") { deps = [ "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//foundation/distributedschedule/samgr_lite/samgr:samgr", "//foundation/distributedschedule/dmsfwk_lite:dtbschedmgr", + "//foundation/distributedschedule/samgr_lite/samgr:samgr", "//third_party/bounds_checking_function:libsec_shared", ] cflags = [ "-Wno-error" ] diff --git a/distributeddatamgr/appdatamgrjstest/hap/BUILD.gn b/distributeddatamgr/appdatamgrjstest/hap/BUILD.gn index 084729106d34bd00850f652099a6573a2d13195c..e686a2fba1068f0260bf72031c831b6b268b4159 100755 --- a/distributeddatamgr/appdatamgrjstest/hap/BUILD.gn +++ b/distributeddatamgr/appdatamgrjstest/hap/BUILD.gn @@ -12,20 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("appdatamgr_js_test") { hap_profile = "./src/main/config.json" deps = [ ":appdatamgr_js_assets", ":appdatamgr_resources", ] -# shared_libraries = [ - # "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "AppdatamagrJsTest" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" + hap_name = "ActsAppdatamagrJsTest" } ohos_js_assets("appdatamgr_js_assets") { source_dir = "./src/main/js/default" diff --git a/distributeddatamgr/appdatamgrjstest/hap/Test.json b/distributeddatamgr/appdatamgrjstest/hap/Test.json index a5cf39a99e67c6d4af8579d7f00d595bf42ce28e..0f12d3db9fe59edb884f6c30a03d9003150369b8 100755 --- a/distributeddatamgr/appdatamgrjstest/hap/Test.json +++ b/distributeddatamgr/appdatamgrjstest/hap/Test.json @@ -10,7 +10,7 @@ "kits": [ { "test-file-name": [ - "AppdatamagrJsTest.hap" + "ActsAppdatamagrJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/distributeddatamgr/distributeddatamgrjstest/hap/BUILD.gn b/distributeddatamgr/distributeddatamgrjstest/hap/BUILD.gn index 937d7ca640731054f18a5734c755b39a0a62fdd1..2da01bb8558ed158cdc48ad53f60db3e21dd8e58 100755 --- a/distributeddatamgr/distributeddatamgrjstest/hap/BUILD.gn +++ b/distributeddatamgr/distributeddatamgrjstest/hap/BUILD.gn @@ -12,20 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("distributeddatamgr_js_test") { hap_profile = "./src/main/config.json" deps = [ ":distributeddatamgr_js_assets", ":distributeddatamgr_resources", ] -# shared_libraries = [ - # "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "DistributeddatamgrJsTest" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" + hap_name = "ActsDistributedDatamgrJsTest" } ohos_js_assets("distributeddatamgr_js_assets") { source_dir = "./src/main/js/default" diff --git a/distributeddatamgr/distributeddatamgrjstest/hap/Test.json b/distributeddatamgr/distributeddatamgrjstest/hap/Test.json index e316505914737540bac73186e4c0100d9d799528..08d2c51c235221653f08bbfc780fb5b3fd3a419b 100755 --- a/distributeddatamgr/distributeddatamgrjstest/hap/Test.json +++ b/distributeddatamgr/distributeddatamgrjstest/hap/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "DistributeddatamgrJsTest.hap" + "ActsDistributedDatamgrJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/distributedhardware/devicemanagerjstest/BUILD.gn b/distributedhardware/devicemanagerjstest/BUILD.gn index cf37b07fda4133530dcea1b01725616d144f414a..9be671ac96a7d7d293a17dae1aa687259c25d038 100644 --- a/distributedhardware/devicemanagerjstest/BUILD.gn +++ b/distributedhardware/devicemanagerjstest/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("devicemanager_js_test") { ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "devicemanagerjstest" + hap_name = "ActsDeviceManagerJsTest" } ohos_js_assets("devicemanager_js_assets") { source_dir = "./src/main/js/default" diff --git a/distributedhardware/devicemanagerjstest/Test.json b/distributedhardware/devicemanagerjstest/Test.json index fca1910393b31eead5c4ef68f0332993af05336c..515625705b71c7d547ee612bafa1e376cfa5b89c 100644 --- a/distributedhardware/devicemanagerjstest/Test.json +++ b/distributedhardware/devicemanagerjstest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "devicemanagerjstest.hap" + "ActsDeviceManagerJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/global/BUILD.gn b/global/BUILD.gn index 47672c0b9de1438767133ebd6628238aa12b1374..34445ab5cafc3219d5d5b5410dfdb46e6b3654d0 100755 --- a/global/BUILD.gn +++ b/global/BUILD.gn @@ -18,7 +18,7 @@ group("global") { if (is_standard_system) { deps = [ "i18n_standard/intljs:intljs_test", - "i18n_standard/zone/src:ZoneUtiltest", + "i18n_standard/zone/src:ActsZoneUtilTest", "resmgr_standard/resmgrjs:resmgrjs_test", ] } else { diff --git a/global/i18n_standard/intljs/BUILD.gn b/global/i18n_standard/intljs/BUILD.gn index 9e12f2e71729c8543c535f9e429884d23c8f1867..b9acd9a5c9c68d2e4c51aec7a5ac87aa657c535a 100755 --- a/global/i18n_standard/intljs/BUILD.gn +++ b/global/i18n_standard/intljs/BUILD.gn @@ -12,20 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("intljs_test") { hap_profile = "./src/main/config.json" deps = [ ":intljs_assets", ":intljs_resources", ] -# shared_libraries = [ - # "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "IntlJsTest" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" + hap_name = "ActsIntlJsTest" } ohos_js_assets("intljs_assets") { source_dir = "./src/main/js/default" diff --git a/global/i18n_standard/intljs/Test.json b/global/i18n_standard/intljs/Test.json index 27be91538e90316279b62634129e39cc4d12d8e7..95c80aa85927be171ed566a6d1669b32af49eebc 100755 --- a/global/i18n_standard/intljs/Test.json +++ b/global/i18n_standard/intljs/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "IntlJsTest.hap" + "ActsIntlJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/global/i18n_standard/zone/src/BUILD.gn b/global/i18n_standard/zone/src/BUILD.gn index 2d372966c3b019c590f2a7af27d12304096e4986..b4d0624b28b413bb53b30e8b4e6de36ce1e1f963 100755 --- a/global/i18n_standard/zone/src/BUILD.gn +++ b/global/i18n_standard/zone/src/BUILD.gn @@ -16,7 +16,7 @@ import("//test/xts/tools/build/suite.gni") #SUBSYSTEM_DIR = "//base/global" module_output_path = "hit/global" -ohos_moduletest_suite("ZoneUtiltest") { +ohos_moduletest_suite("ActsZoneUtilTest") { module_out_path = module_output_path sources = [ diff --git a/global/i18n_standard/zone/src/Test.json b/global/i18n_standard/zone/src/Test.json index 593abd179f74c554cde00b58d6bdc8300f929da7..8a9df77e28bfc66582a84a2a54ad5a8b1173ed75 100755 --- a/global/i18n_standard/zone/src/Test.json +++ b/global/i18n_standard/zone/src/Test.json @@ -2,7 +2,7 @@ "kits": [ { "push": [ - "ZoneUtiltest->/data/local/tmp/ZoneUtiltest" + "ActsZoneUtilTest->/data/local/tmp/ActsZoneUtilTest" ], "type": "PushKit" } @@ -10,9 +10,9 @@ "driver": { "native-test-timeout": "120000", "type": "CppTest", - "module-name": "ZoneUtiltest", + "module-name": "ActsZoneUtilTest", "runtime-hint": "1s", "native-test-device-path": "/data/local/tmp" }, - "description": "Configuration for ZoneUtiltest Tests" + "description": "Configuration for ActsZoneUtilTest Tests" } \ No newline at end of file diff --git a/global/resmgr_standard/resmgrjs/BUILD.gn b/global/resmgr_standard/resmgrjs/BUILD.gn index fd38d76e573baee77e36c2cbfed7687d4fb51e57..cb5b1c730b76220d141505d8859cc56879e53b27 100755 --- a/global/resmgr_standard/resmgrjs/BUILD.gn +++ b/global/resmgr_standard/resmgrjs/BUILD.gn @@ -12,20 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("resmgrjs_test") { hap_profile = "./src/main/config.json" deps = [ ":resmgrjs_assets", ":resmgrjs_resources", ] -# shared_libraries = [ - # "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "resmgrjs" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" + hap_name = "ActsResMgrJsTest" } ohos_js_assets("resmgrjs_assets") { source_dir = "./src/main/js/default" diff --git a/global/resmgr_standard/resmgrjs/Test.json b/global/resmgr_standard/resmgrjs/Test.json index 83eb3c65e765687b59922cb6cc945161e5850551..6e91ccbea43f35fc9dcf27087dc28885243fe5e0 100755 --- a/global/resmgr_standard/resmgrjs/Test.json +++ b/global/resmgr_standard/resmgrjs/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "resmgrjs.hap" + "ActsResMgrJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/global_lite/i18n_lite/BUILD.gn b/global_lite/i18n_lite/BUILD.gn index 6015fbfa646555920827ff56cdd8d96c4cea744a..2f0e37e61dbd008fdbbeca907638c91b60a901af 100755 --- a/global_lite/i18n_lite/BUILD.gn +++ b/global_lite/i18n_lite/BUILD.gn @@ -13,12 +13,12 @@ group("ActsGlobalTest") { deps = [ - "//test/xts/acts/global_lite/i18n_lite/number_posix:ActsNumberTest", - "//test/xts/acts/global_lite/i18n_lite/numberrecall_posix:ActsNumberRecallTest", "//test/xts/acts/global_lite/i18n_lite/datetime_posix:ActsGlobalDateTimeTest", "//test/xts/acts/global_lite/i18n_lite/datetimerecall_posix:ActsGlobalDateTimeRecallTest", + "//test/xts/acts/global_lite/i18n_lite/number_posix:ActsNumberTest", + "//test/xts/acts/global_lite/i18n_lite/numberrecall_posix:ActsNumberRecallTest", "//test/xts/acts/global_lite/i18n_lite/week_plural_number/src:WeekPluralNumbertest", - + # depend on the resources #"//test/xts/acts/global_lite/i18n_lite/resource_parse_load/src:ResourceParseLoadtest", ] diff --git a/global_lite/i18n_lite/resource_parse_load/src/BUILD.gn b/global_lite/i18n_lite/resource_parse_load/src/BUILD.gn index 023207d6014b4d80b8979ba361d41316ce190458..065a3e170028218c73dcfcd4328ee1473dd0804b 100755 --- a/global_lite/i18n_lite/resource_parse_load/src/BUILD.gn +++ b/global_lite/i18n_lite/resource_parse_load/src/BUILD.gn @@ -15,7 +15,7 @@ import("//test/xts/tools/lite/build/suite_lite.gni") hcpptest_suite("ResourceParseLoadtest") { suite_name = "acts" - sources = [ + sources = [ "global_test.cpp", "hap_manager_test.cpp", "hap_parser_test.cpp", @@ -28,7 +28,7 @@ hcpptest_suite("ResourceParseLoadtest") { "resource_manager_test.cpp", "string_utils_test.cpp", "test_common.cpp", - ] + ] include_dirs = [ "//base/global/i18n_lite/interfaces/kits/i18n/include", diff --git a/global_lite/i18n_lite/week_plural_number/src/BUILD.gn b/global_lite/i18n_lite/week_plural_number/src/BUILD.gn index d6fa95bfb284a9197d1fa438157c4a33076a01d8..df5c99f555c1a38a118bbcf33c524dfcf91da29e 100755 --- a/global_lite/i18n_lite/week_plural_number/src/BUILD.gn +++ b/global_lite/i18n_lite/week_plural_number/src/BUILD.gn @@ -20,7 +20,6 @@ hcpptest_suite("WeekPluralNumbertest") { include_dirs = [ "//base/global/i18n_lite/interfaces/kits/i18n/include", "//third_party/bounds_checking_function/include", - ] deps = [ diff --git a/graphic/windowstandard/BUILD.gn b/graphic/windowstandard/BUILD.gn index 7f5adc9560340130fba170a19880e022b4ddff56..c190120b2d6049fed974db723b68cd04771636a9 100755 --- a/graphic/windowstandard/BUILD.gn +++ b/graphic/windowstandard/BUILD.gn @@ -12,20 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("window_hap_test") { hap_profile = "./src/main/config.json" deps = [ ":window_js_assets", ":window_resources", ] -# shared_libraries = [ - # "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "windowhaptest" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" + hap_name = "ActsWindowHapTest" } ohos_js_assets("window_js_assets") { source_dir = "./src/main/js/default" diff --git a/graphic/windowstandard/Test.json b/graphic/windowstandard/Test.json index 239c4d161d501e1e1948e38a18ff9c7a16b2a3a6..fa6232654f5970ab72ef75453ab48692a2ec415b 100755 --- a/graphic/windowstandard/Test.json +++ b/graphic/windowstandard/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "windowhaptest.hap" + "ActsWindowHapTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/hiviewdfx/BUILD.gn b/hiviewdfx/BUILD.gn index bc57b1d7de7520f780615714e52a96bcbc97277a..b025a8f5b889ae2187a56cae4b8e8d8320b406a8 100755 --- a/hiviewdfx/BUILD.gn +++ b/hiviewdfx/BUILD.gn @@ -15,13 +15,13 @@ group("hiviewdfxtestacts") { testonly = true if (is_standard_system) { deps = [ - "faultloggertest/faultloggercpptest:faultloggertest", - "hiappeventtest/hiappeventjstest:hiappeventjstest", - "hicollietest/hicolliecpptest:HiCollieCppTest", + "faultloggertest/faultloggercpptest:ActsFaultLoggerTest", + "hiappeventtest/hiappeventjstest:ActsHiAppEventJsTest", + "hicollietest/hicolliecpptest:ActsHiCollieCppTest", "hilogtest/libhilogtest:libhilogtestacts", - "hisyseventtest/hisyseventcpptest:HiSysEventCPPTest", - "hitracetest/hitracecpptest:HitraceCPPtest", - "hitracetest/hitracectest:HitraceCtest", + "hisyseventtest/hisyseventcpptest:ActsHiSysEventCPPTest", + "hitracetest/hitracecpptest:ActsHitraceCPPTest", + "hitracetest/hitracectest:ActsHitraceCTest", ] } } diff --git a/hiviewdfx/faultloggertest/faultloggercpptest/BUILD.gn b/hiviewdfx/faultloggertest/faultloggercpptest/BUILD.gn index 4276b9c15e70e5febfb48515546536c25bb665be..0eeb66084952e41acba90acc8f74e5b082cf64f6 100755 --- a/hiviewdfx/faultloggertest/faultloggercpptest/BUILD.gn +++ b/hiviewdfx/faultloggertest/faultloggercpptest/BUILD.gn @@ -24,7 +24,7 @@ config("faultloggertest_config") { "genfault.h", ] } -ohos_moduletest_suite("faultloggertest") { +ohos_moduletest_suite("ActsFaultLoggerTest") { module_out_path = module_output_path sources = [ "faultloggertest.cpp", diff --git a/hiviewdfx/faultloggertest/faultloggercpptest/Test.json b/hiviewdfx/faultloggertest/faultloggercpptest/Test.json index fa3e13d3c8bb6cd34300cd0455da831cedc159bf..08a3f136b63ad3c7a1803002711070a326abbe52 100755 --- a/hiviewdfx/faultloggertest/faultloggercpptest/Test.json +++ b/hiviewdfx/faultloggertest/faultloggercpptest/Test.json @@ -2,7 +2,7 @@ "kits": [ { "push": [ - "faultloggertest->/data/local/tmp/faultloggertest" + "ActsFaultLoggerTest->/data/local/tmp/ActsFaultLoggerTest" ], "type": "PushKit" } @@ -10,9 +10,9 @@ "driver": { "native-test-timeout": "120000", "type": "CppTest", - "module-name": "faultloggertest", + "module-name": "ActsFaultLoggerTest", "runtime-hint": "1s", "native-test-device-path": "/data/local/tmp" }, - "description": "Configuration for faultloggertest Tests" + "description": "Configuration for ActsFaultLoggerTest Tests" } \ No newline at end of file diff --git a/hiviewdfx/hiappeventtest/hiappeventjstest/BUILD.gn b/hiviewdfx/hiappeventtest/hiappeventjstest/BUILD.gn index d423c5ebd8f4545629c6d87bea133d5a82fe2e3c..8b3f223d8718313a1994860c2b104c0db05aaeba 100755 --- a/hiviewdfx/hiappeventtest/hiappeventjstest/BUILD.gn +++ b/hiviewdfx/hiappeventtest/hiappeventjstest/BUILD.gn @@ -12,20 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("hiappeventjstest") { + +ohos_js_hap_suite("ActsHiAppEventJsTest") { hap_profile = "./src/main/config.json" deps = [ ":hiappevent_js_assets", ":hiappevent_resources", ] -# shared_libraries = [ - # "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "HiAppeventTest" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" + hap_name = "ActsHiAppEventJsTest" } ohos_js_assets("hiappevent_js_assets") { source_dir = "./src/main/js/default" diff --git a/hiviewdfx/hiappeventtest/hiappeventjstest/Test.json b/hiviewdfx/hiappeventtest/hiappeventjstest/Test.json index 9fef3f01df7420ec55ca2f3108fab1e24b9758a5..e1695ea8181ad8262acf112a64844aef6dc57d75 100755 --- a/hiviewdfx/hiappeventtest/hiappeventjstest/Test.json +++ b/hiviewdfx/hiappeventtest/hiappeventjstest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "HiAppeventTest.hap" + "ActsHiAppEventJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/hiviewdfx/hicollietest/hicolliecpptest/BUILD.gn b/hiviewdfx/hicollietest/hicolliecpptest/BUILD.gn index e208f505b02ed49b317f6bb24040c172927c9f6b..3833ab8770cf255299faa204056d359bbf717402 100644 --- a/hiviewdfx/hicollietest/hicolliecpptest/BUILD.gn +++ b/hiviewdfx/hicollietest/hicolliecpptest/BUILD.gn @@ -24,7 +24,7 @@ config("xcollie_config") { "//base/hiviewdfx/hicollie/interfaces/native/innerkits/include", ] } -ohos_moduletest_suite("HiCollieCppTest") { +ohos_moduletest_suite("ActsHiCollieCppTest") { module_out_path = module_output_path sources = [ "HiCollieCppTest.cpp" ] deps = [ diff --git a/hiviewdfx/hicollietest/hicolliecpptest/Test.json b/hiviewdfx/hicollietest/hicolliecpptest/Test.json index d9626bff4f5e8ecf51c1d2bbada4c1c138749c9e..1b4f24550222f84e9aec75fd6dd476d1fc0dfa38 100644 --- a/hiviewdfx/hicollietest/hicolliecpptest/Test.json +++ b/hiviewdfx/hicollietest/hicolliecpptest/Test.json @@ -2,7 +2,7 @@ "kits": [ { "push": [ - "HiCollieCppTest->/data/local/tmp/HiCollieCppTest" + "ActsHiCollieCppTest->/data/local/tmp/ActsHiCollieCppTest" ], "type": "PushKit", "post-push": [ @@ -13,9 +13,9 @@ "driver": { "native-test-timeout": "120000", "type": "CppTest", - "module-name": "HiCollieCppTest", + "module-name": "ActsHiCollieCppTest", "runtime-hint": "1s", "native-test-device-path": "/data/local/tmp" }, - "description": "Configuration for HiCollieCppTest Tests" + "description": "Configuration for ActsHiCollieCppTest Tests" } \ No newline at end of file diff --git a/hiviewdfx/hilogtest/libhilogtest/BUILD.gn b/hiviewdfx/hilogtest/libhilogtest/BUILD.gn index b8fa07e06d5e994fbbd20e1d8ccabed4fecb3425..8346ba122f01e62d649279fa83bc3435cf7db08c 100755 --- a/hiviewdfx/hilogtest/libhilogtest/BUILD.gn +++ b/hiviewdfx/hilogtest/libhilogtest/BUILD.gn @@ -14,8 +14,8 @@ group("libhilogtestacts") { testonly = true deps = [ - "libhilogCPPtest:LibhilogCPPtest", - "libhilogCtest:libhilogCtest", - "hilogtest:hilogtest", + "hilogtest:ActsHilogTest", + "libhilogCPPtest:ActsLibhilogCPPTest", + "libhilogCtest:ActsLibhilogCTest", ] } diff --git a/hiviewdfx/hilogtest/libhilogtest/hilogtest/BUILD.gn b/hiviewdfx/hilogtest/libhilogtest/hilogtest/BUILD.gn index 3c49f4b2f0875bb884232bd9e662d946317d88af..a8ed71344cc7570622fb71f86581d08f93f84316 100755 --- a/hiviewdfx/hilogtest/libhilogtest/hilogtest/BUILD.gn +++ b/hiviewdfx/hilogtest/libhilogtest/hilogtest/BUILD.gn @@ -23,7 +23,7 @@ config("hilogtest_config") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] } -ohos_moduletest_suite("hilogtest") { +ohos_moduletest_suite("ActsHilogTest") { module_out_path = module_output_path sources = [ "hilogtest.cpp" ] deps = [ diff --git a/hiviewdfx/hilogtest/libhilogtest/hilogtest/Test.json b/hiviewdfx/hilogtest/libhilogtest/hilogtest/Test.json index b6e864e410f6ce5e7d063c7d995da5120378c826..407e33834f2e2c0504f4f4ff9629a47f5e5c87aa 100755 --- a/hiviewdfx/hilogtest/libhilogtest/hilogtest/Test.json +++ b/hiviewdfx/hilogtest/libhilogtest/hilogtest/Test.json @@ -2,7 +2,7 @@ "kits": [ { "push": [ - "hilogtest->/data/local/tmp/hilogtest" + "ActsHilogTest->/data/local/tmp/ActsHilogTest" ], "type": "PushKit" } @@ -10,9 +10,9 @@ "driver": { "native-test-timeout": "120000", "type": "CppTest", - "module-name": "hilogtest", + "module-name": "ActsHilogTest", "runtime-hint": "1s", "native-test-device-path": "/data/local/tmp" }, - "description": "Configuration for hilogtest Tests" + "description": "Configuration for ActsHilogTest Tests" } \ No newline at end of file diff --git a/hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/BUILD.gn b/hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/BUILD.gn index 58764a68fcd3ea61ecf19af7e65cf538f525d935..b6cf7598911c456ac24a2e11153f8c71ac431c27 100755 --- a/hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/BUILD.gn +++ b/hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/BUILD.gn @@ -23,7 +23,7 @@ config("hilogtest_config") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] } -ohos_moduletest_suite("LibhilogCPPtest") { +ohos_moduletest_suite("ActsLibhilogCPPTest") { module_out_path = module_output_path sources = [ "LibhilogCPPtest.cpp" ] deps = [ diff --git a/hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/Test.json b/hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/Test.json index f62aac79acc532cf7922896b887263a3d7e5caca..31580276b235c55add1ccfc9d61a4dfaeaa9dff4 100755 --- a/hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/Test.json +++ b/hiviewdfx/hilogtest/libhilogtest/libhilogCPPtest/Test.json @@ -2,7 +2,7 @@ "kits": [ { "push": [ - "LibhilogCPPtest->/data/local/tmp/LibhilogCPPtest" + "ActsLibhilogCPPTest->/data/local/tmp/ActsLibhilogCPPTest" ], "type": "PushKit" } @@ -10,9 +10,9 @@ "driver": { "native-test-timeout": "120000", "type": "CppTest", - "module-name": "LibhilogCPPtest", + "module-name": "ActsLibhilogCPPTest", "runtime-hint": "1s", "native-test-device-path": "/data/local/tmp" }, - "description": "Configuration for LibhilogCPPtest Tests" + "description": "Configuration for ActsLibhilogCPPTest Tests" } \ No newline at end of file diff --git a/hiviewdfx/hilogtest/libhilogtest/libhilogCtest/BUILD.gn b/hiviewdfx/hilogtest/libhilogtest/libhilogCtest/BUILD.gn index 3fd4a56acca22b508462d8326dabbd2a2456b836..90ba99e2c4b5281abeacbcfa01a882a161ec1e7c 100755 --- a/hiviewdfx/hilogtest/libhilogtest/libhilogCtest/BUILD.gn +++ b/hiviewdfx/hilogtest/libhilogtest/libhilogCtest/BUILD.gn @@ -23,7 +23,7 @@ config("hilogtest_config") { "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] } -ohos_moduletest_suite("libhilogCtest") { +ohos_moduletest_suite("ActsLibhilogCTest") { module_out_path = module_output_path sources = [ "libhilogCtest.cpp" ] deps = [ diff --git a/hiviewdfx/hilogtest/libhilogtest/libhilogCtest/Test.json b/hiviewdfx/hilogtest/libhilogtest/libhilogCtest/Test.json index 9b25aea56fcd5f6ccbf6c16c312297e0d68e57ae..513f4fef9d5c20ea8362a799883df9ebbd937b8e 100755 --- a/hiviewdfx/hilogtest/libhilogtest/libhilogCtest/Test.json +++ b/hiviewdfx/hilogtest/libhilogtest/libhilogCtest/Test.json @@ -2,7 +2,7 @@ "kits": [ { "push": [ - "libhilogCtest->/data/local/tmp/libhilogCtest" + "ActsLibhilogCTest->/data/local/tmp/ActsLibhilogCTest" ], "type": "PushKit" } @@ -10,9 +10,9 @@ "driver": { "native-test-timeout": "120000", "type": "CppTest", - "module-name": "libhilogCtest", + "module-name": "ActsLibhilogCTest", "runtime-hint": "1s", "native-test-device-path": "/data/local/tmp" }, - "description": "Configuration for libhilogCtest Tests" + "description": "Configuration for ActsLibhilogCTest Tests" } \ No newline at end of file diff --git a/hiviewdfx/hisyseventtest/hisyseventcpptest/BUILD.gn b/hiviewdfx/hisyseventtest/hisyseventcpptest/BUILD.gn index 1e931ccd083d8d69a23760b9848a8f13c22854b6..014be04e1540de59faca40f6a12314ce1991b0c0 100755 --- a/hiviewdfx/hisyseventtest/hisyseventcpptest/BUILD.gn +++ b/hiviewdfx/hisyseventtest/hisyseventcpptest/BUILD.gn @@ -25,11 +25,9 @@ config("hilogtest_config") { "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/include", ] } -ohos_moduletest_suite("HiSysEventCPPTest") { +ohos_moduletest_suite("ActsHiSysEventCPPTest") { module_out_path = module_output_path - sources = [ - "HiSysEventCPPTest.cpp", - ] + sources = [ "HiSysEventCPPTest.cpp" ] deps = [ "../../utils/native:utilskit", "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", diff --git a/hiviewdfx/hisyseventtest/hisyseventcpptest/Test.json b/hiviewdfx/hisyseventtest/hisyseventcpptest/Test.json index a8d832e10fcd86107d33a192a3c0ed46a1623476..912f686b24b439b53cb6e20a8aadeac47480cdb2 100755 --- a/hiviewdfx/hisyseventtest/hisyseventcpptest/Test.json +++ b/hiviewdfx/hisyseventtest/hisyseventcpptest/Test.json @@ -2,7 +2,7 @@ "kits": [ { "push": [ - "HiSysEventCPPTest->/data/local/tmp/HiSysEventCPPTest" + "ActsHiSysEventCPPTest->/data/local/tmp/ActsHiSysEventCPPTest" ], "type": "PushKit" } @@ -10,9 +10,9 @@ "driver": { "native-test-timeout": "120000", "type": "CppTest", - "module-name": "HiSysEventCPPTest", + "module-name": "ActsHiSysEventCPPTest", "runtime-hint": "1s", "native-test-device-path": "/data/local/tmp" }, - "description": "Configuration for HiSysEventCPPTest Tests" + "description": "Configuration for ActsHiSysEventCPPTest Tests" } \ No newline at end of file diff --git a/hiviewdfx/hitracetest/hitracecpptest/BUILD.gn b/hiviewdfx/hitracetest/hitracecpptest/BUILD.gn index c70fd4566f8c12fd5299b3d49c201e546142b147..b74156fd5fea2781a3640a19e64e23cc46bf9bae 100644 --- a/hiviewdfx/hitracetest/hitracecpptest/BUILD.gn +++ b/hiviewdfx/hitracetest/hitracecpptest/BUILD.gn @@ -25,7 +25,7 @@ config("hitrace_config") { "//base/hiviewdfx/hisysevent/interfaces/native/innerkits/include", ] } -ohos_moduletest_suite("HitraceCPPtest") { +ohos_moduletest_suite("ActsHitraceCPPTest") { module_out_path = module_output_path sources = [ "HitraceCPPtest.cpp" ] deps = [ diff --git a/hiviewdfx/hitracetest/hitracecpptest/Test.json b/hiviewdfx/hitracetest/hitracecpptest/Test.json index a195266d8dfe4975ae14b07922cb08e16864131e..28fd96f4dc4e46d05a625e8da129fea2faa93343 100644 --- a/hiviewdfx/hitracetest/hitracecpptest/Test.json +++ b/hiviewdfx/hitracetest/hitracecpptest/Test.json @@ -2,7 +2,7 @@ "kits": [ { "push": [ - "HitraceCPPtest->/data/local/tmp/HitraceCPPtest" + "ActsHitraceCPPTest->/data/local/tmp/ActsHitraceCPPTest" ], "type": "PushKit", "post-push": [ @@ -13,9 +13,9 @@ "driver": { "native-test-timeout": "120000", "type": "CppTest", - "module-name": "HitraceCPPtest", + "module-name": "ActsHitraceCPPTest", "runtime-hint": "1s", "native-test-device-path": "/data/local/tmp" }, - "description": "Configuration for HitraceCPPtest Tests" + "description": "Configuration for ActsHitraceCPPTest Tests" } \ No newline at end of file diff --git a/hiviewdfx/hitracetest/hitracectest/BUILD.gn b/hiviewdfx/hitracetest/hitracectest/BUILD.gn index b536349059939b78e72007d2122cc422215af900..4146b6b9aed4c37c42d4cb8d40a99f1476a52ee4 100644 --- a/hiviewdfx/hitracetest/hitracectest/BUILD.gn +++ b/hiviewdfx/hitracetest/hitracectest/BUILD.gn @@ -24,7 +24,7 @@ config("hitrace_config") { "//base/hiviewdfx/hitrace/interfaces/native/innerkits/include", ] } -ohos_moduletest_suite("HitraceCtest") { +ohos_moduletest_suite("ActsHitraceCTest") { module_out_path = module_output_path sources = [ "HitraceCtest.cpp" ] deps = [ diff --git a/hiviewdfx/hitracetest/hitracectest/Test.json b/hiviewdfx/hitracetest/hitracectest/Test.json index d6e4f26cbeee9784397aa4fc326a4b150a6ac9bf..8bb3e93996782a5660fd72e144a5281b4c54c712 100644 --- a/hiviewdfx/hitracetest/hitracectest/Test.json +++ b/hiviewdfx/hitracetest/hitracectest/Test.json @@ -2,7 +2,7 @@ "kits": [ { "push": [ - "HitraceCtest->/data/local/tmp/HitraceCtest" + "ActsHitraceCTest->/data/local/tmp/ActsHitraceCTest" ], "type": "PushKit", "post-push": [ @@ -13,9 +13,9 @@ "driver": { "native-test-timeout": "120000", "type": "CppTest", - "module-name": "HitraceCtest", + "module-name": "ActsHitraceCTest", "runtime-hint": "1s", "native-test-device-path": "/data/local/tmp" }, - "description": "Configuration for HitraceCtest Tests" + "description": "Configuration for ActsHitraceCTest Tests" } \ No newline at end of file diff --git a/hiviewdfx_lite/hievent_hal/BUILD.gn b/hiviewdfx_lite/hievent_hal/BUILD.gn index ba00f0393adf6d689a71b75e1cf16e72ef9da32f..845d377a1a65827d07b5dfc21c65f554a37c46b1 100755 --- a/hiviewdfx_lite/hievent_hal/BUILD.gn +++ b/hiviewdfx_lite/hievent_hal/BUILD.gn @@ -1,27 +1,25 @@ - # Copyright (c) 2020 Huawei Device Co., Ltd. - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. +# Copyright (c) 2020 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. import("//test/xts/tools/lite/build/suite_lite.gni") hctest_suite("ActsHieventLiteTest") { - suite_name = "acts" - sources = [ - "src/hievent_lite_test.c", - ] + suite_name = "acts" + sources = [ "src/hievent_lite_test.c" ] - include_dirs = [ - "src", - "//base/hiviewdfx/hievent_lite/interfaces/native/innerkits", - ] + include_dirs = [ + "src", + "//base/hiviewdfx/hievent_lite/interfaces/native/innerkits", + ] - cflags = [ "-Wno-error" ] + cflags = [ "-Wno-error" ] } diff --git a/hiviewdfx_lite/hilog_hal/BUILD.gn b/hiviewdfx_lite/hilog_hal/BUILD.gn index e08bae607fd2114a350534e6b7c8bc4138db1596..441786c003fa04a138ad4977e58ceb58c476250d 100755 --- a/hiviewdfx_lite/hilog_hal/BUILD.gn +++ b/hiviewdfx_lite/hilog_hal/BUILD.gn @@ -1,32 +1,30 @@ - # Copyright (c) 2020 Huawei Device Co., Ltd. - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. +# Copyright (c) 2020 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. import("//test/xts/tools/lite/build/suite_lite.gni") hctest_suite("ActsDfxFuncTest") { - suite_name = "acts" - sources = [ - "src/dfx_hilog.c", - ] + suite_name = "acts" + sources = [ "src/dfx_hilog.c" ] - include_dirs = [ - "src", - "//base/hiviewdfx/hiview_lite", - "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite", - "//base/hiviewdfx/hievent_lite/interfaces/native/innerkits", - "//base/hiviewdfx/hilog_lite/frameworks/mini", - "//vendor/hisi/hi3861/hi3861/include", - "//vendor/hisi/hi3861/hi3861/components/lwip_sack/include" - ] + include_dirs = [ + "src", + "//base/hiviewdfx/hiview_lite", + "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite", + "//base/hiviewdfx/hievent_lite/interfaces/native/innerkits", + "//base/hiviewdfx/hilog_lite/frameworks/mini", + "//vendor/hisi/hi3861/hi3861/include", + "//vendor/hisi/hi3861/hi3861/components/lwip_sack/include", + ] - cflags = [ "-Wno-error" ] + cflags = [ "-Wno-error" ] } diff --git a/kernel_lite/fs_posix/BUILD.gn b/kernel_lite/fs_posix/BUILD.gn index 3b766852af759c3025d885d95ca6e94cbccbdd24..d861284acd19cd309152712a721658f23042dea2 100644 --- a/kernel_lite/fs_posix/BUILD.gn +++ b/kernel_lite/fs_posix/BUILD.gn @@ -13,10 +13,9 @@ group("ActsFSTest") { deps = [ - "./vfat_storage:ActsVFATstorageTest", "./jffs:ActsJFFS2Test", "./nfs:ActsNFSTest", "./vfat:ActsVFATTest", - + "./vfat_storage:ActsVFATstorageTest", ] } diff --git a/kernel_lite/net_posix/BUILD.gn b/kernel_lite/net_posix/BUILD.gn index 85ad266203d02b1c58b6d10b2a310b8b99116855..ca9172900af97b82ad7725bec48bd6b7e4c92f55 100755 --- a/kernel_lite/net_posix/BUILD.gn +++ b/kernel_lite/net_posix/BUILD.gn @@ -25,6 +25,6 @@ hcpptest_suite("ActsNetTest") { deps = [ "//test/xts/acts/kernel_lite/utils:libutils", - "//third_party/bounds_checking_function:libsec_shared", + "//third_party/bounds_checking_function:libsec_shared", ] } diff --git a/miscservices/TimeTest_js/BUILD.gn b/miscservices/TimeTest_js/BUILD.gn index f02f51075d39e19b90110ca8b805558ac82f6d3d..18656b825c44c16cc03c0cece0f0c4030b808820 100755 --- a/miscservices/TimeTest_js/BUILD.gn +++ b/miscservices/TimeTest_js/BUILD.gn @@ -12,22 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("time_js_test") { hap_profile = "./src/main/config.json" deps = [ ":time_js_assets", ":time_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "TimeJSApiTest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsTimeJSApiTest" } ohos_js_assets("time_js_assets") { source_dir = "./src/main/js/default" diff --git a/miscservices/TimeTest_js/Test.json b/miscservices/TimeTest_js/Test.json index 0a72ac423c1bd9dfc4aa7d3050e45bc3e48615cc..0ddfb93bc65d11a3972c78edfd99fb8553a0e410 100755 --- a/miscservices/TimeTest_js/Test.json +++ b/miscservices/TimeTest_js/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "TimeJSApiTest.hap" + "ActsTimeJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/miscservices/TimerTest_js/BUILD.gn b/miscservices/TimerTest_js/BUILD.gn index 0efc1203e8a4d91a6623dbdbb88488b4cc754e45..2f840116147d89d37192b0cdf6f1654071c5fa84 100644 --- a/miscservices/TimerTest_js/BUILD.gn +++ b/miscservices/TimerTest_js/BUILD.gn @@ -12,22 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("timer_js_test") { hap_profile = "./src/main/config.json" deps = [ ":time_js_assets", ":time_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "TimerJSApiTest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsTimeJSApiTest" } ohos_js_assets("time_js_assets") { source_dir = "./src/main/js/default" diff --git a/miscservices/TimerTest_js/Test.json b/miscservices/TimerTest_js/Test.json index 0a72ac423c1bd9dfc4aa7d3050e45bc3e48615cc..0ddfb93bc65d11a3972c78edfd99fb8553a0e410 100644 --- a/miscservices/TimerTest_js/Test.json +++ b/miscservices/TimerTest_js/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "TimeJSApiTest.hap" + "ActsTimeJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/multimedia/audio/audio_js_standard/audioManager/BUILD.gn b/multimedia/audio/audio_js_standard/audioManager/BUILD.gn index 4a43a433d229e0c00a3b94f86ac33a9a30beb614..545dba03b614b911b0244fd47f4827bb6d55aa67 100755 --- a/multimedia/audio/audio_js_standard/audioManager/BUILD.gn +++ b/multimedia/audio/audio_js_standard/audioManager/BUILD.gn @@ -12,20 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("audio_manager_js_hap") { hap_profile = "./src/main/config.json" deps = [ ":audio_manager_js_assets", ":audio_manager_resources", ] -# shared_libraries = [ - # "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "AudioManagerJsTest" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" + hap_name = "ActsAudioManagerJsTest" } ohos_js_assets("audio_manager_js_assets") { source_dir = "./src/main/js/default" diff --git a/multimedia/audio/audio_js_standard/audioManager/Test.json b/multimedia/audio/audio_js_standard/audioManager/Test.json index 6891014f3217a3e876a5bc9e2d0c2350de258470..7ff302ba85a279468fe37c6a39e0df4927ac6bfc 100755 --- a/multimedia/audio/audio_js_standard/audioManager/Test.json +++ b/multimedia/audio/audio_js_standard/audioManager/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "AudioManagerJsTest.hap" + "ActsAudioManagerJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/multimedia/audio/audio_js_standard/audioPlayer/BUILD.gn b/multimedia/audio/audio_js_standard/audioPlayer/BUILD.gn index 49ac69cfc3f248a2fd3aa7b94dd2711a56316ea6..892d53943747aaefcfa835e2eeda10aaecd29174 100755 --- a/multimedia/audio/audio_js_standard/audioPlayer/BUILD.gn +++ b/multimedia/audio/audio_js_standard/audioPlayer/BUILD.gn @@ -12,20 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("audio_player_js_hap") { hap_profile = "./src/main/config.json" deps = [ ":audio_player_js_assets", ":audio_player_resources", ] -# shared_libraries = [ - # "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "AudioPlayerJsTest" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" + hap_name = "ActsAudioPlayerJsTest" } ohos_js_assets("audio_player_js_assets") { source_dir = "./src/main/js/default" diff --git a/multimedia/audio/audio_js_standard/audioPlayer/Test.json b/multimedia/audio/audio_js_standard/audioPlayer/Test.json index 4673a360700197802c5f9061e8e80fd4cc4e345d..3e797a53e39b3456d638da7010c7daa396b23c20 100755 --- a/multimedia/audio/audio_js_standard/audioPlayer/Test.json +++ b/multimedia/audio/audio_js_standard/audioPlayer/Test.json @@ -50,7 +50,7 @@ }, { "test-file-name": [ - "AudioPlayerJsTest.hap" + "ActsAudioPlayerJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/BUILD.gn b/multimedia/audio/audio_js_standard/audioPlayer_API/BUILD.gn index 7aba6254051c76cb648977435ff62967612c9807..240cee80e7994dbacdc27708056848b0d60eed9a 100755 --- a/multimedia/audio/audio_js_standard/audioPlayer_API/BUILD.gn +++ b/multimedia/audio/audio_js_standard/audioPlayer_API/BUILD.gn @@ -12,20 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("audio_player_api_js_hap") { hap_profile = "./src/main/config.json" deps = [ ":audio_player_api_js_assets", ":audio_player_api_resources", ] -# shared_libraries = [ - # "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "AudioPlayerApiJsTest" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" + hap_name = "ActsAudioPlayerApiJsTest" } ohos_js_assets("audio_player_api_js_assets") { source_dir = "./src/main/js/default" diff --git a/multimedia/audio/audio_js_standard/audioPlayer_API/Test.json b/multimedia/audio/audio_js_standard/audioPlayer_API/Test.json index 7477c27502d9a0d2f22e4939eea84644a205f271..e4952766f2abed8a3c7f31b38f59acbd773913aa 100755 --- a/multimedia/audio/audio_js_standard/audioPlayer_API/Test.json +++ b/multimedia/audio/audio_js_standard/audioPlayer_API/Test.json @@ -50,7 +50,7 @@ }, { "test-file-name": [ - "AudioPlayerApiJsTest.hap" + "ActsAudioPlayerApiJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/multimedia/audio/audio_js_standard/audioRecorder/BUILD.gn b/multimedia/audio/audio_js_standard/audioRecorder/BUILD.gn index 57f1d57a78afb1dced4b7e96bbe53d6e3da2c945..a91e5e187679606dfa492f8fccb693accbf14dd1 100644 --- a/multimedia/audio/audio_js_standard/audioRecorder/BUILD.gn +++ b/multimedia/audio/audio_js_standard/audioRecorder/BUILD.gn @@ -12,22 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("audio_recorder_js_hap") { hap_profile = "./src/main/config.json" deps = [ ":audio_recorder_js_assets", ":audio_recorder_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "AudioRecorderJsTest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsAudioRecorderJsTest" } ohos_js_assets("audio_recorder_js_assets") { source_dir = "./src/main/js/default" diff --git a/notification/ans_standard/BUILD.gn b/notification/ans_standard/BUILD.gn index 9c176177fab3bf855c80998e8b44d3f5c9135d86..fd03bf93ee9a6c5fd0a32c76e7095a963a25f1fb 100644 --- a/notification/ans_standard/BUILD.gn +++ b/notification/ans_standard/BUILD.gn @@ -16,8 +16,8 @@ group("ans_standard") { testonly = true if (is_standard_system) { deps = [ - #"actsansnotificationcancel:ActsAnsNotificationCancel", - #"actsansnotificationremove:ActsAnsNotificationRemove", + #"actsansnotificationcancel:ActsAnsNotificationCancelTest", + #"actsansnotificationremove:ActsAnsNotificationRemoveTest", "actsansslottest:ActsAnsSlotTest", "publish_test:publish_test", ] diff --git a/notification/ans_standard/actsansnotificationcancel/BUILD.gn b/notification/ans_standard/actsansnotificationcancel/BUILD.gn index fd43a40751f83edc395145f9c4125a4bd6effcfc..1760a02362e33e44fa8e19aca9b80a9a9a632218 100644 --- a/notification/ans_standard/actsansnotificationcancel/BUILD.gn +++ b/notification/ans_standard/actsansnotificationcancel/BUILD.gn @@ -13,14 +13,14 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAnsNotificationCancel") { +ohos_js_hap_suite("ActsAnsNotificationCancelTest") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAnsNotificationCancel" + hap_name = "ActsAnsNotificationCancelTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/actsansnotificationcancel/Test.json b/notification/ans_standard/actsansnotificationcancel/Test.json index 4ca9b73b1aa306ae295919c42826b1c423a46946..5da7c00620fd8faa33916ea870298f093d7015c7 100644 --- a/notification/ans_standard/actsansnotificationcancel/Test.json +++ b/notification/ans_standard/actsansnotificationcancel/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ActsAnsNotificationCancel.hap" + "ActsAnsNotificationCancelTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/notification/ans_standard/actsansnotificationremove/BUILD.gn b/notification/ans_standard/actsansnotificationremove/BUILD.gn index d04fc0d607d18fa1fce18371aabb4b0870fa4bc6..d75619673abd1de4b84d5d4586919445c35ff1c7 100644 --- a/notification/ans_standard/actsansnotificationremove/BUILD.gn +++ b/notification/ans_standard/actsansnotificationremove/BUILD.gn @@ -13,14 +13,14 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAnsNotificationRemove") { +ohos_js_hap_suite("ActsAnsNotificationRemoveTest") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAnsNotificationRemove" + hap_name = "ActsAnsNotificationRemoveTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/actsansnotificationremove/Test.json b/notification/ans_standard/actsansnotificationremove/Test.json index 78f98aad5c67d2353a5164e9ebd7b26c31aa1354..0a78d74c5f1270c88c8e1c3cadf16df984477a79 100644 --- a/notification/ans_standard/actsansnotificationremove/Test.json +++ b/notification/ans_standard/actsansnotificationremove/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ActsAnsNotificationRemove.hap" + "ActsAnsNotificationRemoveTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/notification/ans_standard/actsansslottest/BUILD.gn b/notification/ans_standard/actsansslottest/BUILD.gn index 1d094bc12bed7cdba8192e9b191524e77f3f35ce..f00bfed1fb6347ee68531ab662ea000b666c0945 100644 --- a/notification/ans_standard/actsansslottest/BUILD.gn +++ b/notification/ans_standard/actsansslottest/BUILD.gn @@ -17,17 +17,17 @@ group("ActsAnsSlotTest") { testonly = true if (is_standard_system) { deps = [ - "actsansgetslotWithoutadd:ActsAnsGetSlotWithoutAdd", - "actsansgetslottestcallback:ActsAnsGetSlotTestCallback", - "actsansgetslottestpromise:ActsAnsGetSlotTestPromise", + "actsansgetslotWithoutadd:ActsAnsGetSlotWithoutAddTest", + "actsansgetslottestcallback:ActsAnsGetSlotTestCallbackTest", + "actsansgetslottestpromise:ActsAnsGetSlotTestPromiseTest", "actsansremoveslottest:ActsAnsRemoveSlotTest", - "actsansremoveslotwithoutadd:ActsAnsRemoveSlotWithoutAdd", + "actsansremoveslotwithoutadd:ActsAnsRemoveSlotWithoutAddTest", - #"actsansslotbybundle:ActsAnsSlotByBundle", - #"actsansaddslotsystem:ActsAnsAddSlotSystem", - #"actsansslotsystemcallback:ActsAnsSlotSystemCallback", - #"actsansslotsystempromise:ActsAnsSlotSystemPromise", - #"actsansslottaddremoveall:ActsAnsSlotAddRemoveAll", + #"actsansslotbybundle:ActsAnsSlotByBundleTest", + #"actsansaddslotsystem:ActsAnsAddSlotSystemTest", + #"actsansslotsystemcallback:ActsAnsSlotSystemCallbackTest", + #"actsansslotsystempromise:ActsAnsSlotSystemPromiseTest", + #"actsansslottaddremoveall:ActsAnsSlotAddRemoveAllTest", ] } } diff --git a/notification/ans_standard/actsansslottest/actsansaddslotsystem/BUILD.gn b/notification/ans_standard/actsansslottest/actsansaddslotsystem/BUILD.gn index 1ee3ed6fbade73e9df09c0fef6e7845331b4af69..7dd99833b0bacf50a0fa7d23078af3f9f5e9d730 100755 --- a/notification/ans_standard/actsansslottest/actsansaddslotsystem/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansaddslotsystem/BUILD.gn @@ -13,14 +13,14 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAnsAddSlotSystem") { +ohos_js_hap_suite("ActsAnsAddSlotSystemTest") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAnsAddSlotSystem" + hap_name = "ActsAnsAddSlotSystemTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/actsansslottest/actsansaddslotsystem/Test.json b/notification/ans_standard/actsansslottest/actsansaddslotsystem/Test.json index d06731f8aed4b5df2373e8a4d62c78096132a158..e5dd6f2f3f12ddd0e20d7d5b6a66ddb0125fbe3f 100755 --- a/notification/ans_standard/actsansslottest/actsansaddslotsystem/Test.json +++ b/notification/ans_standard/actsansslottest/actsansaddslotsystem/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ActsAnsAddSlotSystem.hap" + "ActsAnsAddSlotSystemTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/notification/ans_standard/actsansslottest/actsansgetslotWithoutadd/BUILD.gn b/notification/ans_standard/actsansslottest/actsansgetslotWithoutadd/BUILD.gn index 7277fabc2a301265813d87802a9dd2d7281fba5b..e380224a49e14f8daa4860e3672a8750c18adaf3 100755 --- a/notification/ans_standard/actsansslottest/actsansgetslotWithoutadd/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansgetslotWithoutadd/BUILD.gn @@ -13,14 +13,14 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAnsGetSlotWithoutAdd") { +ohos_js_hap_suite("ActsAnsGetSlotWithoutAddTest") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAnsGetSlotWithoutAdd" + hap_name = "ActsAnsGetSlotWithoutAddTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/actsansslottest/actsansgetslotWithoutadd/Test.json b/notification/ans_standard/actsansslottest/actsansgetslotWithoutadd/Test.json index b64f11bb9f065f4638a92454589c08eb4d94ce2e..8863106dfe733c176f85c9bcb20c52d377828e42 100755 --- a/notification/ans_standard/actsansslottest/actsansgetslotWithoutadd/Test.json +++ b/notification/ans_standard/actsansslottest/actsansgetslotWithoutadd/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ActsAnsGetSlotWithoutAdd.hap" + "ActsAnsGetSlotWithoutAddTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/notification/ans_standard/actsansslottest/actsansgetslottestcallback/BUILD.gn b/notification/ans_standard/actsansslottest/actsansgetslottestcallback/BUILD.gn index 9dd31b656ae6457da8db33fc5719d1aa2cea3ccc..723efdf4431922ebf4711c61ae35beceae397f02 100755 --- a/notification/ans_standard/actsansslottest/actsansgetslottestcallback/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansgetslottestcallback/BUILD.gn @@ -13,14 +13,14 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAnsGetSlotTestCallback") { +ohos_js_hap_suite("ActsAnsGetSlotTestCallbackTest") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAnsGetSlotTestCallback" + hap_name = "ActsAnsGetSlotTestCallbackTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/actsansslottest/actsansgetslottestcallback/Test.json b/notification/ans_standard/actsansslottest/actsansgetslottestcallback/Test.json index 1f14b510c3e8331cb0b07912b23d520ce881d752..8c7168722ab4a9c1acadfdc96baf344caa90a50b 100755 --- a/notification/ans_standard/actsansslottest/actsansgetslottestcallback/Test.json +++ b/notification/ans_standard/actsansslottest/actsansgetslottestcallback/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ActsAnsGetSlotTestCallback.hap" + "ActsAnsGetSlotTestCallbackTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/notification/ans_standard/actsansslottest/actsansgetslottestpromise/BUILD.gn b/notification/ans_standard/actsansslottest/actsansgetslottestpromise/BUILD.gn index 0ef800115a60e829e970a8f493f03f8e14198080..c6cecf6f8881be3241084eed6e0baf65afc0ce6b 100755 --- a/notification/ans_standard/actsansslottest/actsansgetslottestpromise/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansgetslottestpromise/BUILD.gn @@ -13,14 +13,14 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAnsGetSlotTestPromise") { +ohos_js_hap_suite("ActsAnsGetSlotTestPromiseTest") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAnsGetSlotTestPromise" + hap_name = "ActsAnsGetSlotTestPromiseTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/actsansslottest/actsansgetslottestpromise/Test.json b/notification/ans_standard/actsansslottest/actsansgetslottestpromise/Test.json index b8516b82655f7163a2e7448c7dc6f01c4c8a13ae..0e3a94195a4da09c83a6833fa412ff5851edbd9b 100755 --- a/notification/ans_standard/actsansslottest/actsansgetslottestpromise/Test.json +++ b/notification/ans_standard/actsansslottest/actsansgetslottestpromise/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ActsAnsGetSlotTestPromise.hap" + "ActsAnsGetSlotTestPromiseTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/notification/ans_standard/actsansslottest/actsansremoveslotwithoutadd/BUILD.gn b/notification/ans_standard/actsansslottest/actsansremoveslotwithoutadd/BUILD.gn index f847851146adfb63fbd88bde7af53ed1cf3d9e73..769b507a238cd158661ca2121681a48619febc71 100755 --- a/notification/ans_standard/actsansslottest/actsansremoveslotwithoutadd/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansremoveslotwithoutadd/BUILD.gn @@ -13,14 +13,14 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAnsRemoveSlotWithoutAdd") { +ohos_js_hap_suite("ActsAnsRemoveSlotWithoutAddTest") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAnsRemoveSlotWithoutAdd" + hap_name = "ActsAnsRemoveSlotWithoutAddTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/actsansslottest/actsansremoveslotwithoutadd/Test.json b/notification/ans_standard/actsansslottest/actsansremoveslotwithoutadd/Test.json index 48cfe54b3db5fc2f96f478a70be2a89f66831561..e99defada9c9d8af93575b9fa3e828c462269719 100755 --- a/notification/ans_standard/actsansslottest/actsansremoveslotwithoutadd/Test.json +++ b/notification/ans_standard/actsansslottest/actsansremoveslotwithoutadd/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ActsAnsRemoveSlotWithoutAdd.hap" + "ActsAnsRemoveSlotWithoutAddTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/notification/ans_standard/actsansslottest/actsansslotbybundle/BUILD.gn b/notification/ans_standard/actsansslottest/actsansslotbybundle/BUILD.gn index a28dd064352fe75c874728dc86afd7f2f920b1c7..beed46cdafdc1dca0768ccad701e3de8195e1283 100755 --- a/notification/ans_standard/actsansslottest/actsansslotbybundle/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansslotbybundle/BUILD.gn @@ -13,14 +13,14 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAnsSlotByBundle") { +ohos_js_hap_suite("ActsAnsSlotByBundleTest") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAnsSlotByBundle" + hap_name = "ActsAnsSlotByBundleTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/actsansslottest/actsansslotbybundle/Test.json b/notification/ans_standard/actsansslottest/actsansslotbybundle/Test.json index fb29911ae87130288cde1a3d3fce24f5fd7bfed4..eed6dc6ca565b77601067512d21ef31027bd56d2 100644 --- a/notification/ans_standard/actsansslottest/actsansslotbybundle/Test.json +++ b/notification/ans_standard/actsansslottest/actsansslotbybundle/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ActsAnsSlotByBundle.hap" + "ActsAnsSlotByBundleTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/notification/ans_standard/actsansslottest/actsansslotsystemcallback/BUILD.gn b/notification/ans_standard/actsansslottest/actsansslotsystemcallback/BUILD.gn index 1e410fb08148ce1e4eccc50a36ba9b96c62bec7f..87da83efa5d3588d1c336ffd62d6e8696cd252ae 100755 --- a/notification/ans_standard/actsansslottest/actsansslotsystemcallback/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansslotsystemcallback/BUILD.gn @@ -13,14 +13,14 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAnsSlotSystemCallback") { +ohos_js_hap_suite("ActsAnsSlotSystemCallbackTest") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAnsSlotSystemCallback" + hap_name = "ActsAnsSlotSystemCallbackTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/actsansslottest/actsansslotsystemcallback/Test.json b/notification/ans_standard/actsansslottest/actsansslotsystemcallback/Test.json index 4b45c096602f21bcbc483f800f29a03daf431427..39fb52a490bdf622a56ce8ba061eccc87cbe3623 100755 --- a/notification/ans_standard/actsansslottest/actsansslotsystemcallback/Test.json +++ b/notification/ans_standard/actsansslottest/actsansslotsystemcallback/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ActsAnsSlotSystemCallback.hap" + "ActsAnsSlotSystemCallbackTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/notification/ans_standard/actsansslottest/actsansslotsystempromise/BUILD.gn b/notification/ans_standard/actsansslottest/actsansslotsystempromise/BUILD.gn index 4ec4705a05147eadd7300d70d4bde58244afe80e..c11419b456472f892c70101c81d8144bf47a4f00 100755 --- a/notification/ans_standard/actsansslottest/actsansslotsystempromise/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansslotsystempromise/BUILD.gn @@ -13,14 +13,14 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAnsSlotSystemPromise") { +ohos_js_hap_suite("ActsAnsSlotSystemPromiseTest") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAnsSlotSystemPromise" + hap_name = "ActsAnsSlotSystemPromiseTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/actsansslottest/actsansslotsystempromise/Test.json b/notification/ans_standard/actsansslottest/actsansslotsystempromise/Test.json index affaa959951dc57c442efb8cfd24434e9381e363..a72826afcb91c2a4e330d44bcbae80d50af31a0a 100755 --- a/notification/ans_standard/actsansslottest/actsansslotsystempromise/Test.json +++ b/notification/ans_standard/actsansslottest/actsansslotsystempromise/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ActsAnsSlotSystemPromise.hap" + "ActsAnsSlotSystemPromiseTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/notification/ans_standard/actsansslottest/actsansslottaddremoveall/BUILD.gn b/notification/ans_standard/actsansslottest/actsansslottaddremoveall/BUILD.gn index 6b2b9fae539b8701f7ddd67059473ac9fe925178..e2c3a5950948d0e0ac652bf0eea68aee21bf3221 100755 --- a/notification/ans_standard/actsansslottest/actsansslottaddremoveall/BUILD.gn +++ b/notification/ans_standard/actsansslottest/actsansslottaddremoveall/BUILD.gn @@ -13,14 +13,14 @@ import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsAnsSlotAddRemoveAll") { +ohos_js_hap_suite("ActsAnsSlotAddRemoveAllTest") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsAnsSlotAddRemoveAll" + hap_name = "ActsAnsSlotAddRemoveAllTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ans_standard/actsansslottest/actsansslottaddremoveall/Test.json b/notification/ans_standard/actsansslottest/actsansslottaddremoveall/Test.json index 2325780daf1d89da874936f208cc9ddcf6a22fb3..9afbc7c2892b25fd669eacb129964888bde8f0b9 100755 --- a/notification/ans_standard/actsansslottest/actsansslottaddremoveall/Test.json +++ b/notification/ans_standard/actsansslottest/actsansslottaddremoveall/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ActsAnsSlotAddRemoveAll.hap" + "ActsAnsSlotAddRemoveAllTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/notification/ces_standard/subscribeandpublish/BUILD.gn b/notification/ces_standard/subscribeandpublish/BUILD.gn index 4155c8668a001a282531832a4a89a2d5aa19bc4c..d432238138fa68a85e5550d1eb084bdecb91313c 100644 --- a/notification/ces_standard/subscribeandpublish/BUILD.gn +++ b/notification/ces_standard/subscribeandpublish/BUILD.gn @@ -19,7 +19,7 @@ group("SubscribeAndPublish") { deps = [ "actssubscriberorderedtest:ActsSubscriberOrderTest", - #"actssubscriberunordersystemtest:ActsSubscriberTestUnorderSystem", + #"actssubscriberunordersystemtest:ActsSubscriberTestUnorderSystemTest", "actssubscriberunordertest:ActsSubscriberUnorderTest", ] } diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/BUILD.gn b/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/BUILD.gn index 30bd40eb8764556d4a8758f8dfbac6a09ec5d35f..0180cf6da26e9337d0e054adb1d24b2bc91c87c4 100644 --- a/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/BUILD.gn +++ b/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/BUILD.gn @@ -12,14 +12,14 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsSubscriberTestUnorderSystem") { +ohos_js_hap_suite("ActsSubscriberTestUnorderSystemTest") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsSubscriberTestUnorderSystem" + hap_name = "ActsSubscriberTestUnorderSystemTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/Test.json b/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/Test.json index b3e70aa52033641b378adec0469581029474e8e4..90cc1a247e2b867f35ddbf877b507c5d4dc6a142 100644 --- a/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/Test.json +++ b/notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "ActsSubscriberTestUnorderSystem.hap" + "ActsSubscriberTestUnorderSystemTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/open_posix_testsuite/conformance/definitions/BUILD.gn b/open_posix_testsuite/conformance/definitions/BUILD.gn index c0b17688503d46324286366476fde4a52444ebd4..77daa424fe3be903411ed9fa7b128f81a3292141 100644 --- a/open_posix_testsuite/conformance/definitions/BUILD.gn +++ b/open_posix_testsuite/conformance/definitions/BUILD.gn @@ -16,7 +16,8 @@ import("//test/xts/tools/lite/build/suite_lite.gni") open_source_suite("ActsOpenPosixBuildOnlyTest") { suite_name = "acts" exec_command_path = "//third_party/ltp/testcases/open_posix_testsuite/" - compiler = rebase_path("${ohos_build_compiler_dir}/bin/${ohos_build_compiler}") + compiler = + rebase_path("${ohos_build_compiler_dir}/bin/${ohos_build_compiler}") sysroot_path = rebase_path(ohos_current_sysroot) arch_cflags = string_join(" ", target_arch_cflags) prebuild_command = "make clean && make distclean && ./scripts/generate-makefiles.sh $compiler ${ohos_root_path} ${sysroot_path} \"${arch_cflags}\" && make -j -C conformance/definitions" @@ -31,10 +32,10 @@ open_source_suite("ActsOpenPosixBuildOnlyTest") { "aio_h/logfile", "sched_h/logfile", ] - deps = [":install_patch"] + deps = [ ":install_patch" ] } build_ext_component("install_patch") { - exec_path = rebase_path(".", root_build_dir) - command = "./../../ltp-patch/patch.sh" + exec_path = rebase_path(".", root_build_dir) + command = "./../../ltp-patch/patch.sh" } diff --git a/powermgr/BUILD.gn b/powermgr/BUILD.gn index 984d80d7306e6b9746c1ad62c7406d00ae0d0364..4eff12d1d331e2fedf07169104bfcdb77ea54e9a 100755 --- a/powermgr/BUILD.gn +++ b/powermgr/BUILD.gn @@ -16,5 +16,5 @@ group("powermgr") { if (is_standard_system) { deps = [ "powermgrbattery:powermgr_battery_test" ] - } + } } diff --git a/powermgr/powermgrbattery/BUILD.gn b/powermgr/powermgrbattery/BUILD.gn index 5fe7ff0d031c2d5bd333e5fddf28c36958940cd9..6eb240a76ed2cb085940fb26f7de409ab5ac617b 100755 --- a/powermgr/powermgrbattery/BUILD.gn +++ b/powermgr/powermgrbattery/BUILD.gn @@ -12,20 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("powermgr_battery_test") { hap_profile = "./src/main/config.json" deps = [ ":powermgr_battery_js_assets", ":powermgr_battery_resources", ] -# shared_libraries = [ - # "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "Powermgrbatterytest" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" + hap_name = "ActsPowerMgrBatteryTest" } ohos_js_assets("powermgr_battery_js_assets") { source_dir = "./src/main/js/default" diff --git a/powermgr/powermgrbattery/Test.json b/powermgr/powermgrbattery/Test.json index a5f349e45f975b647ad4d351ee5e773e77e44c95..b7ac14baa0bfe07ecb410328a63c5db264bfac39 100755 --- a/powermgr/powermgrbattery/Test.json +++ b/powermgr/powermgrbattery/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "Powermgrbatterytest.hap" + "ActsPowerMgrBatteryTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/security/BUILD.gn b/security/BUILD.gn index cc6f6b1168394b955cd5872171dc47dcaba8f6de..7c63ab471c483862a207ef1859798ceeedf15560 100755 --- a/security/BUILD.gn +++ b/security/BUILD.gn @@ -18,9 +18,9 @@ group("security") { if (is_standard_system) { deps = [ # "authentication_standard/deviceauth_p2p:DeviceauthP2PFunctionCPPTest", - "dataprotect/huks_standard_adapter:huks_std_function_test", - "deviceauth/deviceauth_function:DeviceAuthFunctionTest", - "permission/permissionkitcpp:PermissionKitCPPTest", + "dataprotect/huks_standard_adapter:ActsHuksStdFunctionTest", + "deviceauth/deviceauth_function:ActsDeviceAuthFunctionTest", + "permission/permissionkitcpp:ActsPermissionKitCPPTest", ] } else { deps = diff --git a/security/dataprotect/huks_standard_adapter/BUILD.gn b/security/dataprotect/huks_standard_adapter/BUILD.gn index 2a8ea1465d416fdbf670783e4e838b0df2180c78..bd539eb8dfbf6d9f85f046ccb2fbc27e04c5ec7b 100644 --- a/security/dataprotect/huks_standard_adapter/BUILD.gn +++ b/security/dataprotect/huks_standard_adapter/BUILD.gn @@ -29,11 +29,7 @@ config("module_private_config") { } ######################################################## -ohos_moduletest_suite("huks_std_function_test") { - #subsystem_name = "acts" - #part_name = "huks_standard" - #module_output_path = subsystem_name + "/" + part_name - #module_output_path = module_output_path +ohos_moduletest_suite("ActsHuksStdFunctionTest") { configs = [ ":module_private_config" ] cflags_cc = [ "-DHILOG_ENABLE" ] defines = [ "_STANDARD_SYSTEM_" ] @@ -82,5 +78,5 @@ ohos_moduletest_suite("huks_std_function_test") { group("Huksstandardtest") { testonly = true - deps = [ ":huks_std_function_test" ] + deps = [ ":ActsHuksStdFunctionTest" ] } diff --git a/security/dataprotect/huks_standard_adapter/Test.json b/security/dataprotect/huks_standard_adapter/Test.json index 3314224a1195d712bc4098bed23ddd0bc78e9bc9..a7615259b20683eac076b99909b14552e3d375ab 100644 --- a/security/dataprotect/huks_standard_adapter/Test.json +++ b/security/dataprotect/huks_standard_adapter/Test.json @@ -2,7 +2,7 @@ "kits": [ { "push": [ - "huks_std_function_test->/data/local/tmp/huks_std_function_test" + "ActsHuksStdFunctionTest->/data/local/tmp/ActsHuksStdFunctionTest" ], "type": "PushKit" } @@ -10,9 +10,9 @@ "driver": { "native-test-timeout": "120000", "type": "CppTest", - "module-name": "huks_std_function_test", + "module-name": "ActsHuksStdFunctionTest", "runtime-hint": "1s", "native-test-device-path": "/data/local/tmp" }, - "description": "Configuration for huks_std_function_test Tests" + "description": "Configuration for ActsHuksStdFunctionTest Tests" } \ No newline at end of file diff --git a/security/deviceauth/deviceauth_function/BUILD.gn b/security/deviceauth/deviceauth_function/BUILD.gn index e77e5b3e3b050a6e577d04d5c7bb76ef6bbf6675..9c59296a53a102724caa5b2f8b13051553028fba 100644 --- a/security/deviceauth/deviceauth_function/BUILD.gn +++ b/security/deviceauth/deviceauth_function/BUILD.gn @@ -24,7 +24,7 @@ config("module_private_config") { } ######################################################## -ohos_moduletest_suite("DeviceAuthFunctionTest") { +ohos_moduletest_suite("ActsDeviceAuthFunctionTest") { configs = [ ":module_private_config" ] cflags_cc = [ "-DHILOG_ENABLE" ] defines = [ "_STANDARD_SYSTEM_" ] diff --git a/security/deviceauth/deviceauth_function/Test.json b/security/deviceauth/deviceauth_function/Test.json index ef5038a2a355e19f73e460c2829c53152e30a085..721e972102cdd5c2775c9f290b195bedd455fa64 100644 --- a/security/deviceauth/deviceauth_function/Test.json +++ b/security/deviceauth/deviceauth_function/Test.json @@ -2,7 +2,7 @@ "kits": [ { "push": [ - "DeviceAuthFunctionTest->/data/local/tmp/DeviceAuthFunctionTest" + "ActsDeviceAuthFunctionTest->/data/local/tmp/ActsDeviceAuthFunctionTest" ], "type": "PushKit" } @@ -10,9 +10,9 @@ "driver": { "native-test-timeout": "120000", "type": "CppTest", - "module-name": "DeviceAuthFunctionTest", + "module-name": "ActsDeviceAuthFunctionTest", "runtime-hint": "1s", "native-test-device-path": "/data/local/tmp" }, - "description": "Configuration for DeviceAuthFunctionTest Tests" + "description": "Configuration for ActsDeviceAuthFunctionTest Tests" } diff --git a/security/permission/permissionkitcpp/BUILD.gn b/security/permission/permissionkitcpp/BUILD.gn index 7775a153a4228cea33ed372011c99afe3089929e..80ee977173eb7e4cb9fd870f6c3c7e64e9c1d3ed 100644 --- a/security/permission/permissionkitcpp/BUILD.gn +++ b/security/permission/permissionkitcpp/BUILD.gn @@ -77,7 +77,7 @@ ohos_moduletest_suite("PermissionKitReliabilityCPPTest") { } ################################################################################## -ohos_moduletest_suite("PermissionKitCPPTest") { +ohos_moduletest_suite("ActsPermissionKitCPPTest") { subsystem_name = "hits" part_name = "permission_standard" module_out_path = subsystem_name + "/" + part_name diff --git a/security/permission/permissionkitcpp/Test.json b/security/permission/permissionkitcpp/Test.json index d60b8674934a3f4b3d9cceacf857561eff4145b1..abe6a381cab1233b85c7545e4ee32cb877d81024 100644 --- a/security/permission/permissionkitcpp/Test.json +++ b/security/permission/permissionkitcpp/Test.json @@ -2,7 +2,7 @@ "kits": [ { "push": [ - "PermissionKitCPPTest->/data/local/tmp/PermissionKitCPPTest" + "ActsPermissionKitCPPTest->/data/local/tmp/ActsPermissionKitCPPTest" ], "type": "PushKit", "post-push": [ @@ -13,9 +13,9 @@ "driver": { "native-test-timeout": "120000", "type": "CppTest", - "module-name": "PermissionKitCPPTest", + "module-name": "ActsPermissionKitCPPTest", "runtime-hint": "1s", "native-test-device-path": "/data/local/tmp" }, - "description": "Configuration for PermissionKitCPPTest Tests" + "description": "Configuration for ActsPermissionKitCPPTest Tests" } diff --git a/security_lite/huks_hal/BUILD.gn b/security_lite/huks_hal/BUILD.gn index 8f779440c84e0f788407c504e14e74fa9f9b9b17..2c56dff03f7924411c5af29e209477f0b5b701d9 100755 --- a/security_lite/huks_hal/BUILD.gn +++ b/security_lite/huks_hal/BUILD.gn @@ -11,8 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//test/xts/tools/lite/build/suite_lite.gni") import("//base/security/huks/build/config.gni") +import("//test/xts/tools/lite/build/suite_lite.gni") hctest_suite("ActsSecurityDataTest") { suite_name = "acts" @@ -24,7 +24,7 @@ hctest_suite("ActsSecurityDataTest") { "src/security_data_huks_sign_verify_test.c", ] if (disable_authenticate == true) { - defines = [ "_CUT_AUTHENTICATE_" ] + defines = [ "_CUT_AUTHENTICATE_" ] } include_dirs = [ "src", diff --git a/security_lite/permission_posix/capability/jffs/BUILD.gn b/security_lite/permission_posix/capability/jffs/BUILD.gn index d467966552dc828c2b878abe4ae2e67089670267..a0abb9e5aa3c0cb538691531151f516f8b38bc81 100755 --- a/security_lite/permission_posix/capability/jffs/BUILD.gn +++ b/security_lite/permission_posix/capability/jffs/BUILD.gn @@ -11,8 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//test/xts/tools/lite/build/suite_lite.gni") import("//build/lite/config/subsystem/aafwk/config.gni") +import("//test/xts/tools/lite/build/suite_lite.gni") hcpptest_suite("ActsJFFS2CapabilityTest") { suite_name = "acts" @@ -40,17 +40,18 @@ hcpptest_suite("ActsJFFS2CapabilityTest") { "-lpthread", ] - if(enable_ohos_appexecfwk_feature_ability == true) { - defines = ["_BOARD_HI3516_", - "LITE_FS_JFFS2", - "TOP_DIR=\"/storage\"", - "TOP_DIR_MOUNT_INFO=\"/storage jffs\"", - ] + if (enable_ohos_appexecfwk_feature_ability == true) { + defines = [ + "_BOARD_HI3516_", + "LITE_FS_JFFS2", + "TOP_DIR=\"/storage\"", + "TOP_DIR_MOUNT_INFO=\"/storage jffs\"", + ] } else { - defines = [ - "LITE_FS_JFFS2", - "TOP_DIR=\"/storage\"", - "TOP_DIR_MOUNT_INFO=\"/storage jffs\"", - ] + defines = [ + "LITE_FS_JFFS2", + "TOP_DIR=\"/storage\"", + "TOP_DIR_MOUNT_INFO=\"/storage jffs\"", + ] } } diff --git a/security_lite/permission_posix/capability/vfat/BUILD.gn b/security_lite/permission_posix/capability/vfat/BUILD.gn index 53867c1d3f4254c27d4617cc36d8dde356bf7750..e71a8c95142e9123710759518b74f7d11e0e518b 100755 --- a/security_lite/permission_posix/capability/vfat/BUILD.gn +++ b/security_lite/permission_posix/capability/vfat/BUILD.gn @@ -11,8 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//test/xts/tools/lite/build/suite_lite.gni") import("//build/lite/config/subsystem/aafwk/config.gni") +import("//test/xts/tools/lite/build/suite_lite.gni") hcpptest_suite("ActsVFATCapabilityTest") { suite_name = "acts" @@ -40,18 +40,18 @@ hcpptest_suite("ActsVFATCapabilityTest") { "-lpthread", ] - if(enable_ohos_appexecfwk_feature_ability == true) { - defines = ["_BOARD_HI3516_", - "LITE_FS_VFAT", - "TOP_DIR=\"/sdcard\"", - "TOP_DIR_MOUNT_INFO=\"/sdcard vfat\"", - ] + if (enable_ohos_appexecfwk_feature_ability == true) { + defines = [ + "_BOARD_HI3516_", + "LITE_FS_VFAT", + "TOP_DIR=\"/sdcard\"", + "TOP_DIR_MOUNT_INFO=\"/sdcard vfat\"", + ] } else { - defines = [ - "LITE_FS_VFAT", - "TOP_DIR=\"/sdcard\"", - "TOP_DIR_MOUNT_INFO=\"/sdcard vfat\"", - ] + defines = [ + "LITE_FS_VFAT", + "TOP_DIR=\"/sdcard\"", + "TOP_DIR_MOUNT_INFO=\"/sdcard vfat\"", + ] } } - diff --git a/startup/BUILD.gn b/startup/BUILD.gn index 19d2286ae281b3c5077fddab70b9314f5336807b..77c28f985d519af873a6cdd4faaf264b3576ef9a 100755 --- a/startup/BUILD.gn +++ b/startup/BUILD.gn @@ -16,8 +16,6 @@ import("//build/ohos_var.gni") group("startup") { testonly = true if (is_standard_system) { - deps = [ - "startup_standard:startup_js_test", - ] + deps = [ "startup_standard:startup_js_test" ] } } diff --git a/startup/startup_standard/BUILD.gn b/startup/startup_standard/BUILD.gn index 7d4d843ebbc475edbec1d5d99d991107912cd5c3..377c9998f3c58bb8bdd759813b9c33c19449c0bb 100755 --- a/startup/startup_standard/BUILD.gn +++ b/startup/startup_standard/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("startup_js_test") { @@ -18,14 +19,8 @@ ohos_js_hap_suite("startup_js_test") { ":startup_js_assets", ":startup_js_resources", ] -# shared_libraries = [ -# "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "StartupJSApiTest" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" + hap_name = "ActsStartupJSApiTest" } ohos_js_assets("startup_js_assets") { source_dir = "./src/main/js/default" diff --git a/startup/startup_standard/Test.json b/startup/startup_standard/Test.json index 4dfa72f141f0f95bed44bef39e90c282069be404..b177f653952c05e5e3d9ee959db6d90ca93483de 100755 --- a/startup/startup_standard/Test.json +++ b/startup/startup_standard/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "StartupJSApiTest.hap" + "ActsStartupJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/startup_lite/bootstrap_hal/BUILD.gn b/startup_lite/bootstrap_hal/BUILD.gn index 6fb0aa3025df83166a2e0bb7860023c152d729b6..08d2099e80ac69d519a58b7ddd7f6068f36076b2 100644 --- a/startup_lite/bootstrap_hal/BUILD.gn +++ b/startup_lite/bootstrap_hal/BUILD.gn @@ -15,9 +15,7 @@ import("//test/xts/tools/lite/build/suite_lite.gni") hctest_suite("ActsBootstrapTest") { suite_name = "acts" - sources = [ - "src/samgr_api_test.c" - ] + sources = [ "src/samgr_api_test.c" ] include_dirs = [ "src", diff --git a/storage/storagedsmjstest/BUILD.gn b/storage/storagedsmjstest/BUILD.gn index f605e04f1e3aea5009bf171b94dbe768bbf3dd8f..4275032b42c77ea2f28729ce3e4bb85f18f64e25 100644 --- a/storage/storagedsmjstest/BUILD.gn +++ b/storage/storagedsmjstest/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("storagedsm_js_test") { @@ -18,16 +19,8 @@ ohos_js_hap_suite("storagedsm_js_test") { ":storagedsm_js_assets", ":storagedsm_js_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "storagedsmjstest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsStorageFmsPublicJsTest" } ohos_js_assets("storagedsm_js_assets") { source_dir = "./src/main/js/default" diff --git a/storage/storagedsmjstest/Test.json b/storage/storagedsmjstest/Test.json index 4d5073412c3c9800aa1e4be440198263a74e080f..910be0d9c5f262b48f47dbf970419f076b3214d7 100644 --- a/storage/storagedsmjstest/Test.json +++ b/storage/storagedsmjstest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "storagefmspublicjstest.hap" + "ActsStorageFmsPublicJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/storage/storagedsmstabilityjstest/BUILD.gn b/storage/storagedsmstabilityjstest/BUILD.gn index 4e39e88c2b39012662720b598438566365ce9763..61dd14fc24975b0215070f3e61c527b0ba04ab84 100644 --- a/storage/storagedsmstabilityjstest/BUILD.gn +++ b/storage/storagedsmstabilityjstest/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("storagedsmstability_js_test") { @@ -18,16 +19,8 @@ ohos_js_hap_suite("storagedsmstability_js_test") { ":storagedsmstability_js_assets", ":storagedsmstability_js_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "storagedsmstabilityjstest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsStorageFmsPublicJsTest" } ohos_js_assets("storagedsmstability_js_assets") { source_dir = "./src/main/js/default" diff --git a/storage/storagedsmstabilityjstest/Test.json b/storage/storagedsmstabilityjstest/Test.json index 4d5073412c3c9800aa1e4be440198263a74e080f..910be0d9c5f262b48f47dbf970419f076b3214d7 100644 --- a/storage/storagedsmstabilityjstest/Test.json +++ b/storage/storagedsmstabilityjstest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "storagefmspublicjstest.hap" + "ActsStorageFmsPublicJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/storage/storagefileconcurrentjstest/BUILD.gn b/storage/storagefileconcurrentjstest/BUILD.gn index 1f8abd12a3a9476bc51fea7523507535bd9b2126..b842aaa27358b5b48a79545f55192c6661ee1850 100644 --- a/storage/storagefileconcurrentjstest/BUILD.gn +++ b/storage/storagefileconcurrentjstest/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("storagefileconcurrent_js_test") { @@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileconcurrent_js_test") { ":storagefileconcurrent_js_assets", ":storagefileconcurrent_js_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "storagefileconcurrentjstest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsStorageFileConcurrentJsTest" } ohos_js_assets("storagefileconcurrent_js_assets") { source_dir = "./src/main/js/default" diff --git a/storage/storagefileconcurrentjstest/Test.json b/storage/storagefileconcurrentjstest/Test.json index 70d16ce2193f563098e647a6626fb2ff91e5ee84..ff40067a68481db0a046ce50def98e779b456171 100644 --- a/storage/storagefileconcurrentjstest/Test.json +++ b/storage/storagefileconcurrentjstest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "storagefileconcurrentjstest.hap" + "ActsStorageFileConcurrentJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/storage/storagefileioerrorjstest/BUILD.gn b/storage/storagefileioerrorjstest/BUILD.gn index f5ff1f9484bc16295db8e9cd5d1b9604b7a18bfd..eede7742fafd9aa82d46e19c2ed6c39baf9454f0 100644 --- a/storage/storagefileioerrorjstest/BUILD.gn +++ b/storage/storagefileioerrorjstest/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("storagefileioerror_js_test") { @@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileioerror_js_test") { ":storagefileioerror_js_assets", ":storagefileioerror_js_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "storagefileioerrorjstest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsStorageFileIoErrorJsTest" } ohos_js_assets("storagefileioerror_js_assets") { source_dir = "./src/main/js/default" diff --git a/storage/storagefileioerrorjstest/Test.json b/storage/storagefileioerrorjstest/Test.json index 084c9484d38e0f59b0f4560e679eca57a3c7d43b..24f1d6ed3b8e232d0bd684d1111dacf71f50bb0a 100644 --- a/storage/storagefileioerrorjstest/Test.json +++ b/storage/storagefileioerrorjstest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "storagefileioerrorjstest.hap" + "ActsStorageFileIoErrorJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/storage/storagefileioperformancejstest/BUILD.gn b/storage/storagefileioperformancejstest/BUILD.gn index d89efc741269bb4f78e8d7246106dc3967f990df..c9b2a9aebec04d136ba5f50e986c8be3aad6f6cd 100644 --- a/storage/storagefileioperformancejstest/BUILD.gn +++ b/storage/storagefileioperformancejstest/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("storagefileioperformance_js_test") { @@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileioperformance_js_test") { ":storagefileioperformance_js_assets", ":storagefileioperformance_js_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "storagefileioperformancejstest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsStorageFileIoPerformanceJsTest" } ohos_js_assets("storagefileioperformance_js_assets") { source_dir = "./src/main/js/default" diff --git a/storage/storagefileioperformancejstest/Test.json b/storage/storagefileioperformancejstest/Test.json index d0449489bf5e30d384a34b0a3fe2c99559f0ddab..5316a23e0736267575e35dbaa1f9823f999320e2 100644 --- a/storage/storagefileioperformancejstest/Test.json +++ b/storage/storagefileioperformancejstest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "storagefileioperformancejstest.hap" + "ActsStorageFileIoPerformanceJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/storage/storagefileioreliabilityjstest/BUILD.gn b/storage/storagefileioreliabilityjstest/BUILD.gn index d328a15f1e78e3ce3adcfa5edd5a5678ee24ee1e..d5e278abee6115f0d4932940a8b804188f3c0955 100644 --- a/storage/storagefileioreliabilityjstest/BUILD.gn +++ b/storage/storagefileioreliabilityjstest/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("storagefileioreliability_js_test") { @@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileioreliability_js_test") { ":storagefileioreliability_js_assets", ":storagefileioreliability_js_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "storagefileioreliabilityjstest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsStorageFileIoreLiabilityJsTest" } ohos_js_assets("storagefileioreliability_js_assets") { source_dir = "./src/main/js/default" diff --git a/storage/storagefileioreliabilityjstest/Test.json b/storage/storagefileioreliabilityjstest/Test.json index 61b847dc2effe79c9867aa0b3af2984c1d8e3a97..3b8d4ae382f53b878a31f2d0a0012f4917eb61f2 100644 --- a/storage/storagefileioreliabilityjstest/Test.json +++ b/storage/storagefileioreliabilityjstest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "storagefileioreliabilityjstest.hap" + "ActsStorageFileIoreLiabilityJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/storage/storagefileiostabilityjstest/BUILD.gn b/storage/storagefileiostabilityjstest/BUILD.gn index 4a98bb0314edd5c3074456201597b8baa21096fd..5ade4aafb8598cb9277862c39e2f7a1f0f657468 100644 --- a/storage/storagefileiostabilityjstest/BUILD.gn +++ b/storage/storagefileiostabilityjstest/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("storagefileiostability_js_test") { @@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefileiostability_js_test") { ":storagefileiostability_js_assets", ":storagefileiostability_js_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "storagefileiostabilityjstest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsStorageFileIoStabilityJsTest" } ohos_js_assets("storagefileiostability_js_assets") { source_dir = "./src/main/js/default" diff --git a/storage/storagefileiostabilityjstest/Test.json b/storage/storagefileiostabilityjstest/Test.json index edfc5b49b7df8795a26ea2b10526e284bf465c60..de692195af5d81f65d3444f71a0570759dddabb4 100644 --- a/storage/storagefileiostabilityjstest/Test.json +++ b/storage/storagefileiostabilityjstest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "storagefileiostabilityjstest.hap" + "ActsStorageFileIoStabilityJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/storage/storagefilestabilityjstest/BUILD.gn b/storage/storagefilestabilityjstest/BUILD.gn index c04dc8c1b678cdd57f4849b831878d5bfec62e3a..31cb6153457b03c2fe1bb573b0a4e9ebf190c8cf 100644 --- a/storage/storagefilestabilityjstest/BUILD.gn +++ b/storage/storagefilestabilityjstest/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("storagefilestability_js_test") { @@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefilestability_js_test") { ":storagefilestability_js_assets", ":storagefilestability_js_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "storagefilestabilityjstest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsStorageFileStabilityJsTest" } ohos_js_assets("storagefilestability_js_assets") { source_dir = "./src/main/js/default" diff --git a/storage/storagefilestabilityjstest/Test.json b/storage/storagefilestabilityjstest/Test.json index 2eba7a9e279dfd82c7f857cddaf6eaa271690b8b..3bd63df567e9c9d740a580e8820756ca8630d7fd 100644 --- a/storage/storagefilestabilityjstest/Test.json +++ b/storage/storagefilestabilityjstest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "storagefilestabilityjstest.hap" + "ActsStorageFileStabilityJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/storage/storagefmspublicjstest/BUILD.gn b/storage/storagefmspublicjstest/BUILD.gn index 805b53e223920bd2ca51ea0dd51b53b85edc1580..897f3e313b94982d0c0e82b13ac5aeda09b067da 100644 --- a/storage/storagefmspublicjstest/BUILD.gn +++ b/storage/storagefmspublicjstest/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("storagefmspublic_js_test") { @@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefmspublic_js_test") { ":storagefmspublic_js_assets", ":storagefmspublic_js_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "storagefmspublicjstest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsStorageFmsPublicJsTest" } ohos_js_assets("storagefmspublic_js_assets") { source_dir = "./src/main/js/default" diff --git a/storage/storagefmspublicjstest/Test.json b/storage/storagefmspublicjstest/Test.json index 4d5073412c3c9800aa1e4be440198263a74e080f..910be0d9c5f262b48f47dbf970419f076b3214d7 100644 --- a/storage/storagefmspublicjstest/Test.json +++ b/storage/storagefmspublicjstest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "storagefmspublicjstest.hap" + "ActsStorageFmsPublicJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/storage/storagefmssharejstest/BUILD.gn b/storage/storagefmssharejstest/BUILD.gn index a468d4b04ff5a561cfc05d367a770792377953d8..13891fb68e619c3e35065bba0281132c96de1c11 100644 --- a/storage/storagefmssharejstest/BUILD.gn +++ b/storage/storagefmssharejstest/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("storagefmsshare_js_test") { @@ -18,16 +19,8 @@ ohos_js_hap_suite("storagefmsshare_js_test") { ":storagefmsshare_js_assets", ":storagefmsshare_js_resources", ] - - # shared_libraries = [ - # "//third_party/giflib:libgif", - # "//third_party/libpng:libpng", - # ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "storagefmssharejstest" - - # part_name = "prebuilt_hap" - # subsystem_name = "xts" + hap_name = "ActsStorageFmsShareJsTest" } ohos_js_assets("storagefmsshare_js_assets") { source_dir = "./src/main/js/default" diff --git a/storage/storagefmssharejstest/Test.json b/storage/storagefmssharejstest/Test.json index 44dc1ec254deffdbf243ff7ca327163a765c5b98..24d1006e155f5ce3a9645e9c21445bd0b8f6934d 100644 --- a/storage/storagefmssharejstest/Test.json +++ b/storage/storagefmssharejstest/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "storagefmssharejstest.hap" + "ActsStorageFmsShareJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/telephony/telephonyjstest/call_manager/call_manager_mmi/BUILD.gn b/telephony/telephonyjstest/call_manager/call_manager_mmi/BUILD.gn index 00dd34b21793157d052ae5f4e530a87b7f142463..98839679e43320f4cf199e030bf74431e0ed3767 100644 --- a/telephony/telephonyjstest/call_manager/call_manager_mmi/BUILD.gn +++ b/telephony/telephonyjstest/call_manager/call_manager_mmi/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("CallManagerMMI") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "CallManagerMMI" + hap_name = "ActsCallManagerMMITest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/call_manager/call_manager_mmi/Test.json b/telephony/telephonyjstest/call_manager/call_manager_mmi/Test.json index 68815f561a53986d9ceeb7801566ef3418911ef7..da4f3b0a1cbca9a96de2f923373cc2309d26c699 100644 --- a/telephony/telephonyjstest/call_manager/call_manager_mmi/Test.json +++ b/telephony/telephonyjstest/call_manager/call_manager_mmi/Test.json @@ -10,7 +10,7 @@ "kits": [ { "test-file-name": [ - "$module.hap" + "ActsCallManagerMMITest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/telephony/telephonyjstest/call_manager/call_manager_on_dail/BUILD.gn b/telephony/telephonyjstest/call_manager/call_manager_on_dail/BUILD.gn index 27f9b3925cfdc420c151cf6e2729afa724b017eb..9e521bddb09d7205e7838726057a03521d85e72f 100644 --- a/telephony/telephonyjstest/call_manager/call_manager_on_dail/BUILD.gn +++ b/telephony/telephonyjstest/call_manager/call_manager_on_dail/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("CallManagerOnDail") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "CallManagerOnDail" + hap_name = "ActsCallManagerOnDailTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/call_manager/call_manager_on_dail/Test.json b/telephony/telephonyjstest/call_manager/call_manager_on_dail/Test.json index cd2555a4f4e381c3da74e692fb73dcd8c20954c0..3d5f0f10783c933ab1f2f33e1f49f60b65bafac5 100644 --- a/telephony/telephonyjstest/call_manager/call_manager_on_dail/Test.json +++ b/telephony/telephonyjstest/call_manager/call_manager_on_dail/Test.json @@ -10,7 +10,7 @@ "kits": [ { "test-file-name": [ - "$module.hap" + "ActsCallManagerOnDailTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/telephony/telephonyjstest/call_manager/call_manager_test/BUILD.gn b/telephony/telephonyjstest/call_manager/call_manager_test/BUILD.gn index 9ae38c44cb513271f967bbeccc6bca2667291990..cb96001962011068189e85b412b404a1892b2995 100644 --- a/telephony/telephonyjstest/call_manager/call_manager_test/BUILD.gn +++ b/telephony/telephonyjstest/call_manager/call_manager_test/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("CallManagerTest") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "CallManagerTest" + hap_name = "ActsCallManagerTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/network_search/network_search_information/BUILD.gn b/telephony/telephonyjstest/network_search/network_search_information/BUILD.gn index 13676f0cef445ef030e41b4882e59ef3b858d07b..1d2a9f4a7d8693f1b0d41046751662c3bdab0cc0 100644 --- a/telephony/telephonyjstest/network_search/network_search_information/BUILD.gn +++ b/telephony/telephonyjstest/network_search/network_search_information/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("NetworkSearchInformation") { @@ -19,7 +20,7 @@ ohos_js_hap_suite("NetworkSearchInformation") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "NetworkSearchInformation" + hap_name = "ActsNetworkSearchInformationTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/network_search/network_search_radio/BUILD.gn b/telephony/telephonyjstest/network_search/network_search_radio/BUILD.gn index b41b1e59d6d8a3e5c4ea0100942b34b9923f92ff..dc0700352264ed5880ab8b1ba29b47dc6ef18b0d 100644 --- a/telephony/telephonyjstest/network_search/network_search_radio/BUILD.gn +++ b/telephony/telephonyjstest/network_search/network_search_radio/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("NetworkSearchRadio") { @@ -19,7 +20,7 @@ ohos_js_hap_suite("NetworkSearchRadio") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "NetworkSearchRadio" + hap_name = "ActsNetworkSearchRadioTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/network_search/network_search_selection_mode/BUILD.gn b/telephony/telephonyjstest/network_search/network_search_selection_mode/BUILD.gn index a5af3ac607eb491d5306e0bb36ba660ef208e9b3..10a3815790019f67cf5a22c2ec63968bbff4c81c 100644 --- a/telephony/telephonyjstest/network_search/network_search_selection_mode/BUILD.gn +++ b/telephony/telephonyjstest/network_search/network_search_selection_mode/BUILD.gn @@ -10,6 +10,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("NetworkSearchSelectionMoce") { @@ -19,7 +20,7 @@ ohos_js_hap_suite("NetworkSearchSelectionMoce") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "NetworkSearchSelectionMoce" + hap_name = "ActsNetworkSearchSelectionMoceTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/sim/sim_file_manager_function_test/BUILD.gn b/telephony/telephonyjstest/sim/sim_file_manager_function_test/BUILD.gn index a24cfecae7b1612f41992ce92a5e32a6bbeb6fec..1b6e31b98193d7de6aec371be2cfc37eb71e44b8 100644 --- a/telephony/telephonyjstest/sim/sim_file_manager_function_test/BUILD.gn +++ b/telephony/telephonyjstest/sim/sim_file_manager_function_test/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("SimFileManagerFunctionTest") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "SimFileManagerFunctionTest" + hap_name = "ActsSimFileManagerFunctionTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/sim/sim_manager_function_test/BUILD.gn b/telephony/telephonyjstest/sim/sim_manager_function_test/BUILD.gn index 328cfbab0647661432a2eceff1e09682ae209f5a..99ab4bedf71f8b724d491c9d1d0824363ddade9b 100644 --- a/telephony/telephonyjstest/sim/sim_manager_function_test/BUILD.gn +++ b/telephony/telephonyjstest/sim/sim_manager_function_test/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("SimManagerFunctionTest") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "SimManagerFunctionTest" + hap_name = "ActsSimManagerFunctionTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/sim/sim_no_sim_function_test/BUILD.gn b/telephony/telephonyjstest/sim/sim_no_sim_function_test/BUILD.gn index 615a87b265f33086c25fda1b0f6f916182699dd4..b89d84159b31749870df05dc959a8760cd429560 100644 --- a/telephony/telephonyjstest/sim/sim_no_sim_function_test/BUILD.gn +++ b/telephony/telephonyjstest/sim/sim_no_sim_function_test/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("SimNoSimFunctionTest") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "SimNoSimFunctionTest" + hap_name = "ActsSimNoSimFunctionTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/sim/sim_state_manager_function_test/BUILD.gn b/telephony/telephonyjstest/sim/sim_state_manager_function_test/BUILD.gn index 33c8150d8d5ad31ffce4f55f918689ac9c791af5..af50c809a0fbed95843c0f97d1f58e3bda6f4226 100644 --- a/telephony/telephonyjstest/sim/sim_state_manager_function_test/BUILD.gn +++ b/telephony/telephonyjstest/sim/sim_state_manager_function_test/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("SimStateManagerFunctionTest") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "SimStateManagerFunctionTest" + hap_name = "ActsSimStateManagerFunctionTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/sms_mms/sms_mms_add/BUILD.gn b/telephony/telephonyjstest/sms_mms/sms_mms_add/BUILD.gn index b203edee37b40a052c0801a33671ed60d5df2203..c26bf0c08c7ff09c213ea43f93c57458a3841689 100644 --- a/telephony/telephonyjstest/sms_mms/sms_mms_add/BUILD.gn +++ b/telephony/telephonyjstest/sms_mms/sms_mms_add/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsAdd") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "SmsMmsAdd" + hap_name = "ActsSmsMmsAddTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/sms_mms/sms_mms_config/BUILD.gn b/telephony/telephonyjstest/sms_mms/sms_mms_config/BUILD.gn index e119ed53ef36f9dc62271a2d04bf653a86dccdb7..c11afba445db81feb8fcd00b11a213356da793be 100644 --- a/telephony/telephonyjstest/sms_mms/sms_mms_config/BUILD.gn +++ b/telephony/telephonyjstest/sms_mms/sms_mms_config/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsConfig") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "SmsMmsConfig" + hap_name = "ActsSmsMmsConfigTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/sms_mms/sms_mms_create_message/BUILD.gn b/telephony/telephonyjstest/sms_mms/sms_mms_create_message/BUILD.gn index af2b84706dc58f335bd203c10ebdcf650769ecd5..3968d6e5c63746304b25a7dd5bfe85d7685ef539 100644 --- a/telephony/telephonyjstest/sms_mms/sms_mms_create_message/BUILD.gn +++ b/telephony/telephonyjstest/sms_mms/sms_mms_create_message/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsCreateMessage") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "SmsMmsCreateMessage" + hap_name = "ActsSmsMmsCreateMessageTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/sms_mms/sms_mms_del_sim/BUILD.gn b/telephony/telephonyjstest/sms_mms/sms_mms_del_sim/BUILD.gn index 5e75ac5dbf8dc63bb3211dfdcc3574a643070b4c..bcdfab1b378145d5ea0a99c7bbdb08535398f9a3 100644 --- a/telephony/telephonyjstest/sms_mms/sms_mms_del_sim/BUILD.gn +++ b/telephony/telephonyjstest/sms_mms/sms_mms_del_sim/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsDelSim") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "SmsMmsDelSim" + hap_name = "ActsSmsMmsDelSimTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/sms_mms/sms_mms_function/BUILD.gn b/telephony/telephonyjstest/sms_mms/sms_mms_function/BUILD.gn index cf1146963c1b0e6b63a94f68c2f8b30f858678d0..9d490080bcf8cd330195826a308970988c604bd6 100644 --- a/telephony/telephonyjstest/sms_mms/sms_mms_function/BUILD.gn +++ b/telephony/telephonyjstest/sms_mms/sms_mms_function/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsFunction") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "SmsMmsFunction" + hap_name = "ActsSmsMmsFunctionTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/sms_mms/sms_mms_get_all/BUILD.gn b/telephony/telephonyjstest/sms_mms/sms_mms_get_all/BUILD.gn index c020f1324c86df79d472511c76d93ce2b3c32aa5..51cf2f4b5addcb424a35d099e9f124096f29abe2 100644 --- a/telephony/telephonyjstest/sms_mms/sms_mms_get_all/BUILD.gn +++ b/telephony/telephonyjstest/sms_mms/sms_mms_get_all/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsGetAll") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "SmsMmsGetAll" + hap_name = "ActsSmsMmsGetAllTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/sms_mms/sms_mms_radio/BUILD.gn b/telephony/telephonyjstest/sms_mms/sms_mms_radio/BUILD.gn index e119ed53ef36f9dc62271a2d04bf653a86dccdb7..c11afba445db81feb8fcd00b11a213356da793be 100644 --- a/telephony/telephonyjstest/sms_mms/sms_mms_radio/BUILD.gn +++ b/telephony/telephonyjstest/sms_mms/sms_mms_radio/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsConfig") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "SmsMmsConfig" + hap_name = "ActsSmsMmsConfigTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/sms_mms/sms_mms_smsc/BUILD.gn b/telephony/telephonyjstest/sms_mms/sms_mms_smsc/BUILD.gn index f8f53ccfe8ccbd347a79dd309d19a0612a62d824..450f159f7c108e5fabef01a92d1beb65a07885a2 100644 --- a/telephony/telephonyjstest/sms_mms/sms_mms_smsc/BUILD.gn +++ b/telephony/telephonyjstest/sms_mms/sms_mms_smsc/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsSmsc") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "SmsMmsSmsc" + hap_name = "ActsSmsMmsSmscTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/sms_mms/sms_mms_updata_asy/BUILD.gn b/telephony/telephonyjstest/sms_mms/sms_mms_updata_asy/BUILD.gn index d004e841b5b9235610d6f8e6ee482f73fb8cf978..88f5609694b913f536603534f1d9f9277e3ea638 100644 --- a/telephony/telephonyjstest/sms_mms/sms_mms_updata_asy/BUILD.gn +++ b/telephony/telephonyjstest/sms_mms/sms_mms_updata_asy/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsUpdataAsy") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "SmsMmsUpdataAsy" + hap_name = "ActsSmsMmsUpdataAsyTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/telephony/telephonyjstest/sms_mms/sms_mms_updata_pro/BUILD.gn b/telephony/telephonyjstest/sms_mms/sms_mms_updata_pro/BUILD.gn index 022c61aaf41ec8be064e359e21a988d1c7b6602b..c41b75424d44fd1b34e1ec4bf42478f3b9589a5b 100644 --- a/telephony/telephonyjstest/sms_mms/sms_mms_updata_pro/BUILD.gn +++ b/telephony/telephonyjstest/sms_mms/sms_mms_updata_pro/BUILD.gn @@ -20,7 +20,7 @@ ohos_js_hap_suite("SmsMmsUpdataPro") { ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "SmsMmsUpdataPro" + hap_name = "ActsSmsMmsUpdataProTest" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/update_lite/dupdate_posix/BUILD.gn b/update_lite/dupdate_posix/BUILD.gn index c3e9624d5b99b400d607bedd26b4361450edc3b7..e993c2dc9e9b7e562b7158e349ae249e1d47cab8 100755 --- a/update_lite/dupdate_posix/BUILD.gn +++ b/update_lite/dupdate_posix/BUILD.gn @@ -22,7 +22,7 @@ hcpptest_suite("ActsUpdateTest") { "//base/update/ota_lite/hals", "//utils/native/lite/include", ] - deps = [ + deps = [ "$ohos_third_party_dir/mbedtls:mbedtls_static", "//base/update/ota_lite/frameworks/source:hota", ] diff --git a/updater/BUILD.gn b/updater/BUILD.gn index 714f0ce594a2c27c7e691e0635190ec0fb2434dd..91af449a77558fb31c3d52bc0644902838357d00 100644 --- a/updater/BUILD.gn +++ b/updater/BUILD.gn @@ -16,8 +16,6 @@ import("//build/ohos_var.gni") group("update") { testonly = true if (is_standard_system) { - deps = [ - "update_test:update_js_test", - ] + deps = [ "update_test:update_js_test" ] } } diff --git a/updater/update_test/BUILD.gn b/updater/update_test/BUILD.gn index 96b41eaaef81f200856e948e16919f8bb42ff348..d48f41e37137cb2b5f56a3ba8fbb4dc163ece88d 100644 --- a/updater/update_test/BUILD.gn +++ b/updater/update_test/BUILD.gn @@ -12,20 +12,15 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") + ohos_js_hap_suite("update_js_test") { hap_profile = "./src/main/config.json" deps = [ ":update_js_assets", ":update_js_resources", ] -# shared_libraries = [ -# "//third_party/giflib:libgif", -# "//third_party/libpng:libpng", -# ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "updatejstest" -# part_name = "prebuilt_hap" -# subsystem_name = "xts" + hap_name = "ActsUpdateJsTest" } ohos_js_assets("update_js_assets") { source_dir = "./src/main/js/default" diff --git a/updater/update_test/Test.json b/updater/update_test/Test.json index 4a787de6673cc4ada42f1f26729b695b4895d54b..375b46120b48b257a1b41460b2b3d768105396f1 100644 --- a/updater/update_test/Test.json +++ b/updater/update_test/Test.json @@ -9,7 +9,7 @@ "kits": [ { "test-file-name": [ - "updatejstest.hap" + "ActsUpdateJsTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true