提交 8558c9ef 编写于 作者: G gaoxi785

update test

Signed-off-by: Ngaoxi785 <gaoxi785@huawei.com>
上级 8388dc96
...@@ -21,29 +21,19 @@ ohos_js_hap_suite("ActsCrossplatformConnectionTest") { ...@@ -21,29 +21,19 @@ ohos_js_hap_suite("ActsCrossplatformConnectionTest") {
ets2abc = true ets2abc = true
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
# hap_name: HAP的名字,可选,默认为目标名
hap_name = "ActsCrossplatformConnectionTest" hap_name = "ActsCrossplatformConnectionTest"
subsystem_name = "communication" subsystem_name = "communication"
part_name = "netstack" part_name = "netstack"
} }
ohos_app_scope("windowStage_app_profile") { ohos_app_scope("windowStage_app_profile") {
# app_profile: HAP的AppScope中的app.json,只在Stage模型下使用
app_profile = "AppScope/app.json" app_profile = "AppScope/app.json"
# sources: 资源文件路径
sources = [ "AppScope/resources" ] sources = [ "AppScope/resources" ]
} }
ohos_js_assets("windowStage_js_assets") { ohos_js_assets("windowStage_js_assets") {
# source_dir: js或ets代码路径,兼容FA模型的单ability配置到ability目录
source_dir = "src/main/ets" source_dir = "src/main/ets"
} }
ohos_resources("windowStage_resources") { ohos_resources("windowStage_resources") {
# sources: 资源文件路径
sources = [ "src/main/resources" ] sources = [ "src/main/resources" ]
# deps: 当前目标的依赖
deps = [ ":windowStage_app_profile" ] deps = [ ":windowStage_app_profile" ]
# hap_profile: HAP的config.json,Stage模型对应module.json
hap_profile = "src/main/module.json" hap_profile = "src/main/module.json"
} }
{ {
"description": "Configuration for hjunit demo Tests", "description": "Configuration for hjunit demo Tests",
// 指定设备执行的驱动
"driver": { "driver": {
"type": "OHJSUnitTest", "type": "OHJSUnitTest",
//test-timeout: 测试hap 整体执行用例的执行时长 "test-timeout": "600000",
"test-timeout": "60000", "shell-timeout": "600000",
//shell-timeout: aa test 拉起命令执行时长
"shell-timeout": "60000",
//bundle-name: 与HAP的app.json bundleName 保持一致
"bundle-name": "ohos.acts.telephony.crossplatform.Connection.normal", "bundle-name": "ohos.acts.telephony.crossplatform.Connection.normal",
//module-name: 与HAP的module.json "module"字段的 name 保持一致 "module-name": "entry_test",
"module-name": "entry_test" "testcase-timeout": 10000
//testcase-timeout: 测试hap 单条用例的执行时长
//"testcase-timeout": 5000
}, },
// kit的作用主要是为了支撑测试执行活动,在测试前执行预制操作(Setup),在测试后执行清理操作(Teardown)
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"ActsDemoStageTest.hap" "ActsCrossplatformConnectionTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -20,30 +20,19 @@ ohos_js_hap_suite("ActsCrossplatformWebSocketTest") { ...@@ -20,30 +20,19 @@ ohos_js_hap_suite("ActsCrossplatformWebSocketTest") {
] ]
ets2abc = true ets2abc = true
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
# hap_name: HAP的名字,可选,默认为目标名
hap_name = "ActsCrossplatformWebSocketTest" hap_name = "ActsCrossplatformWebSocketTest"
subsystem_name = "communication" subsystem_name = "communication"
part_name = "netstack" part_name = "netstack"
} }
ohos_app_scope("windowStage_app_profile") { ohos_app_scope("windowStage_app_profile") {
# app_profile: HAP的AppScope中的app.json,只在Stage模型下使用
app_profile = "AppScope/app.json" app_profile = "AppScope/app.json"
# sources: 资源文件路径
sources = [ "AppScope/resources" ] sources = [ "AppScope/resources" ]
} }
ohos_js_assets("windowStage_js_assets") { ohos_js_assets("windowStage_js_assets") {
# source_dir: js或ets代码路径,兼容FA模型的单ability配置到ability目录
source_dir = "src/main/ets" source_dir = "src/main/ets"
} }
ohos_resources("windowStage_resources") { ohos_resources("windowStage_resources") {
# sources: 资源文件路径
sources = [ "src/main/resources" ] sources = [ "src/main/resources" ]
# deps: 当前目标的依赖
deps = [ ":windowStage_app_profile" ] deps = [ ":windowStage_app_profile" ]
# hap_profile: HAP的config.json,Stage模型对应module.json
hap_profile = "src/main/module.json" hap_profile = "src/main/module.json"
} }
{ {
"description": "Configuration for hjunit demo Tests", "description": "Configuration for hjunit demo Tests",
// 指定设备执行的驱动
"driver": { "driver": {
"type": "OHJSUnitTest", "type": "OHJSUnitTest",
//test-timeout: 测试hap 整体执行用例的执行时长 "test-timeout": "600000",
"test-timeout": "60000", "shell-timeout": "600000",
//shell-timeout: aa test 拉起命令执行时长
"shell-timeout": "60000",
//bundle-name: 与HAP的app.json bundleName 保持一致
"bundle-name": "ohos.acts.telephony.crossplatform.WebSocket.normal", "bundle-name": "ohos.acts.telephony.crossplatform.WebSocket.normal",
//module-name: 与HAP的module.json "module"字段的 name 保持一致 "module-name": "entry_test",
"module-name": "entry_test" "testcase-timeout": 10000
//testcase-timeout: 测试hap 单条用例的执行时长
//"testcase-timeout": 5000
}, },
// kit的作用主要是为了支撑测试执行活动,在测试前执行预制操作(Setup),在测试后执行清理操作(Teardown)
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"ActsDemoStageTest.hap" "ActsCrossplatformWebSocketTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -67,7 +67,6 @@ describe("Telephony_NetManager_NetWorkTest", function () { ...@@ -67,7 +67,6 @@ describe("Telephony_NetManager_NetWorkTest", function () {
done(); done();
} }
}); });
done();
}); });
/** /**
...@@ -113,7 +112,6 @@ describe("Telephony_NetManager_NetWorkTest", function () { ...@@ -113,7 +112,6 @@ describe("Telephony_NetManager_NetWorkTest", function () {
done(); done();
} }
}); });
done();
}); });
}); });
} }
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册