!4779 电话服务用例修改增加权限

Merge pull request !4779 from 高曦/master

telephony/telephonyjstest/call_manager/call_manager_ims2_call/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsCallManagerIms2CallTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsCallManagerIms2CallTest"
+  part_name = "call_manager"
+  subsystem_name = "telephony"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

telephony/telephonyjstest/cellular_data/cellular_data_abnormal/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsCellularDataAbnormalTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsCellularDataAbnormalTest"
+  part_name = "cellular_data"
+  subsystem_name = "telephony"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

telephony/telephonyjstest/netmanager_base/dns/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsDNSTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsDNSTest"
+  part_name = "netmanager_ext"
+  subsystem_name = "communication"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

telephony/telephonyjstest/netmanager_base/jshttp/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsJSHTTPTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsJSHTTPTest"
+  part_name = "netstack"
+  subsystem_name = "communication"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

telephony/telephonyjstest/netmanager_base/network_nopermission/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsNetworkNopermissionTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsNetworkNopermissionTest"
+  part_name = "netstack"
+  subsystem_name = "communication"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

telephony/telephonyjstest/netmanager_base/network_nowifi/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsNetworkNowifiTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsNetworkNowifiTest"
+  part_name = "netstack"
+  subsystem_name = "communication"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

telephony/telephonyjstest/netmanager_base/network_wifi/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsNetworkWifiTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsNetworkWifiTest"
+  part_name = "netstack"
+  subsystem_name = "communication"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

telephony/telephonyjstest/netmanager_base/register/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsRegisterTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsRegisterTest"
+  part_name = "netmanager_ext"
+  subsystem_name = "communication"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

telephony/telephonyjstest/netmanager_base/register/src/main/js/test/NetworkManagerRegister.test.js

@@ -2204,7 +2204,7 @@
                  done();
              } else {
                  console.info(`${caseName} netCapabilitiesChange handle ` + value.netHandle.netId);
-                 expect(value.netHandle.netId > ETH_100 ).assertTrue();
+                 expect(value.netHandle.netId >= ETH_100 ).assertTrue();
              }
          });
          netConn.on('netConnectionPropertiesChange', (value) => {

telephony/telephonyjstest/netmanager_base/socket/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsSocketTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsSocketTest"
+  part_name = "netstack"
+  subsystem_name = "communication"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

telephony/telephonyjstest/netmanager_base/system_fetch/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsSystemFetchTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsSystemFetchTest"
+  part_name = "netstack"
+  subsystem_name = "communication"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

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": "30000"
+        "testcase-timeout": "40000"
     },
     "kits": [
         {

telephony/telephonyjstest/netmanager_base/system_fetch/src/main/config.json

@@ -65,6 +65,12 @@
       "deliveryWithInstall": true,
       "moduleName": "entry"
     },
+    "reqPermissions": [
+      {
+        "name":"ohos.permission.INTERNET",
+        "reason":"need use ohos.permission.INTERNET"
+      }
+    ],
     "package": "com.ohos.system_fetch",
     "js": [
       {

telephony/telephonyjstest/netmanager_base/system_fetch/src/main/js/test/Http.fetch.test.js

@@ -45,7 +45,7 @@ describe("Telephony_NetStack_HttpFetchTest", function () {
         http.request("https://httpbin.org/user-agent").then(function(data){
             console.info("NetStack "+ JSON.stringify(data));
             expect(data.responseCode === NetHttp.ResponseCode.OK).assertTrue()
-            expect(JSON.parse(data.result)["user-agent"] === "libcurl-agent/1.0").assertTrue();
+            expect(JSON.parse(data.result)["user-agent"] != undefined).assertTrue();
             done();
         })
     });
@@ -175,7 +175,7 @@ describe("Telephony_NetStack_HttpFetchTest", function () {
             success : function(data){
                 console.info("NetStack fetch success "+ JSON.stringify(data))
                 expect(data.code === 200).assertTrue()
-                expect(JSON.parse(data.result)["user-agent"] === "libcurl-agent/1.0").assertTrue();
+                expect(JSON.parse(data.data)["user-agent"] != undefined).assertTrue();
                 done();
             },
             fail : function(){
@@ -201,7 +201,7 @@ describe("Telephony_NetStack_HttpFetchTest", function () {
             success : function(data){
                 console.info("NetStack fetch success "+ JSON.stringify(data))
                 expect(data.code === 200).assertTrue()
-                expect(JSON.parse(data.result)["user-agent"] === "libcurl-agent/1.0").assertTrue();
+                expect(data.data["user-agent"] != undefined).assertTrue();
                 done();
             },
             fail : function(){

telephony/telephonyjstest/netmanager_http/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsNetManagerHttpEtsTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsNetManagerHttpEtsTest"
+  part_name = "netstack"
+  subsystem_name = "communication"
 }
 ohos_js_assets("ace_demo_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

telephony/telephonyjstest/netmanager_socket/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsNetManagerSocketEtsTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsNetManagerSocketEtsTest"
+  part_name = "netstack"
+  subsystem_name = "communication"
 }
 ohos_js_assets("ace_demo_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

telephony/telephonyjstest/network_search/network_search_errors/BUILD.gn

@@ -20,6 +20,8 @@ ohos_js_hap_suite("ActsNetworkSearchTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsNetworkSearchTest"
+  part_name = "state_registry"
+  subsystem_name = "telephony"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

telephony/telephonyjstest/observer/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsObserverEtsTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsObserverEtsTest"
+  part_name = "netstack"
+  subsystem_name = "communication"
 }
 ohos_js_assets("ace_demo_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

telephony/telephonyjstest/radiostatistic/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsRadiostatisticEtsTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsRadiostatisticEtsTest"
+  part_name = "ril_adapter"
+  subsystem_name = "telephony"
 }
 ohos_js_assets("ace_demo_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

telephony/telephonyjstest/sim/sim_manager_function_test/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActsSimManagerFunctionTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsSimManagerFunctionTest"
+  part_name = "core_service"
+  subsystem_name = "telephony"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true

telephony/telephonyjstest/sms_mms/sms_mms_error/BUILD.gn

@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
@@ -21,6 +21,8 @@ ohos_js_hap_suite("ActSmsMmsErrorTest") {
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActSmsMmsErrorTest"
+  part_name = "sms_mms"
+  subsystem_name = "telephony"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   js2abc = true