!6773 电话用例整改

Merge pull request !6773 from zhangfuzhi/master

telephony/telephonyjstest/netmanager_base/jshttp/Test.json

@@ -5,7 +5,8 @@
         "test-timeout": "900000",
         "bundle-name": "com.ohos.jshttp",
         "package-name": "com.ohos.jshttp",
-        "shell-timeout": "900000"
+        "shell-timeout": "900000",
+        "testcase-timeout":"100000"
     },
     "kits": [
         {

telephony/telephonyjstest/netmanager_base/jshttp/src/main/js/test/Http2Test.js

@@ -29,10 +29,9 @@ export default function Http2Test() {
             http.request("https://www.zhihu.com", {
                 usingProtocol: net_Http.HttpProtocol.HTTP1_1
             }).then(function (data) {
-                console.info("Telephony_NETSTACK_Http2TestBasicGet_0100" + JSON.stringify(data));
                 expect(data.responseCode === net_Http.ResponseCode.OK).assertTrue();
                 done();
-            })
+            });
         });
 
         /**
@@ -48,7 +47,7 @@ export default function Http2Test() {
                 console.info("Telephony_NETSTACK_Http2TestBasicGet_0200" + JSON.stringify(data));
                 expect(data.responseCode === net_Http.ResponseCode.OK).assertTrue();
                 done();
-            })
+            });
         });
 
         /**
@@ -62,7 +61,7 @@ export default function Http2Test() {
                 console.info("Telephony_NETSTACK_Http2TestBasicGet_0300" + JSON.stringify(data));
                 expect(data.responseCode === net_Http.ResponseCode.OK).assertTrue();
                 done();
-            })
+            });
         });
 
         /**
@@ -112,6 +111,6 @@ export default function Http2Test() {
                 done();
                 return;
             }
-        })
+        });
     });
 }
\ No newline at end of file

telephony/telephonyjstest/netmanager_base/jshttp/src/main/js/test/HttpCacheTest.js

@@ -31,7 +31,6 @@ export default function HttpCacheTest() {
             http.request('https://httpbin.org/anything', {
                 usingCache : true
             }).then(function(data){
-                console.info(CaseName + JSON.stringify(data));
                 expect(data.responseCode === net_http.ResponseCode.OK).assertTrue();
                 done();
                 return;
@@ -75,7 +74,7 @@ export default function HttpCacheTest() {
                     expect(data === undefined).assertTrue();
                     done();
                     return;
-                })
+                });
             });
         });
 
@@ -97,7 +96,7 @@ export default function HttpCacheTest() {
                     expect(data === undefined).assertTrue();
                     done();
                     return;
-                })
+                });
             });
         });
 
@@ -119,7 +118,7 @@ export default function HttpCacheTest() {
                     expect(data === undefined).assertTrue();
                     done();
                     return;
-                })
+                });
             });
         });
 
@@ -141,7 +140,7 @@ export default function HttpCacheTest() {
                     expect(data === undefined).assertTrue();
                     done();
                     return;
-                })
+                });
             });
         });
     });

telephony/telephonyjstest/netmanager_base/jshttp/src/main/js/test/NetworkManagerHttp.test.js

@@ -30,7 +30,7 @@ describe('Telephony_NETSTACK_HTTPTest',function(){
         http.request("https://httpbin.org/anything").then(function(data){
             expect(data.responseCode === netHttp.ResponseCode.OK).assertTrue();
             done();
-        })
+        });
     });
 
     /**
@@ -46,7 +46,7 @@ describe('Telephony_NETSTACK_HTTPTest',function(){
             console.info(JSON.stringify(data));
             expect(JSON.parse(data.result)["user-agent"] === "libcurl-agent/1.0").assertTrue();
             done();
-        })
+        });
     });
 
     /**
@@ -62,7 +62,7 @@ describe('Telephony_NETSTACK_HTTPTest',function(){
             console.info("NETSTACK ####" + JSON.stringify(JSON.parse(data.result)))
             expect(JSON.parse(data.result)["headers"]["Content-Type"] === "application/json").assertTrue()
             done()
-        })
+        });
     });
 
     /**
@@ -80,7 +80,7 @@ describe('Telephony_NETSTACK_HTTPTest',function(){
             expect(data.responseCode === netHttp.ResponseCode.OK).assertTrue()
             expect(JSON.parse(data.result)["data"] === "MineMine").assertTrue()
             done();
-        })
+        });
     });
 
     /**
@@ -98,7 +98,7 @@ describe('Telephony_NETSTACK_HTTPTest',function(){
             expect(data.responseCode === netHttp.ResponseCode.OK).assertTrue()
             expect(JSON.parse(data.result)["data"] === "MineMine").assertTrue()
             done();
-        })
+        });
     });
 
     /**
@@ -113,7 +113,7 @@ describe('Telephony_NETSTACK_HTTPTest',function(){
             expect(data.responseCode === netHttp.ResponseCode.OK).assertTrue()
             expect(data.cookies !== "").assertTrue()
             done();
-        })
+        });
     });
 
     /**
@@ -136,7 +136,7 @@ describe('Telephony_NETSTACK_HTTPTest',function(){
             expect(JSON.parse(data.result)["name1"] === "mine1").assertTrue()
             expect(JSON.parse(data.result)["name2"] === "mine2").assertTrue()
             done();
-        })
+        });
     });
 });
 }

telephony/telephonyjstest/netmanager_base/system_fetch/Test.json

@@ -6,7 +6,7 @@
         "bundle-name": "com.ohos.system_fetch",
         "package-name": "com.ohos.system_fetch",
         "shell-timeout": "900000",
-        "testcase-timeout": "40000"
+        "testcase-timeout": "60000"
     },
     "kits": [
         {