diff --git a/telephony/crossplatform/telephonyConnectionetstest/BUILD.gn b/telephony/crossplatform/telephonyConnectionetstest/BUILD.gn index 6390bc9a97218219610b8e63fd2f2fdffa5536b3..d2350f16784e4bd3d3ad049cc5e349455057d55d 100644 --- a/telephony/crossplatform/telephonyConnectionetstest/BUILD.gn +++ b/telephony/crossplatform/telephonyConnectionetstest/BUILD.gn @@ -21,29 +21,19 @@ ohos_js_hap_suite("ActsCrossplatformConnectionTest") { ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" - # hap_name: HAP的名字,可选,默认为目标名 hap_name = "ActsCrossplatformConnectionTest" subsystem_name = "communication" part_name = "netstack" } ohos_app_scope("windowStage_app_profile") { - # app_profile: HAP的AppScope中的app.json,只在Stage模型下使用 app_profile = "AppScope/app.json" - - # sources: 资源文件路径 sources = [ "AppScope/resources" ] } ohos_js_assets("windowStage_js_assets") { - # source_dir: js或ets代码路径,兼容FA模型的单ability配置到ability目录 source_dir = "src/main/ets" } ohos_resources("windowStage_resources") { - # sources: 资源文件路径 sources = [ "src/main/resources" ] - - # deps: 当前目标的依赖 deps = [ ":windowStage_app_profile" ] - - # hap_profile: HAP的config.json,Stage模型对应module.json hap_profile = "src/main/module.json" } diff --git a/telephony/crossplatform/telephonyConnectionetstest/Test.json b/telephony/crossplatform/telephonyConnectionetstest/Test.json index d3e9816dc90dd3676163ec651c1e75aaf51cf836..ee18ab47084fd7665d4ed8556994c129d2bb0185 100644 --- a/telephony/crossplatform/telephonyConnectionetstest/Test.json +++ b/telephony/crossplatform/telephonyConnectionetstest/Test.json @@ -1,24 +1,17 @@ { "description": "Configuration for hjunit demo Tests", - // 指定设备执行的驱动 "driver": { "type": "OHJSUnitTest", - //test-timeout: 测试hap 整体执行用例的执行时长 - "test-timeout": "60000", - //shell-timeout: aa test 拉起命令执行时长 - "shell-timeout": "60000", - //bundle-name: 与HAP的app.json 中 bundleName 保持一致 + "test-timeout": "600000", + "shell-timeout": "600000", "bundle-name": "ohos.acts.telephony.crossplatform.Connection.normal", - //module-name: 与HAP的module.json 中"module"字段的 name 保持一致 - "module-name": "entry_test" - //testcase-timeout: 测试hap 单条用例的执行时长 - //"testcase-timeout": 5000 + "module-name": "entry_test", + "testcase-timeout": 10000 }, - // kit的作用主要是为了支撑测试执行活动,在测试前执行预制操作(Setup),在测试后执行清理操作(Teardown) "kits": [ { "test-file-name": [ - "ActsDemoStageTest.hap" + "ActsCrossplatformConnectionTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/telephony/crossplatform/telephonyWebSocketetstest/BUILD.gn b/telephony/crossplatform/telephonyWebSocketetstest/BUILD.gn index 8eccd552b9db69ad6b2765effc335f6805101995..3c8ed2e8f38cf8f0870f091b9923123ebe28c263 100644 --- a/telephony/crossplatform/telephonyWebSocketetstest/BUILD.gn +++ b/telephony/crossplatform/telephonyWebSocketetstest/BUILD.gn @@ -20,30 +20,19 @@ ohos_js_hap_suite("ActsCrossplatformWebSocketTest") { ] ets2abc = true certificate_profile = "./signature/openharmony_sx.p7b" - - # hap_name: HAP的名字,可选,默认为目标名 hap_name = "ActsCrossplatformWebSocketTest" subsystem_name = "communication" part_name = "netstack" } ohos_app_scope("windowStage_app_profile") { - # app_profile: HAP的AppScope中的app.json,只在Stage模型下使用 app_profile = "AppScope/app.json" - - # sources: 资源文件路径 sources = [ "AppScope/resources" ] } ohos_js_assets("windowStage_js_assets") { - # source_dir: js或ets代码路径,兼容FA模型的单ability配置到ability目录 source_dir = "src/main/ets" } ohos_resources("windowStage_resources") { - # sources: 资源文件路径 sources = [ "src/main/resources" ] - - # deps: 当前目标的依赖 deps = [ ":windowStage_app_profile" ] - - # hap_profile: HAP的config.json,Stage模型对应module.json hap_profile = "src/main/module.json" } diff --git a/telephony/crossplatform/telephonyWebSocketetstest/Test.json b/telephony/crossplatform/telephonyWebSocketetstest/Test.json index 2542f970ed030638554d077897e5b7d733e7f234..1f1510e3823d1490e41324c69ab2a42cb5ef0acd 100644 --- a/telephony/crossplatform/telephonyWebSocketetstest/Test.json +++ b/telephony/crossplatform/telephonyWebSocketetstest/Test.json @@ -1,24 +1,17 @@ { "description": "Configuration for hjunit demo Tests", - // 指定设备执行的驱动 "driver": { "type": "OHJSUnitTest", - //test-timeout: 测试hap 整体执行用例的执行时长 - "test-timeout": "60000", - //shell-timeout: aa test 拉起命令执行时长 - "shell-timeout": "60000", - //bundle-name: 与HAP的app.json 中 bundleName 保持一致 + "test-timeout": "600000", + "shell-timeout": "600000", "bundle-name": "ohos.acts.telephony.crossplatform.WebSocket.normal", - //module-name: 与HAP的module.json 中"module"字段的 name 保持一致 - "module-name": "entry_test" - //testcase-timeout: 测试hap 单条用例的执行时长 - //"testcase-timeout": 5000 + "module-name": "entry_test", + "testcase-timeout": 10000 }, - // kit的作用主要是为了支撑测试执行活动,在测试前执行预制操作(Setup),在测试后执行清理操作(Teardown) "kits": [ { "test-file-name": [ - "ActsDemoStageTest.hap" + "ActsCrossplatformWebSocketTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/telephony/telephonyjstest/netmanager_base/network_wifi/src/main/js/test/Http.wifi.test.js b/telephony/telephonyjstest/netmanager_base/network_wifi/src/main/js/test/Http.wifi.test.js index 3fe93b3d33737e790eb0850c55fa058cfe229be7..e8bed1e266718a90bb0e04c9e7c0938981bf20c8 100644 --- a/telephony/telephonyjstest/netmanager_base/network_wifi/src/main/js/test/Http.wifi.test.js +++ b/telephony/telephonyjstest/netmanager_base/network_wifi/src/main/js/test/Http.wifi.test.js @@ -67,7 +67,6 @@ describe("Telephony_NetManager_NetWorkTest", function () { done(); } }); - done(); }); /** @@ -113,7 +112,6 @@ describe("Telephony_NetManager_NetWorkTest", function () { done(); } }); - done(); }); }); } \ No newline at end of file