Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
大约 1 年 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts

体验新版 GitCode，发现更多精彩内容 >>

提交 8842f4e9 编写于 作者: Z zhangfuzhi
浏览文件
操作

增加用例兼容性 

Signed-off-by: Nzhangfuzhi <zhangfuzhi1@huawei.com>
上级 5dbe22af
隐藏空白更改
内联 并排
Showing with 21 addition and 21 deletion
telephony/telephonyjstest/netmanager_base/jshttp/src/main/js/test/HttpCacheTest.test.js
浏览文件 @ 8842f4e9
...@@ -36,7 +36,7 @@ export default function HttpCacheTest() { ...@@ -36,7 +36,7 @@ export default function HttpCacheTest() {
usingCache: true usingCache: true
}).then(function (data) { }).then(function (data) {
http.destroy(); http.destroy();
expect(data.responseCode === net_http.ResponseCode.OK || data.responseCode === 504).assertTrue(); expect(data.responseCode === net_http.ResponseCode.OK || data.responseCode > 500).assertTrue();
done(); done();
return; return;
}); });
...@@ -62,7 +62,7 @@ export default function HttpCacheTest() { ...@@ -62,7 +62,7 @@ export default function HttpCacheTest() {
}).then(function (data) { }).then(function (data) {
http.destroy(); http.destroy();
console.info(CaseName + JSON.stringify(data)); console.info(CaseName + JSON.stringify(data));
expect(data.responseCode === net_http.ResponseCode.OK || data.responseCode === 504).assertTrue(); expect(data.responseCode === net_http.ResponseCode.OK || data.responseCode > 500).assertTrue();
done(); done();
return; return;
}); });
......
telephony/telephonyjstest/netmanager_base/jshttp/src/main/js/test/NetworkManagerHttp.test.js
浏览文件 @ 8842f4e9
...@@ -30,7 +30,7 @@ export default function Telephony_NETSTACK_HTTPTest() { ...@@ -30,7 +30,7 @@ export default function Telephony_NETSTACK_HTTPTest() {
let http = netHttp.createHttp(); let http = netHttp.createHttp();
http.request("https://httpbin.org/anything").then(function (data) { http.request("https://httpbin.org/anything").then(function (data) {
http.destroy(); http.destroy();
expect(data.responseCode === netHttp.ResponseCode.OK || data.responseCode === 504).assertTrue(); expect(data.responseCode === netHttp.ResponseCode.OK || data.responseCode > 500).assertTrue();
done(); done();
}); });
}); });
...@@ -45,7 +45,7 @@ export default function Telephony_NETSTACK_HTTPTest() { ...@@ -45,7 +45,7 @@ export default function Telephony_NETSTACK_HTTPTest() {
let http = netHttp.createHttp(); let http = netHttp.createHttp();
http.request("https://httpbin.org/user-agent").then(function (data) { http.request("https://httpbin.org/user-agent").then(function (data) {
http.destroy(); http.destroy();
expect(data.responseCode === netHttp.ResponseCode.OK || data.responseCode === 504).assertTrue(); expect(data.responseCode === netHttp.ResponseCode.OK || data.responseCode > 500).assertTrue();
if (data.responseCode === netHttp.ResponseCode.OK) { if (data.responseCode === netHttp.ResponseCode.OK) {
console.info(JSON.stringify(data)); console.info(JSON.stringify(data));
expect(data.result.toString().search("user-agent") != -1).assertTrue(); expect(data.result.toString().search("user-agent") != -1).assertTrue();
...@@ -65,7 +65,7 @@ export default function Telephony_NETSTACK_HTTPTest() { ...@@ -65,7 +65,7 @@ export default function Telephony_NETSTACK_HTTPTest() {
let http = netHttp.createHttp(); let http = netHttp.createHttp();
http.request("https://httpbin.org/headers").then(function (data) { http.request("https://httpbin.org/headers").then(function (data) {
http.destroy(); http.destroy();
expect(data.responseCode === netHttp.ResponseCode.OK || data.responseCode === 504).assertTrue(); expect(data.responseCode === netHttp.ResponseCode.OK || data.responseCode > 500).assertTrue();
console.info("NETSTACK ####" + JSON.stringify(data.result)); console.info("NETSTACK ####" + JSON.stringify(data.result));
if (data.responseCode === netHttp.ResponseCode.OK) { if (data.responseCode === netHttp.ResponseCode.OK) {
expect(data.result.toString().search("Content-Type") != -1).assertTrue(); expect(data.result.toString().search("Content-Type") != -1).assertTrue();
...@@ -88,7 +88,7 @@ export default function Telephony_NETSTACK_HTTPTest() { ...@@ -88,7 +88,7 @@ export default function Telephony_NETSTACK_HTTPTest() {
extraData: "MineMine" extraData: "MineMine"
}).then(function (data) { }).then(function (data) {
http.destroy(); http.destroy();
expect(data.responseCode === netHttp.ResponseCode.OK || data.responseCode === 504).assertTrue(); expect(data.responseCode === netHttp.ResponseCode.OK || data.responseCode > 500).assertTrue();
if (data.responseCode === netHttp.ResponseCode.OK) { if (data.responseCode === netHttp.ResponseCode.OK) {
expect(data.result.toString().search("MineMine") != -1).assertTrue() expect(data.result.toString().search("MineMine") != -1).assertTrue()
} }
...@@ -109,7 +109,7 @@ export default function Telephony_NETSTACK_HTTPTest() { ...@@ -109,7 +109,7 @@ export default function Telephony_NETSTACK_HTTPTest() {
extraData: "MineMine" extraData: "MineMine"
}).then(function (data) { }).then(function (data) {
http.destroy(); http.destroy();
expect(data.responseCode === netHttp.ResponseCode.OK || data.responseCode === 504).assertTrue(); expect(data.responseCode === netHttp.ResponseCode.OK || data.responseCode > 500).assertTrue();
if (data.responseCode === netHttp.ResponseCode.OK) { if (data.responseCode === netHttp.ResponseCode.OK) {
expect(data.result.toString().search("MineMine") != -1).assertTrue() expect(data.result.toString().search("MineMine") != -1).assertTrue()
} }
...@@ -127,7 +127,7 @@ export default function Telephony_NETSTACK_HTTPTest() { ...@@ -127,7 +127,7 @@ export default function Telephony_NETSTACK_HTTPTest() {
let http = netHttp.createHttp(); let http = netHttp.createHttp();
http.request("https://httpbin.org/cookies/set/name/value").then(function (data) { http.request("https://httpbin.org/cookies/set/name/value").then(function (data) {
http.destroy(); http.destroy();
expect(data.responseCode === netHttp.ResponseCode.OK || data.responseCode === 504).assertTrue(); expect(data.responseCode === netHttp.ResponseCode.OK || data.responseCode > 500).assertTrue();
if (data.responseCode === netHttp.ResponseCode.OK) { if (data.responseCode === netHttp.ResponseCode.OK) {
expect(data.cookies !== "").assertTrue(); expect(data.cookies !== "").assertTrue();
} }
...@@ -150,7 +150,7 @@ export default function Telephony_NETSTACK_HTTPTest() { ...@@ -150,7 +150,7 @@ export default function Telephony_NETSTACK_HTTPTest() {
} }
}).then(function (data) { }).then(function (data) {
http.destroy(); http.destroy();
expect(data.responseCode === netHttp.ResponseCode.OK || data.responseCode === 504).assertTrue(); expect(data.responseCode === netHttp.ResponseCode.OK || data.responseCode > 500).assertTrue();
if (data.responseCode === netHttp.ResponseCode.OK) { if (data.responseCode === netHttp.ResponseCode.OK) {
expect(data.result.toString().search("key1") != -1).assertTrue() expect(data.result.toString().search("key1") != -1).assertTrue()
expect(data.result.toString().search("val1") != -1).assertTrue() expect(data.result.toString().search("val1") != -1).assertTrue()
......
telephony/telephonyjstest/netmanager_base/system_fetch/src/main/js/test/Http.fetch.test.js
浏览文件 @ 8842f4e9
...@@ -30,7 +30,7 @@ export default function Telephony_NetStack_HttpFetchTest() { ...@@ -30,7 +30,7 @@ export default function Telephony_NetStack_HttpFetchTest() {
url : "https://httpbin.org/anything", url : "https://httpbin.org/anything",
success : function(data){ success : function(data){
console.info("NetStack fetch success "+JSON.stringify(data)); console.info("NetStack fetch success "+JSON.stringify(data));
expect(data.code === 200 || data.code === 504).assertTrue(); expect(data.code === 200 || data.code > 500).assertTrue();
done(); done();
}, },
fail : function(){ fail : function(){
...@@ -54,7 +54,7 @@ export default function Telephony_NetStack_HttpFetchTest() { ...@@ -54,7 +54,7 @@ export default function Telephony_NetStack_HttpFetchTest() {
url : "https://httpbin.org/user-agent", url : "https://httpbin.org/user-agent",
success : function(data){ success : function(data){
console.info("NetStack fetch success "+ JSON.stringify(data)); console.info("NetStack fetch success "+ JSON.stringify(data));
expect(data.code === 200 || data.code === 504).assertTrue(); expect(data.code === 200 || data.code > 500).assertTrue();
if (data.code === 200) { if (data.code === 200) {
expect(JSON.parse(data.data.toString())["user-agent"] == "libcurl-agent/1.0").assertTrue(); expect(JSON.parse(data.data.toString())["user-agent"] == "libcurl-agent/1.0").assertTrue();
} }
...@@ -82,7 +82,7 @@ export default function Telephony_NetStack_HttpFetchTest() { ...@@ -82,7 +82,7 @@ export default function Telephony_NetStack_HttpFetchTest() {
responseType : "json", responseType : "json",
success : function(data){ success : function(data){
console.info("NetStack fetch success "+ JSON.stringify(data)); console.info("NetStack fetch success "+ JSON.stringify(data));
expect(data.code === 200 || data.code === 504).assertTrue(); expect(data.code === 200 || data.code > 500).assertTrue();
if (data.code === 200) { if (data.code === 200) {
expect(data.data["user-agent"] == "libcurl-agent/1.0").assertTrue(); expect(data.data["user-agent"] == "libcurl-agent/1.0").assertTrue();
} }
...@@ -109,7 +109,7 @@ export default function Telephony_NetStack_HttpFetchTest() { ...@@ -109,7 +109,7 @@ export default function Telephony_NetStack_HttpFetchTest() {
url : "https://httpbin.org/headers", url : "https://httpbin.org/headers",
success : function(data){ success : function(data){
console.info("NetStack Fetch Success "+ JSON.stringify(data)); console.info("NetStack Fetch Success "+ JSON.stringify(data));
expect(data.code === 200 || data.code === 504).assertTrue(); expect(data.code === 200 || data.code > 500).assertTrue();
if (data.code === 200) { if (data.code === 200) {
expect(JSON.parse(data.data.toString())["headers"]["Content-Type"] === "application/json").assertTrue(); expect(JSON.parse(data.data.toString())["headers"]["Content-Type"] === "application/json").assertTrue();
} }
...@@ -137,7 +137,7 @@ export default function Telephony_NetStack_HttpFetchTest() { ...@@ -137,7 +137,7 @@ export default function Telephony_NetStack_HttpFetchTest() {
responseType : "json", responseType : "json",
success : function(data){ success : function(data){
console.info("NetStack Fetch Success "+ JSON.stringify(data)); console.info("NetStack Fetch Success "+ JSON.stringify(data));
expect(data.code === 200 || data.code === 504).assertTrue(); expect(data.code === 200 || data.code > 500).assertTrue();
if (data.code === 200) { if (data.code === 200) {
expect(data.data["headers"]["Content-Type"] === "application/json").assertTrue(); expect(data.data["headers"]["Content-Type"] === "application/json").assertTrue();
} }
...@@ -166,7 +166,7 @@ export default function Telephony_NetStack_HttpFetchTest() { ...@@ -166,7 +166,7 @@ export default function Telephony_NetStack_HttpFetchTest() {
data : "MineMine", data : "MineMine",
success : function(data){ success : function(data){
console.info("NetStack "+ JSON.stringify(data)); console.info("NetStack "+ JSON.stringify(data));
expect(data.code === 200 || data.code === 504).assertTrue(); expect(data.code === 200 || data.code > 500).assertTrue();
if (data.code === 200) { if (data.code === 200) {
expect(JSON.parse(data.data.toString())["data"] === "MineMine").assertTrue(); expect(JSON.parse(data.data.toString())["data"] === "MineMine").assertTrue();
} }
...@@ -196,7 +196,7 @@ export default function Telephony_NetStack_HttpFetchTest() { ...@@ -196,7 +196,7 @@ export default function Telephony_NetStack_HttpFetchTest() {
responseType : "json", responseType : "json",
success : function(data){ success : function(data){
console.info("NetStack "+ JSON.stringify(data)); console.info("NetStack "+ JSON.stringify(data));
expect(data.code === 200 || data.code === 504).assertTrue(); expect(data.code === 200 || data.code > 500).assertTrue();
if (data.code === 200) { if (data.code === 200) {
expect(data.data["data"] === "MineMine").assertTrue(); expect(data.data["data"] === "MineMine").assertTrue();
} }
...@@ -225,7 +225,7 @@ export default function Telephony_NetStack_HttpFetchTest() { ...@@ -225,7 +225,7 @@ export default function Telephony_NetStack_HttpFetchTest() {
data : "MineMine", data : "MineMine",
success : function(data){ success : function(data){
console.info("NetStack "+ JSON.stringify(data)); console.info("NetStack "+ JSON.stringify(data));
expect(data.code === 200 || data.code === 504).assertTrue(); expect(data.code === 200 || data.code > 500).assertTrue();
if (data.code === 200) { if (data.code === 200) {
expect(JSON.parse(data.data.toString())["data"] === "MineMine").assertTrue(); expect(JSON.parse(data.data.toString())["data"] === "MineMine").assertTrue();
} }
...@@ -256,7 +256,7 @@ export default function Telephony_NetStack_HttpFetchTest() { ...@@ -256,7 +256,7 @@ export default function Telephony_NetStack_HttpFetchTest() {
success : function(data){ success : function(data){
console.info("NetStack "+ JSON.stringify(data)); console.info("NetStack "+ JSON.stringify(data));
if (data.code === 200) { if (data.code === 200) {
expect(data.code === 200 || data.code === 504).assertTrue(); expect(data.code === 200 || data.code > 500).assertTrue();
expect(data.data["data"] === "MineMine").assertTrue(); expect(data.data["data"] === "MineMine").assertTrue();
} }
done(); done();
...@@ -286,7 +286,7 @@ export default function Telephony_NetStack_HttpFetchTest() { ...@@ -286,7 +286,7 @@ export default function Telephony_NetStack_HttpFetchTest() {
}, },
success : function(data){ success : function(data){
console.info("NetStack "+JSON.stringify(data)); console.info("NetStack "+JSON.stringify(data));
expect(data.code === 200 || data.code === 504).assertTrue(); expect(data.code === 200 || data.code > 500).assertTrue();
if (data.code === 200) { if (data.code === 200) {
expect(JSON.parse(data.data.toString())["key1"] === "val1").assertTrue(); expect(JSON.parse(data.data.toString())["key1"] === "val1").assertTrue();
expect(JSON.parse(data.data.toString())["key2"] === "val2").assertTrue(); expect(JSON.parse(data.data.toString())["key2"] === "val2").assertTrue();
...@@ -321,7 +321,7 @@ export default function Telephony_NetStack_HttpFetchTest() { ...@@ -321,7 +321,7 @@ export default function Telephony_NetStack_HttpFetchTest() {
responseType : "json", responseType : "json",
success : function(data){ success : function(data){
console.info("NetStack "+JSON.stringify(data)); console.info("NetStack "+JSON.stringify(data));
expect(data.code === 200 || data.code === 504).assertTrue(); expect(data.code === 200 || data.code > 500).assertTrue();
if (data.code === 200) { if (data.code === 200) {
expect(data.data["key1"] === "val1").assertTrue(); expect(data.data["key1"] === "val1").assertTrue();
expect(data.data["key2"] === "val2").assertTrue(); expect(data.data["key2"] === "val2").assertTrue();
......
telephony/telephonyjstest/netmanager_socket/entry/src/main/ets/test/NetworkManagerSocket.test.ets
浏览文件 @ 8842f4e9
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
import { describe, it, expect, beforeAll, afterAll } from '@ohos/hypium'; import { describe, it, expect, beforeAll, afterAll } from '@ohos/hypium';
import socket from "@ohos.net.socket"; import socket from '@ohos.net.socket';
let sendData = "hello!"; let sendData = "hello!";
let instance = undefined; let instance = undefined;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或