!812 telephony用例更新

Merge pull request !812 from yexiangbin/master

telephony/BUILD.gn

@@ -13,9 +13,5 @@
 
 group("telephony") {
   testonly = true
-  deps = [
-    #"telephonycpptest:telephonycpptest",
-    #"telephonyothertest:telephonyothertest",
-    "telephonyjstest:telephonyjstest",
-  ]
+  deps = [ "telephonyjstest:telephonyjstest" ]
 }

telephony/telephonyjstest/BUILD.gn

@@ -16,9 +16,9 @@ import("//build/ohos_var.gni")
 group("telephonyjstest") {
   testonly = true
   deps = [
-    #"network_search:network_search",
-    #"sms_mms:sms_mms",
-    #"call_manager:call_manager",
+    "call_manager:call_manager",
+    "network_search:network_search",
     "sim:sim",
+    "sms_mms:sms_mms",
   ]
 }

telephony/telephonyjstest/call_manager/call_manager_mmi/Test.json

@@ -2,10 +2,10 @@
     "description": "Configuration for callmanager Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "120000",
+        "test-timeout": "1200000",
         "package": "com.ohos.callmanager",
-        "shell-timeout": "21600000",
-        "native-test-timeout":"21600000"
+        "shell-timeout": "1200000",
+        "native-test-timeout":"1200000"
     },
     "kits": [
         {

telephony/telephonyjstest/call_manager/call_manager_mmi/entry/src/main/js/default/pages/index/index.js

@@ -30,17 +30,16 @@ export default {
         this.title = this.$t('strings.world');
     },
     onShow() {
-        console.info('onShow finish!')
+        console.info('onShow finish')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({
             'id': 'extend'
         })
         core.addService('expect', expectExtend)
         core.init()
-
         const configService = core.getDefaultService('config')
+        configService.timeout = 8000;
         configService.setConfig(this)
-
         require('../../../test/List.test')
         core.execute()
     },

telephony/telephonyjstest/call_manager/call_manager_mmi/entry/src/main/js/test/CallManagerMMI.test.js

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import call from '@ohos.telephony_call';
+import call from '@ohos.telephony.call';
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index';
 
 describe('CallManagerMMI', function () {

telephony/telephonyjstest/call_manager/call_manager_on_dail/Test.json

@@ -2,10 +2,10 @@
     "description": "Configuration for callmanager Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "360000",
+        "test-timeout": "3000000",
         "package": "com.ohos.callmanager",
-        "shell-timeout": "21600000",
-        "native-test-timeout":"21600000"
+        "shell-timeout": "3000000",
+        "native-test-timeout":"3000000"
     },
     "kits": [
         {

telephony/telephonyjstest/call_manager/call_manager_on_dail/entry/src/main/js/default/pages/index/index.js

@@ -30,17 +30,16 @@ export default {
         this.title = this.$t('strings.world');
     },
     onShow() {
-        console.info('onShow finish!')
+        console.info('onShow finish')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({
             'id': 'extend'
         })
         core.addService('expect', expectExtend)
         core.init()
-
         const configService = core.getDefaultService('config')
+        configService.timeout = 30000;
         configService.setConfig(this)
-
         require('../../../test/List.test')
         core.execute()
     },

telephony/telephonyjstest/call_manager/call_manager_test/Test.json

@@ -2,10 +2,10 @@
     "description": "Configuration for callmanager Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "240000",
+        "test-timeout": "4800000",
         "package": "com.ohos.callmanager",
-        "shell-timeout": "21600000",
-        "native-test-timeout":"21600000"
+        "shell-timeout": "4800000",
+        "native-test-timeout":"4800000"
     },
     "kits": [
         {

telephony/telephonyjstest/call_manager/call_manager_test/entry/src/main/js/default/pages/index/index.js

@@ -30,17 +30,16 @@ export default {
         this.title = this.$t('strings.world');
     },
     onShow() {
-        console.info('onShow finish!')
+        console.info('onShow finish')
         const core = Core.getInstance()
         const expectExtend = new ExpectExtend({
             'id': 'extend'
         })
         core.addService('expect', expectExtend)
         core.init()
-
         const configService = core.getDefaultService('config')
+        configService.timeout = 15000;
         configService.setConfig(this)
-
         require('../../../test/List.test')
         core.execute()
     },

telephony/telephonyjstest/sms_mms/sms_mms_performance/BUILD.gn → telephony/telephonyjstest/config.sh

+#!/bin/bash
+
 # Copyright (C) 2021 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,21 +13,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("SmsMmsPerformance") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "SmsMmsPerformance"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/js/default"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/js/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}
+# 配置发送短信的电话号码
+config_const_var[0]="const SMS_SEND_DST_NUMBER = '138xxxxxxxx';"
+
+
+for((i = 0; i < ${#config_const_var}; i++))
+do
+    if [ "${config_const_var[i]}" == "" ]; then
+        continue
+    fi
+    grep_result=``
+    key=`echo ${config_const_var[i]}| awk -F= '{print $1}'`
+    for line in `grep -nr "${key}"| sed 's/ //g'|grep -v "config.sh"`
+    do
+        
+        file=`echo ${line}|awk -F: '{print $1}'`
+        line_no=`echo ${line}|awk -F: '{print $2}'`
+        echo $file $line_no
+        echo old:`grep "${key}" $file`
+        if [ "$1" != "-i" ]; then
+            echo preview:`sed $1 "s/${key}.*/${config_const_var[i]}/g" $file | grep "${key}"`
+        else
+            sed $1 "s/${key}.*/${config_const_var[i]}/g" $file | grep "${key}"
+            echo new:`sed "s/${key}.*/${config_const_var[i]}/g" $file | grep "${key}"`
+        fi
+    done
+done

telephony/telephonyjstest/network_search/network_search_information/entry/src/main/js/default/pages/index/index.js

@@ -37,8 +37,8 @@ export default {
         core.init()
 
         const configService = core.getDefaultService('config')
+        configService.timeout = 8000
         configService.setConfig(this)
-
         require('../../../test/List.test')
         core.execute()
     },

telephony/telephonyjstest/network_search/network_search_information/entry/src/main/js/test/NetworkSearchInformation.test.js

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import radio from '@ohos.telephony_radio';
+import radio from '@ohos.telephony.radio';
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index';
 
 describe('NetworkSearchTest', function () {
@@ -65,9 +65,6 @@ describe('NetworkSearchTest', function () {
     const ISO_COUNTRY_CODE = 'cn';
     const PLMN_SIZE = 5;
 
-    afterAll(async function () {
-        console.log('Telephony_NetworkSearch_InformationTest End!!!');
-    });
 
     /**
      * @tc.number  Telephony_NetworkSearch_getNetworkState_Async_0100
@@ -100,7 +97,7 @@ describe('NetworkSearchTest', function () {
                 data.plmnNumeric != null
             ).assertTrue();
             expect(data.plmnNumeric.length == 5 && data.plmnNumeric.substr(0, 3) === '460').assertTrue();
-            expect(data.regStatus === 1).assertTrue();
+            expect(garrRegState).assertContain(data.regStatus);
             expect(data.nsaState === 1).assertTrue();
             expect(data.isRoaming === false).assertTrue();
             expect(data.isCaActive === false).assertTrue();
@@ -132,7 +129,7 @@ describe('NetworkSearchTest', function () {
                 data.shortOperatorName != undefined && data.shortOperatorName != '' && data.shortOperatorName != null
             ).assertTrue();
             expect(data.plmnNumeric.length === PLMN_SIZE && data.plmnNumeric.substr(0, 3) === '460').assertTrue();
-            expect(data.regStatus === 1).assertTrue();
+            expect(garrRegState).assertContain(data.regStatus);
             expect(data.nsaState === 1).assertTrue();
             expect(data.isRoaming === false).assertTrue();
             expect(data.isCaActive === false).assertTrue();
@@ -274,7 +271,7 @@ describe('NetworkSearchTest', function () {
                 data.shortOperatorName != undefined && data.shortOperatorName != '' && data.shortOperatorName != null
             ).assertTrue();
             expect(data.plmnNumeric.length === PLMN_SIZE && data.plmnNumeric.substr(0, 3) === '460').assertTrue();
-            expect(data.regStatus === 1).assertTrue();
+            expect(garrRegState).assertContain(data.regStatus);
             expect(data.nsaState === 1).assertTrue();
             expect(data.isRoaming === false).assertTrue();
             expect(data.isCaActive === false).assertTrue();
@@ -307,7 +304,7 @@ describe('NetworkSearchTest', function () {
                 data.shortOperatorName != undefined && data.shortOperatorName != '' && data.shortOperatorName != null
             ).assertTrue();
             expect(data.plmnNumeric.length === PLMN_SIZE && data.plmnNumeric.substr(0, 3) === '460').assertTrue();
-            expect(data.regStatus === 1).assertTrue();
+            expect(garrRegState).assertContain(data.regStatus);
             expect(data.nsaState === 1).assertTrue();
             expect(data.isRoaming === false).assertTrue();
             expect(data.isCaActive === false).assertTrue();
@@ -445,9 +442,9 @@ describe('NetworkSearchTest', function () {
                 done();
                 return;
             }
-            expect(data === ISO_COUNTRY_CODE).assertTrue();
             console.log(
-                `Telephony_NetworkSearch_getISOCountryCodeForNetwork_Async_0100 finish data: ${JSON.stringify(data)}`);
+            `Telephony_NetworkSearch_getISOCountryCodeForNetwork_Async_0100 finish data: ${JSON.stringify(data)}`);
+            expect(data === ISO_COUNTRY_CODE).assertTrue();
             done();
         });
     });

telephony/telephonyjstest/network_search/network_search_performance/BUILD.gn

-# Copyright (C) 2021 Huawei Device Co., Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# 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.
-import("//test/xts/tools/build/suite.gni")
-
-ohos_js_hap_suite("NetworkSearchPerformance") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "NetworkSearchPerformance"
-}
-ohos_js_assets("hjs_demo_js_assets") {
-  source_dir = "./entry/src/main/js/default"
-}
-ohos_resources("hjs_demo_resources") {
-  sources = [ "./entry/src/main/js/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}

telephony/telephonyjstest/network_search/network_search_performance/Test.json

-{
-    "description": "Configuration for NetworkSearch Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "1800",
-        "package": "com.ohos.networksearch",
-        "shell-timeout": "1800",
-        "native-test-timeout":"1800"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "$module.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
-}

telephony/telephonyjstest/network_search/network_search_performance/entry/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.ohos.networksearch",
-    "vendor": "ohos",
-    "version": {
-      "code": 1000000,
-      "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 4,
-      "target": 5,
-      "releaseType": "Release"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.ohos.networksearch",
-    "name": ".MyApplication",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry"
-    },
-    "abilities": [
-      {
-        "visible": true,
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "com.ohos.networksearch.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:app_name",
-        "type": "page",
-        "launchType": "standard"
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": false
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file

telephony/telephonyjstest/network_search/network_search_performance/entry/src/main/js/default/app.js

-/*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * 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.
- */
-
-export default {
-    onCreate() {
-        console.info('AceApplication onCreate');
-    },
-    onDestroy() {
-        console.info('AceApplication onDestroy');
-    }
-};

telephony/telephonyjstest/network_search/network_search_performance/entry/src/main/js/default/i18n/en-US.json

-{
-  "strings": {
-    "hello": "Hello",
-    "world": "World"
-  }
-}
\ No newline at end of file

telephony/telephonyjstest/network_search/network_search_performance/entry/src/main/js/default/i18n/zh-CN.json

-{
-  "strings": {
-    "hello": "您好",
-    "world": "世界"
-  }
-}
\ No newline at end of file

telephony/telephonyjstest/network_search/network_search_performance/entry/src/main/js/default/pages/index/index.css

-.container {
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-}
-
-.title {
-    font-size: 100px;
-}

telephony/telephonyjstest/network_search/network_search_performance/entry/src/main/js/default/pages/index/index.hml

-<div class="container">
-    <text class="title">
-        {{ $t('strings.hello') }} {{ title }}
-    </text>
-</div>

telephony/telephonyjstest/network_search/network_search_performance/entry/src/main/js/default/pages/index/index.js

-/*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * 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.
- */
-
-import file from '@system.file'
-import app from '@system.app'
-import device from '@system.device'
-import router from '@system.router'
-import {Core, ExpectExtend} from 'deccjsunit/index'
-const injectRef = Object.getPrototypeOf(global) || global
-injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
-export default {
-    data: {
-        title: ""
-    },
-    onInit() {
-        this.title = this.$t('strings.world');
-    },
-    onShow() {
-        console.info('onShow finish!')
-        const core = Core.getInstance()
-        const expectExtend = new ExpectExtend({
-            'id': 'extend'
-        })
-        core.addService('expect', expectExtend)
-        core.init()
-
-        const configService = core.getDefaultService('config')
-        configService.setConfig(this)
-
-        require('../../../test/List.test')
-        core.execute()
-    },
-    onReady() {
-    },
-}
\ No newline at end of file

telephony/telephonyjstest/network_search/network_search_performance/entry/src/main/js/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "MyApplication"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Phone_Empty Feature Ability"
-    }
-  ]
-}
\ No newline at end of file

telephony/telephonyjstest/network_search/network_search_performance/entry/src/main/js/test/List.test.js

-/*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * 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.
- */
-
-require('./NetworkSearchPerformance.test.js');

telephony/telephonyjstest/network_search/network_search_performance/entry/src/main/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "NetworkSearchTest"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Phone_Empty Feature Ability"
-    }
-  ]
-}
\ No newline at end of file

telephony/telephonyjstest/network_search/network_search_radio/entry/src/main/js/default/pages/index/index.js

@@ -37,6 +37,7 @@ export default {
         core.init()
 
         const configService = core.getDefaultService('config')
+        configService.timeout = 8000
         configService.setConfig(this)
 
         require('../../../test/List.test')

telephony/telephonyjstest/network_search/network_search_reliability/entry/src/main/js/default/pages/index/index.hml

-<div class="container">
-    <text class="title">
-        {{ $t('strings.hello') }} {{ title }}
-    </text>
-</div>