Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
1 年多 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts
提交 c5456496 编写于 作者: Z zhangfuzhi
浏览文件
操作

delete 

Signed-off-by: Nzhangfuzhi <zhangfuzhi1@huawei.com>
上级 dac141e0
隐藏空白更改
内联 并排
Showing with 42 addition and 32 deletion
telephony/telephonyjstest/netmanager_base/jshttp/src/main/js/test/Http2Test.js
浏览文件 @ c5456496
...@@ -100,8 +100,7 @@ export default function Http2Test() { ...@@ -100,8 +100,7 @@ export default function Http2Test() {
header: "content-type': 'application/json", header: "content-type': 'application/json",
readTimeout: 6000, readTimeout: 6000,
connectTimeout: 6000, connectTimeout: 6000,
priority: 100, priority: 100
caPath: ''
} }
var httpRequest = net_Http.createHttp(); var httpRequest = net_Http.createHttp();
httpRequest.request("https://www.zhihu.com", httpRequestOptions, (err, data) => { httpRequest.request("https://www.zhihu.com", httpRequestOptions, (err, data) => {
......
telephony/telephonyjstest/netmanager_base/jshttp/src/main/js/test/HttpRequest2JsunitTest.js
浏览文件 @ c5456496
...@@ -56,25 +56,48 @@ export default function HttpRequest2JsunitTest() { ...@@ -56,25 +56,48 @@ export default function HttpRequest2JsunitTest() {
it("SUB_Telephony_NetStack_HttpRequest2_Async_0100", 0, async function (done) { it("SUB_Telephony_NetStack_HttpRequest2_Async_0100", 0, async function (done) {
let CaseName = "SUB_Telephony_NetStack_HttpRequest2_Async_0100"; let CaseName = "SUB_Telephony_NetStack_HttpRequest2_Async_0100";
let Address_Img = "https://img1.baidu.com/it/u=3010094603,1247181326&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=500"; let Address_Img = "https://img1.baidu.com/it/u=3010094603,1247181326&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=500";
let httpRequest = http.createHttp(); let HttpRequest = http.createHttp();
try { try {
httpRequest.on("dataReceive", dataReceive_on_callback); HttpRequest.on("dataReceive", dataReceive_on_callback);
httpRequest.on("dataProgress", dataProgress_on_callback); HttpRequest.request2(Address_Img, httpRequestOptions).then(function () {
httpRequest.on("dataEnd", dataEnd_on_callback);
httpRequest.request2(Address_Img, httpRequestOptions, (err,data) => {
console.info(CaseName + " responseCode data : " + data);
console.log(CaseName + "NETSTACK request2 OK!"); console.log(CaseName + "NETSTACK request2 OK!");
httpRequest.off("dataReceive"); HttpRequest.off("dataReceive");
console.log("NETSTACK off dataReceive success!"); console.log("NETSTACK off dataReceive success!");
httpRequest.off("dataProgress"); }).catch(function (err) {
console.log("NETSTACK request2 ERROR : error = " + JSON.stringify(err));
});
} catch (error) {
console.log("NETSTACK request2 ERROR : error = " + JSON.stringify(error));
}
try {
HttpRequest.on("dataProgress", dataProgress_on_callback);
HttpRequest.request2(Address_Img, httpRequestOptions).then(function () {
console.log(CaseName + "NETSTACK request2 OK!");
HttpRequest.off("dataProgress");
console.log("NETSTACK off dataProgress success!"); console.log("NETSTACK off dataProgress success!");
httpRequest.off("dataEnd"); }).catch(function (err) {
console.log("NETSTACK request2 ERROR : error = " + JSON.stringify(err));
});
} catch (error) {
console.log("NETSTACK request2 ERROR : error = " + JSON.stringify(error));
}
try {
HttpRequest.on("dataEnd", dataEnd_on_callback);
HttpRequest.request2(Address_Img, httpRequestOptions).then(function () {
console.log(CaseName + "NETSTACK request2 OK!");
HttpRequest.off("dataEnd");
done();
console.log("NETSTACK off dataEnd success!"); console.log("NETSTACK off dataEnd success!");
httpRequest.destroy(); }).catch(function (err) {
console.log("NETSTACK request2 ERROR : error = " + JSON.stringify(err));
expect(err).assertFalse();
done(); done();
}) });
} catch (error) { } catch (error) {
console.log("NETSTACK request2 catch : error = " + JSON.stringify(error)); console.log("NETSTACK request2 ERROR : error = " + JSON.stringify(error));
expect(error).assertFalse();
done();
} }
}); });
...@@ -87,14 +110,13 @@ export default function HttpRequest2JsunitTest() { ...@@ -87,14 +110,13 @@ export default function HttpRequest2JsunitTest() {
it("SUB_Telephony_NetStack_HttpRequest2_Async_0200", 0, async function (done) { it("SUB_Telephony_NetStack_HttpRequest2_Async_0200", 0, async function (done) {
let CaseName = "SUB_Telephony_NetStack_HttpRequest2_Async_0200" let CaseName = "SUB_Telephony_NetStack_HttpRequest2_Async_0200"
var httpRequest = http.createHttp(); var httpRequest = http.createHttp();
httpRequest.request2(Address_Baidu, (err,data) => { httpRequest.request2(Address_Baidu, err => {
if (err) { if (err) {
console.log(CaseName + " request2 ERROR" + JSON.stringify(err)); console.log(CaseName + " request2 ERROR" + JSON.stringify(err));
expect().assertFail(); expect().assertFail();
done(); done();
} }
httpRequest.destroy(); console.log(CaseName + " request2 Finish");
console.log(CaseName + " request2 Finish responseCode " + data);
done(); done();
}); });
}); });
...@@ -107,9 +129,8 @@ export default function HttpRequest2JsunitTest() { ...@@ -107,9 +129,8 @@ export default function HttpRequest2JsunitTest() {
it("SUB_Telephony_NetStack_HttpRequest2_Promise_0100", 0, async function (done) { it("SUB_Telephony_NetStack_HttpRequest2_Promise_0100", 0, async function (done) {
let CaseName = "SUB_Telephony_NetStack_HttpRequest2_Promise_0100"; let CaseName = "SUB_Telephony_NetStack_HttpRequest2_Promise_0100";
var httpRequest = http.createHttp(); var httpRequest = http.createHttp();
httpRequest.request2(Address_Baidu, httpRequestOptions).then(function (data) { httpRequest.request2(Address_Baidu, httpRequestOptions).then(function () {
console.log(CaseName + " request2 Finish responseCode " + data); console.log(CaseName + " request2 Finish ");
httpRequest.destroy();
done(); done();
}).catch(function (err) { }).catch(function (err) {
console.log(CaseName + " error = " + JSON.stringify(err)); console.log(CaseName + " error = " + JSON.stringify(err));
...@@ -126,9 +147,8 @@ export default function HttpRequest2JsunitTest() { ...@@ -126,9 +147,8 @@ export default function HttpRequest2JsunitTest() {
it("SUB_Telephony_NetStack_HttpRequest2_Promise_0200", 0, async function (done) { it("SUB_Telephony_NetStack_HttpRequest2_Promise_0200", 0, async function (done) {
let CaseName = "SUB_Telephony_NetStack_HttpRequest2_Promise_0200"; let CaseName = "SUB_Telephony_NetStack_HttpRequest2_Promise_0200";
var httpRequest = http.createHttp(); var httpRequest = http.createHttp();
httpRequest.request2(Address_Baidu).then(function (data) { httpRequest.request2(Address_Baidu).then(function () {
console.log(CaseName + " request2 Finish responseCode " + data); console.log(CaseName + " request2 Finish ");
httpRequest.destroy();
done(); done();
}).catch(function (err) { }).catch(function (err) {
console.log(CaseName + " : error = " + JSON.stringify(err)); console.log(CaseName + " : error = " + JSON.stringify(err));
...@@ -152,7 +172,6 @@ export default function HttpRequest2JsunitTest() { ...@@ -152,7 +172,6 @@ export default function HttpRequest2JsunitTest() {
setTimeout(() => { setTimeout(() => {
expect(dataReceive_status).assertEqual(true); expect(dataReceive_status).assertEqual(true);
console.log(CaseName + " on dataReceive Finish "); console.log(CaseName + " on dataReceive Finish ");
httpRequest.destroy();
done(); done();
}, delayTime); }, delayTime);
}).catch(function (err) { }).catch(function (err) {
...@@ -184,7 +203,6 @@ export default function HttpRequest2JsunitTest() { ...@@ -184,7 +203,6 @@ export default function HttpRequest2JsunitTest() {
expect(dataReceive_status).assertEqual(false); expect(dataReceive_status).assertEqual(false);
}, delayTime); }, delayTime);
console.log(CaseName + " off dataReceive Finish "); console.log(CaseName + " off dataReceive Finish ");
httpRequest.destroy();
done(); done();
}).catch(function (err) { }).catch(function (err) {
console.log(CaseName + " : error = " + JSON.stringify(err)); console.log(CaseName + " : error = " + JSON.stringify(err));
...@@ -214,7 +232,6 @@ export default function HttpRequest2JsunitTest() { ...@@ -214,7 +232,6 @@ export default function HttpRequest2JsunitTest() {
httpRequest.off("dataReceive"); httpRequest.off("dataReceive");
}, delayTime); }, delayTime);
console.log(CaseName + " off dataReceive Finish "); console.log(CaseName + " off dataReceive Finish ");
httpRequest.destroy();
done(); done();
}).catch(function (err) { }).catch(function (err) {
console.log(CaseName + " : error = " + JSON.stringify(err)); console.log(CaseName + " : error = " + JSON.stringify(err));
...@@ -243,7 +260,6 @@ export default function HttpRequest2JsunitTest() { ...@@ -243,7 +260,6 @@ export default function HttpRequest2JsunitTest() {
expect(dataProgress_status).assertEqual(true); expect(dataProgress_status).assertEqual(true);
}, delayTime); }, delayTime);
console.log(CaseName + " on dataProgress Finish "); console.log(CaseName + " on dataProgress Finish ");
httpRequest.destroy();
done(); done();
}).catch(function (err) { }).catch(function (err) {
console.log(CaseName + " : error = " + JSON.stringify(err)); console.log(CaseName + " : error = " + JSON.stringify(err));
...@@ -273,7 +289,6 @@ export default function HttpRequest2JsunitTest() { ...@@ -273,7 +289,6 @@ export default function HttpRequest2JsunitTest() {
expect(dataProgress_status).assertEqual(false); expect(dataProgress_status).assertEqual(false);
}, delayTime); }, delayTime);
console.log(CaseName + " off dataProgress Finish "); console.log(CaseName + " off dataProgress Finish ");
httpRequest.destroy();
done(); done();
}).catch(function (err) { }).catch(function (err) {
console.log(CaseName + " : error = " + JSON.stringify(err)); console.log(CaseName + " : error = " + JSON.stringify(err));
...@@ -303,7 +318,6 @@ export default function HttpRequest2JsunitTest() { ...@@ -303,7 +318,6 @@ export default function HttpRequest2JsunitTest() {
httpRequest.off("dataProgress"); httpRequest.off("dataProgress");
}, delayTime); }, delayTime);
console.log(CaseName + " off dataProgress Finish "); console.log(CaseName + " off dataProgress Finish ");
httpRequest.destroy();
done(); done();
}).catch(function (err) { }).catch(function (err) {
console.log(CaseName + " : error = " + JSON.stringify(err)); console.log(CaseName + " : error = " + JSON.stringify(err));
...@@ -333,7 +347,6 @@ export default function HttpRequest2JsunitTest() { ...@@ -333,7 +347,6 @@ export default function HttpRequest2JsunitTest() {
expect(dataEnd_status).assertEqual(true); expect(dataEnd_status).assertEqual(true);
}, delayTime); }, delayTime);
console.log(CaseName + " on dataEnd Finish "); console.log(CaseName + " on dataEnd Finish ");
httpRequest.destroy();
done(); done();
}).catch(function (err) { }).catch(function (err) {
console.log(CaseName + " : error = " + JSON.stringify(err)); console.log(CaseName + " : error = " + JSON.stringify(err));
...@@ -364,7 +377,6 @@ export default function HttpRequest2JsunitTest() { ...@@ -364,7 +377,6 @@ export default function HttpRequest2JsunitTest() {
expect(dataEnd_status).assertEqual(false); expect(dataEnd_status).assertEqual(false);
}, delayTime); }, delayTime);
console.log(CaseName + " off dataEnd Finish "); console.log(CaseName + " off dataEnd Finish ");
httpRequest.destroy();
done(); done();
}).catch(function (err) { }).catch(function (err) {
console.log(CaseName + " : error = " + JSON.stringify(err)); console.log(CaseName + " : error = " + JSON.stringify(err));
...@@ -394,7 +406,6 @@ export default function HttpRequest2JsunitTest() { ...@@ -394,7 +406,6 @@ export default function HttpRequest2JsunitTest() {
httpRequest.off("dataEnd"); httpRequest.off("dataEnd");
}, delayTime); }, delayTime);
console.log(CaseName + " off dataEnd Finish "); console.log(CaseName + " off dataEnd Finish ");
httpRequest.destroy();
done(); done();
}).catch(function (err) { }).catch(function (err) {
console.log(CaseName + " : error = " + JSON.stringify(err)); console.log(CaseName + " : error = " + JSON.stringify(err));
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或