diff --git a/telephony/telephonyjstest/call_manager/call_manager_ims2_call/src/main/js/test/CallManageAll.test.js b/telephony/telephonyjstest/call_manager/call_manager_ims2_call/src/main/js/test/CallManageAll.test.js index ddb7b821cf8c3a31d81d634701090a02bc62f2c1..0c21bf65524eeae4ce3ecdd50b860d42077a85b6 100644 --- a/telephony/telephonyjstest/call_manager/call_manager_ims2_call/src/main/js/test/CallManageAll.test.js +++ b/telephony/telephonyjstest/call_manager/call_manager_ims2_call/src/main/js/test/CallManageAll.test.js @@ -378,9 +378,8 @@ export default function CallManageImsCall() { it('Telephony_CallManager_Dial_Async_0100', 0, async function (done) { let CaseName = 'Telephony_CallManager_Dial_Async_0100'; try { - call.dial(CALL_NUMBER, (err, data) => { + call.dial("", (err, data) => { console.info(CaseName + " case success" + JSON.stringify(data)); - expect(data == true).assertTrue(); done(); return; }); @@ -400,11 +399,10 @@ export default function CallManageImsCall() { it('Telephony_CallManager_Dial_Async_0200', 0, async function (done) { let CaseName = 'Telephony_CallManager_Dial_Async_0200'; try { - call.dial(CALL_NUMBER, { + call.dial("", { extras: false }, (err, data) => { console.info(CaseName + " case success" + JSON.stringify(data)); - expect(data == true).assertTrue(); done(); return; }); diff --git a/telephony/telephonyjstest/call_manager/call_manager_ims2_call/src/main/js/test/ObjectInterface_test.js b/telephony/telephonyjstest/call_manager/call_manager_ims2_call/src/main/js/test/ObjectInterface_test.js index cad7578da36bcb1662b74ce64f10cbdc318306b6..5da336b9f4939725e4baada29ebda9e9d316d822 100644 --- a/telephony/telephonyjstest/call_manager/call_manager_ims2_call/src/main/js/test/ObjectInterface_test.js +++ b/telephony/telephonyjstest/call_manager/call_manager_ims2_call/src/main/js/test/ObjectInterface_test.js @@ -1670,27 +1670,43 @@ export default function ObjectInterfaceTest() { }); it("contactsApi_selectContact_test_100", 0, async function (done) { - contact.selectContact((err, data) => { - if (err) { - console.info("contactsApi_selectContact_test_100 err = " + JSON.stringify(err)); - expect(false).assertTrue(); + contact.addContact(contactData, (err, data) => { + if (!err) { + console.info("contactsApi_selectContact_test_100 data = " + JSON.stringify(data)); + expect(data > 0).assertTrue(); done(); return; } - console.info("contactsApi_selectContact_test_100 data = " + JSON.stringify(data)); - done(); + contact.selectContact((err, data) => { + if (err) { + console.info("contactsApi_selectContact_test_100 err = " + JSON.stringify(err)); + expect(false).assertTrue(); + done(); + return; + } + console.info("contactsApi_selectContact_test_100 data = " + JSON.stringify(data)); + done(); + }); }); }); it("contactsApi_selectContact_test_200", 0, async function (done) { - let promise = contact.selectContact(); - promise.then((data) => { - console.info("contactsApi_selectContact_test_200 data = " + JSON.stringify(data)); - done(); - }).catch((err) => { - console.info("contactsApi_selectContact_test_200 err = " + JSON.stringify(err)); - expect(false).assertTrue(); - done(); + contact.addContact(contactData, (err, data) => { + if (!err) { + console.info("contactsApi_selectContact_test_200 data = " + JSON.stringify(data)); + expect(data > 0).assertTrue(); + done(); + return; + } + let promise = contact.selectContact(); + promise.then((data) => { + console.info("contactsApi_selectContact_test_200 data = " + JSON.stringify(data)); + done(); + }).catch((err) => { + console.info("contactsApi_selectContact_test_200 err = " + JSON.stringify(err)); + expect(false).assertTrue(); + done(); + }); }); }); }); diff --git a/telephony/telephonyjstest/network_search/network_search_errors/src/main/js/test/NetworkSearchErrors.test.js b/telephony/telephonyjstest/network_search/network_search_errors/src/main/js/test/NetworkSearchErrors.test.js index fba3d84670c3000e6c521f059224efe820895adb..bcb790b401a730ce0afbc072099e85aa575ddd69 100644 --- a/telephony/telephonyjstest/network_search/network_search_errors/src/main/js/test/NetworkSearchErrors.test.js +++ b/telephony/telephonyjstest/network_search/network_search_errors/src/main/js/test/NetworkSearchErrors.test.js @@ -379,7 +379,7 @@ export default function ActsNetworkSearchTest() { radio.isRadioOn((err, data) => { if (err) { console.error('When the device has no modem, the interface reports an error' + JSON.stringify(err)); - expect(err.code).assertEqual(8300000); + expect(err.code).assertEqual(8300003); done(); return; } @@ -400,7 +400,7 @@ export default function ActsNetworkSearchTest() { done(); } catch (err) { console.error('When the device has no modem, the interface reports an error' + JSON.stringify(err)); - expect(err.code).assertEqual(8300000); + expect(err.code).assertEqual(8300003); done(); } }); @@ -414,7 +414,7 @@ export default function ActsNetworkSearchTest() { radio.isRadioOn(0, (err,data) => { if (err) { console.error('When the device has no modem, the interface reports an error' + JSON.stringify(err)); - expect(err.code).assertEqual(8300000); + expect(err.code).assertEqual(8300003); done(); return; } @@ -436,7 +436,7 @@ export default function ActsNetworkSearchTest() { done(); } catch (err) { console.error('When the device has no modem, the interface reports an error' + JSON.stringify(err)); - expect(err.code).assertEqual(8300000); + expect(err.code).assertEqual(8300003); done(); } }); diff --git a/telephony/telephonyjstest/telephony_base/BUILD.gn b/telephony/telephonyjstest/telephony_base/BUILD.gn index 14d77b74c7bfbc9d57774cf07c1f65e87b822012..dc8159cb8cc0446122e5764a1e50804b66916ac8 100644 --- a/telephony/telephonyjstest/telephony_base/BUILD.gn +++ b/telephony/telephonyjstest/telephony_base/BUILD.gn @@ -16,9 +16,6 @@ import("//build/ohos_var.gni") group("telephony_base") { testonly = true if (is_standard_system) { - deps = [ - "call_manager:ActsBaseCallManagerTest", - "sms_mms:ActsBaseSmsMmsTest", - ] + deps = [ "call_manager:ActsBaseCallManagerTest" ] } } diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/BUILD.gn b/telephony/telephonyjstest/telephony_base/sms_mms/BUILD.gn deleted file mode 100644 index d5435c442f9c3545a2fad0d40bf3b30f34d00b06..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/BUILD.gn +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (c) 2023 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("ActsBaseSmsMmsTest") { - hap_profile = "./src/main/config.json" - deps = [ - ":hjs_demo_js_assets", - ":hjs_demo_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsBaseSmsMmsTest" - part_name = "sms_mms" - subsystem_name = "telephony" -} -ohos_js_assets("hjs_demo_js_assets") { - js2abc = true - hap_profile = "./src/main/config.json" - source_dir = "./src/main/js" -} -ohos_resources("hjs_demo_resources") { - sources = [ "./src/main/resources" ] - hap_profile = "./src/main/config.json" -} diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/Test.json b/telephony/telephonyjstest/telephony_base/sms_mms/Test.json deleted file mode 100644 index 74e2fd4ae2fe52804932712c84f2254956557585..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/Test.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "description": "Function test of sms_mms manager interface", - "driver": { - "type": "OHJSUnitTest", - "test-timeout": "900000", - "bundle-name": "com.ohos.sms_mms", - "package-name": "com.ohos.sms_mms", - "shell-timeout": "900000", - "testcase-timeout": "30000" - }, - "kits": [ - { - "test-file-name": [ - "$module.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/signature/openharmony_sx.p7b b/telephony/telephonyjstest/telephony_base/sms_mms/signature/openharmony_sx.p7b deleted file mode 100644 index daee588c1b316f3f8c4472196bbb9742ef6a9a11..0000000000000000000000000000000000000000 Binary files a/telephony/telephonyjstest/telephony_base/sms_mms/signature/openharmony_sx.p7b and /dev/null differ diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/config.json b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/config.json deleted file mode 100644 index e59af5c88dbc7f1d0f25cca27498419690dd20fe..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/config.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "app": { - "bundleName": "com.ohos.sms_mms", - "vendor": "ohos", - "version": { - "code": 1000000, - "name": "1.0.0" - }, - "apiVersion": { - "compatible": 4, - "target": 7, - "releaseType": "Release" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.ohos.sms_mms", - "name": ".entry", - "mainAbility": ".MainAbility", - "srcPath":"", - "deviceType": [ - "tablet", - "default", - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "orientation": "unspecified", - "formsEnabled": false, - "name": ".MainAbility", - "srcLanguage": "js", - "srcPath": "MainAbility", - "icon": "$media:icon", - "description": "$string:MainAbility_desc", - "label": "$string:MainAbility_label", - "type": "page", - "visible": true, - "launchType": "standard" - }, - { - "orientation": "unspecified", - "formsEnabled": false, - "name": ".TestAbility", - "srcLanguage": "js", - "srcPath": "TestAbility", - "icon": "$media:icon", - "description": "$string:TestAbility_desc", - "label": "$string:TestAbility_label", - "type": "page", - "visible": true, - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - }, - { - "pages": [ - "pages/index/index" - ], - "name": ".TestAbility", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ], - "testRunner": { - "name": "OpenHarmonyTestRunner", - "srcPath": "TestRunner" - } - } -} \ No newline at end of file diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/app.js b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/app.js deleted file mode 100644 index b4e801145dde8d1076e656983f0f8446763e916a..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/app.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2023 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('TestApplication onCreate'); - - }, - onDestroy() { - console.info("TestApplication onDestroy"); - } -}; \ No newline at end of file diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/i18n/en-US.json b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/i18n/en-US.json deleted file mode 100644 index 55561b83737c3c31d082fbfa11e5fc987a351104..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/i18n/en-US.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - }, - "Files": { - } -} \ No newline at end of file diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/i18n/zh-CN.json b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/i18n/zh-CN.json deleted file mode 100644 index cce1af06761a42add0cac1a0567aa3237eda8cb4..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/i18n/zh-CN.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - }, - "Files": { - } -} \ No newline at end of file diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/pages/index/index.css b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/pages/index/index.css deleted file mode 100644 index 6fda792753f2e15f22b529c7b90a82185b2770bf..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/pages/index/index.css +++ /dev/null @@ -1,9 +0,0 @@ -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 100px; -} diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/pages/index/index.hml b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/pages/index/index.hml deleted file mode 100644 index cb389bfbdf4d04d87deeecf243bf92b910d5b965..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/pages/index/index.hml +++ /dev/null @@ -1,5 +0,0 @@ -
- - SMS_MMS TEST - -
diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/pages/index/index.js b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/pages/index/index.js deleted file mode 100644 index 7641f832ef388aed5412205d7989e17188c745f9..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/MainAbility/pages/index/index.js +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2023 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'; -import { Hypium } from '@ohos/hypium'; -import testsuite from '../../../test/List.test'; - -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!'); - var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator(); - var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments(); - console.info('start run testcase!!!'); - Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite); - }, - onReady () { - }, -}; \ No newline at end of file diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/app.js b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/app.js deleted file mode 100644 index 88d8457040af5c4f4fa2235f39d84895baea3616..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/app.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2023 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('TestApplication onCreate'); - }, - onDestroy() { - console.info('TestApplication onDestroy'); - } -}; - diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/i18n/en-US.json b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/i18n/en-US.json deleted file mode 100644 index 55561b83737c3c31d082fbfa11e5fc987a351104..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/i18n/en-US.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - }, - "Files": { - } -} \ No newline at end of file diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/i18n/zh-CN.json b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/i18n/zh-CN.json deleted file mode 100644 index cce1af06761a42add0cac1a0567aa3237eda8cb4..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/i18n/zh-CN.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - }, - "Files": { - } -} \ No newline at end of file diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/pages/index/index.css b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/pages/index/index.css deleted file mode 100644 index b21c92c6290ea747bd891e2ab673721afc5521ed..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/pages/index/index.css +++ /dev/null @@ -1,30 +0,0 @@ -.container { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - left: 0px; - top: 0px; - width: 100%; - height: 100%; -} - -.title { - font-size: 60px; - text-align: center; - width: 100%; - height: 40%; - margin: 10px; -} - -@media screen and (device-type: phone) and (orientation: landscape) { - .title { - font-size: 60px; - } -} - -@media screen and (device-type: tablet) and (orientation: landscape) { - .title { - font-size: 100px; - } -} \ No newline at end of file diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/pages/index/index.hml b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/pages/index/index.hml deleted file mode 100644 index f64b040a5ae394dbaa5e185e1ecd4f4556b92184..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/pages/index/index.hml +++ /dev/null @@ -1,5 +0,0 @@ -
- - {{ $t('strings.hello') }} {{ title }} - -
diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/pages/index/index.js b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/pages/index/index.js deleted file mode 100644 index c2c0b3c5220d9ab2572b0b9f786a8404f846f8ff..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestAbility/pages/index/index.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2023 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 { - data: { - title: "" - }, - onInit() { - this.title = this.$t('strings.world'); - } -} - - - diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestRunner/OpenHarmonyTestRunner.js deleted file mode 100644 index 02be70fc49480426000ea8368b3501cffd9a81e9..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/TestRunner/OpenHarmonyTestRunner.js +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2023 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'; - -function translateParamsToString(parameters) { - const keySet = new Set([ - '-s class', '-s notClass', '-s suite', '-s itName', - '-s level', '-s testType', '-s size', '-s timeout', - '-s package', '-s dryRun' - ]); - let targetParams = ''; - for (const key in parameters) { - if (keySet.has(key)) { - targetParams += ' ' + key + ' ' + parameters[key]; - } - } - return targetParams.trim(); -} - - export default { - onPrepare() { - console.info('OpenHarmonyTestRunner OnPrepare'); - }, - onRun() { - console.log('OpenHarmonyTestRunner onRun run'); - var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments(); - var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator(); - - var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.MainAbility'; - - var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName; - cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters); - var debug = abilityDelegatorArguments.parameters["-D"]; - console.info('debug value : '+debug); - if (debug == 'true') - { - cmd += ' -D'; - } - console.info('cmd : '+cmd); - abilityDelegator.executeShellCommand(cmd, (err, data) => { - console.info('executeShellCommand : err : ' + JSON.stringify(err)); - console.info('executeShellCommand : data : ' + data.stdResult); - console.info('executeShellCommand : data : ' + data.exitCode); - }); - } -} diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/test/List.test.js b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/test/List.test.js deleted file mode 100644 index 4351c20ac1ae25841d690ba6d66080ad1a629a86..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/test/List.test.js +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (C) 2023 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 SmsMmsBatchInsert from './SmsMmsBatchInsert.test'; - -export default function testsuite() { - SmsMmsBatchInsert(); -} \ No newline at end of file diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/test/SmsMmsBatchInsert.test.js b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/test/SmsMmsBatchInsert.test.js deleted file mode 100644 index cf1dc8cfaa69c48beee38f72b1c61035d440cd5a..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/js/test/SmsMmsBatchInsert.test.js +++ /dev/null @@ -1,426 +0,0 @@ -/* -* Copyright (c) 2023 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 featureAbility from "@ohos.ability.featureAbility"; -import { describe, expect, it, beforeEach } from '@ohos/hypium'; - -export default function SmsMmsBatchInsert() { - describe('SmsMmsBatchInsert', function () { - - const URL_DAH = "dataability:///com.ohos.smsmmsability"; - const URL_INFO = "dataability:///com.ohos.smsmmsability/sms_mms/sms_mms_info"; - const URL_INFO_ERR = "dataability:///com.ohos.smsmmsability/sms_mms/sms_mms_infos"; - const DAHelper = featureAbility.acquireDataAbilityHelper(URL_DAH); - let smsMmsInfo = { - "receiver_number": "134XXXXXXXX", //接收方号码 TEXT - "sender_number": "135XXXXXXXX", //发送方号码 TEXT - "is_sender": 1, //是否是发送方 0 - 接收方 1 - 发送方 integer - "msg_type": 0, //消息类型 0主题、1图片、2视频、3音频、4文本、5名片 integer - "sms_type": 1, //短息类型 0-普通，1-通知 integer - "start_time": "1659506935398", //启始时间 TEXT - "end_time": "1659506935399", //结束时间 TEXT - "msg_state": 0, //消息状态 0：成功 ，1 ：失败 ， 2 ： 发送中... integer - "msg_title": "message title", //消息标题 TEXT - "msg_content": "The test text message content", //消息内容 TEXT - "operator_service_number": "123456", //操作员服务号码 TEXT - "is_lock": 0, //是否锁定 0-否，1-是 integer - "is_collect": 0, //是否收藏 0-未收藏，1-已收藏 integer - "is_read": 0, // 是否读取 0-已读，1-未读 integer - "session_type": 0, //会话类型 0 - 普通 1 - 广播 2 - 群发 integer - "retry_number": 0, //重试次数 integer - "session_id": -1, //会话Id integer - "group_id": 1, //群组ID integer - "device_id": -1, //设备id integer - "is_subsection": 0, //是否分支 0 - 否 1 - 是 integer - "is_send_report": 1, //是否发送报告 0 - 否 1 - 是 integer - "msg_code": 0 - }; //消息码 integer - - let smsMmsInfoErr = { - "receiver_number_s": "134XXXXXXXX", //接收方号码 TEXT - "sender_number": "135XXXXXXXX", //发送方号码 TEXT - "is_sender_s": 1, //是否是发送方 0 - 接收方 1 - 发送方 integer - "msg_type": 0, //消息类型 0主题、1图片、2视频、3音频、4文本、5名片 integer - "sms_type": 1, //短息类型 0-普通，1-通知 integer - "start_time": "1659506935398", //启始时间 TEXT - "end_time": "1659506935399", //结束时间 TEXT - "msg_state": 0, //消息状态 0：成功 ，1 ：失败 ， 2 ： 发送中... integer - "msg_title": "message title", //消息标题 TEXT - "msg_content": "The err test text message content", //消息内容 TEXT - "operator_service_number": "123456", //操作员服务号码 TEXT - "is_lock": 0, //是否锁定 0-否，1-是 integer - "is_collect": 0, //是否收藏 0-未收藏，1-已收藏 integer - "is_read": 0, // 是否读取 0-已读，1-未读 integer - "session_type": 0, //会话类型 0 - 普通 1 - 广播 2 - 群发 integer - "retry_number": 0, //重试次数 integer - "session_id": -1, //会话Id integer - "group_id": 1, //群组ID integer - "device_id": -1, //设备id integer - "is_subsection": 0, //是否分支 0 - 否 1 - 是 integer - "is_send_report": 1, //是否发送报告 0 - 否 1 - 是 integer - "msg_code": 0 - }; //消息码 integer - - beforeEach(async function () { - if (DAHelper == null) { - console.log('beforeEach get DAHelper fail.'); - return; - } - try { - let dataQuery = await DAHelper.query(URL_INFO); - console.log('beforeEach query Success, data: ' + JSON.stringify(dataQuery.rowCount)); - if (dataQuery.rowCount !== 0) { - let dataDel = await DAHelper.delete(URL_INFO); - console.log('beforeEach delete Success, data: ' + JSON.stringify(dataDel)); - } - } catch (err) { - console.log('beforeEach test fail, err : ' + JSON.stringify(err)); - return; - } - }); - - function sleep(numberMillis) { - var now = new Date(); - var exitTime = now.getTime() + numberMillis; - while (true) { - now = new Date(); - if (now.getTime() > exitTime){ - return; - } - } - } - - function ExpectTrue(data) { - try { - expect(data).assertTrue(); - } catch (err) { - console.log('assertion failure'); - } - } - - function ExpectFalse() { - try { - expect().assertFail(); - } catch (err) { - console.log('assertion failure'); - } - } - - /* - * @tc.number Telephony_SmsMms_batchInsert_Async_0100 - * @tc.name - * @tc.desc Function test - */ - it('Telephony_SmsMms_batchInsert_Async_0100', 0, async function (done) { - const CASE_NAME = 'Telephony_SmsMms_batchInsert_Async_0100'; - let valuesBuckets = []; - let num = 1; - for (let i = 0; i < num; i++) { - valuesBuckets[i] = smsMmsInfo; - } - DAHelper.batchInsert(URL_INFO, valuesBuckets, (data, err) => { - if (err) { - console.log(CASE_NAME + ' batchInsert fail, err : ' + JSON.stringify(err)); - ExpectFalse(); - done(); - return; - } - ExpectTrue(data.code === 0); - console.log(CASE_NAME + ' batchInsert Success, data:' + JSON.stringify(data)); - }); - sleep(100); - try { - let data = await DAHelper.query(URL_INFO); - ExpectTrue(data.rowCount === num); - console.log(CASE_NAME + ' query Success, data: ' + JSON.stringify(data.rowCount)); - done(); - } catch (err) { - console.log(CASE_NAME + ' query fail, err: ' + JSON.stringify(err)); - ExpectFalse(); - done(); - return; - } - }); - - /* - * @tc.number Telephony_SmsMms_batchInsert_Async_0200 - * @tc.name - * @tc.desc Function test - */ - it('Telephony_SmsMms_batchInsert_Async_0200', 0, async function (done) { - const CASE_NAME = 'Telephony_SmsMms_batchInsert_Async_0200'; - let valuesBuckets = []; - let num = 1; - for (let i = 0; i < num; i++) { - valuesBuckets[i] = smsMmsInfo; - } - DAHelper.batchInsert(URL_INFO_ERR, valuesBuckets, (data, err) => { - if (err) { - console.log(CASE_NAME + ' batchInsert Success, err : ' + JSON.stringify(err)); - ExpectTrue(true); - done(); - return; - } - ExpectFalse(); - console.log(CASE_NAME + ' batchInsert failed, data:' + JSON.stringify(data)); - done(); - }); - }); - - /* - * @tc.number Telephony_SmsMms_batchInsert_Async_0300 - * @tc.name - * @tc.desc Function test - */ - it('Telephony_SmsMms_batchInsert_Async_0300', 0, async function (done) { - const CASE_NAME = 'Telephony_SmsMms_batchInsert_Async_0300'; - let valuesBuckets = []; - DAHelper.batchInsert(URL_INFO, valuesBuckets, (data, err) => { - if (err) { - console.log(CASE_NAME + ' batchInsert fail, err : ' + JSON.stringify(err)); - ExpectFalse(); - done(); - return; - } - ExpectTrue(data.code === 0); - console.log(CASE_NAME + ' batchInsert Success, data:' + JSON.stringify(data)); - }); - sleep(100); - try { - let data = await DAHelper.query(URL_INFO); - ExpectTrue(data.rowCount === 0); - console.log(CASE_NAME + ' query Success, data: ' + JSON.stringify(data.rowCount)); - done(); - } catch (err) { - console.log(CASE_NAME + ' query fail, err : ' + JSON.stringify(err)); - ExpectFalse(); - done(); - return; - } - }); - - /* - * @tc.number Telephony_SmsMms_batchInsert_Async_0400 - * @tc.name - * @tc.desc Function test - */ - it('Telephony_SmsMms_batchInsert_Async_0400', 0, async function (done) { - const CASE_NAME = 'Telephony_SmsMms_batchInsert_Async_0400'; - let valuesBuckets = []; - let num = 248; - for (let i = 0; i < num; i++) { - valuesBuckets[i] = smsMmsInfo; - } - DAHelper.batchInsert(URL_INFO, valuesBuckets, (data, err) => { - if (err) { - console.log(CASE_NAME + ' batchInsert fail, err : ' + JSON.stringify(err)); - ExpectFalse(); - } - ExpectTrue(data.code === 0); - console.log(CASE_NAME + ' batchInsert Success, data:' + JSON.stringify(data)); - }); - sleep(2000); - try { - let data = await DAHelper.query(URL_INFO); - ExpectTrue(data.rowCount === num); - console.log(CASE_NAME + ' query Success, data:' + JSON.stringify(data.rowCount)); - done(); - } catch (err) { - console.log(CASE_NAME + ' query fail, err : ' + JSON.stringify(err)); - ExpectFalse(); - done(); - return; - } - }); - - /* - * @tc.number Telephony_SmsMms_batchInsert_Async_0500 - * @tc.name - * @tc.desc Function test - */ - it('Telephony_SmsMms_batchInsert_Async_0500', 0, async function (done) { - const CASE_NAME = 'Telephony_SmsMms_batchInsert_Async_0500'; - let valuesBuckets = []; - let num = 1; - for (let i = 0; i < num; i++) { - valuesBuckets[i] = smsMmsInfoErr; - } - DAHelper.batchInsert(URL_INFO, valuesBuckets, (data, err) => { - if (err) { - console.log(CASE_NAME + ' batchInsert Success, err : ' + JSON.stringify(err)); - ExpectTrue(true); - done(); - return; - } - ExpectFalse(); - console.log(CASE_NAME + ' batchInsert failed, data:' + JSON.stringify(data)); - done(); - }); - }); - - /* - * @tc.number Telephony_SmsMms_batchInsert_Promise_0100 - * @tc.name - * @tc.desc Function test - */ - it('Telephony_SmsMms_batchInsert_Promise_0100', 0, async function (done) { - const CASE_NAME = 'Telephony_SmsMms_batchInsert_Promise_0100'; - let valuesBuckets = []; - let num = 1; - for (let i = 0; i < num; i++) { - valuesBuckets[i] = smsMmsInfo; - } - try { - let data = await DAHelper.batchInsert(URL_INFO, valuesBuckets); - ExpectTrue(data === 0); - console.log(CASE_NAME + ' batchInsert Success, data:' + JSON.stringify(data)); - } catch (err) { - console.log(CASE_NAME + ' batchInsert fail, err : ' + JSON.stringify(err)); - ExpectFalse(); - done(); - return; - } - try { - let data = await DAHelper.query(URL_INFO); - ExpectTrue(data.rowCount === num); - console.log(CASE_NAME + ' query Success, data:' + JSON.stringify(data.rowCount)); - done(); - } catch (err) { - console.log(CASE_NAME + ' query fail, err : ' + JSON.stringify(err)); - ExpectFalse(); - done(); - return; - } - }); - - /* - * @tc.number Telephony_SmsMms_batchInsert_Promise_0200 - * @tc.name - * @tc.desc Function test - */ - it('Telephony_SmsMms_batchInsert_Promise_0200', 0, async function (done) { - const CASE_NAME = 'Telephony_SmsMms_batchInsert_Promise_0200'; - let valuesBuckets = []; - let num = 1; - for (let i = 0; i < num; i++) { - valuesBuckets[i] = smsMmsInfo; - } - try { - let data = await DAHelper.batchInsert(URL_INFO_ERR, valuesBuckets); - ExpectTrue(data === -1); - console.log(CASE_NAME + ' batchInsert Success, data:' + JSON.stringify(data)); - done(); - return; - } catch (err) { - console.log(CASE_NAME + ' batchInsert failed, err : ' + JSON.stringify(err)); - ExpectTrue(true); - done(); - } - }); - - /* - * @tc.number Telephony_SmsMms_batchInsert_Promise_0300 - * @tc.name - * @tc.desc Function test - */ - it('Telephony_SmsMms_batchInsert_Promise_0300', 0, async function (done) { - const CASE_NAME = 'Telephony_SmsMms_batchInsert_Promise_0300'; - let valuesBuckets = []; - try { - let data = await DAHelper.batchInsert(URL_INFO, valuesBuckets); - ExpectTrue(data === 0); - console.log(CASE_NAME + ' batchInsert Success, data:' + JSON.stringify(data)); - } catch (err) { - console.log(CASE_NAME + ' batchInsert fail, err : ' + JSON.stringify(err)); - ExpectFalse(); - done(); - return; - } - sleep(100); - try { - let data = await DAHelper.query(URL_INFO); - ExpectTrue(data.rowCount === 0); - console.log(CASE_NAME + ' query Success, data:' + JSON.stringify(data.rowCount)); - done(); - } catch (err) { - console.log(CASE_NAME + ' query fail, err : ' + JSON.stringify(err)); - ExpectFalse(); - done(); - return; - } - }); - - /* - * @tc.number Telephony_SmsMms_batchInsert_Promise_0400 - * @tc.name - * @tc.desc Function test - */ - it('Telephony_SmsMms_batchInsert_Promise_0400', 0, async function (done) { - const CASE_NAME = 'Telephony_SmsMms_batchInsert_Promise_0400'; - let valuesBuckets = []; - let num = 100; - for (let i = 0; i < num; i++) { - valuesBuckets[i] = smsMmsInfo; - } - try { - let data = await DAHelper.batchInsert(URL_INFO, valuesBuckets); - ExpectTrue(data === 0); - console.log(CASE_NAME + ' batchInsert Success, data:' + JSON.stringify(data)); - } catch (err) { - console.log(CASE_NAME + ' batchInsert fail, err : ' + JSON.stringify(err)); - ExpectFalse(); - done(); - return; - } - sleep(100); - try { - let data = await DAHelper.query(URL_INFO); - ExpectTrue(data.rowCount === num); - console.log(CASE_NAME + ' query Success, data:' + JSON.stringify(data.rowCount)); - done(); - } catch (err) { - console.log(CASE_NAME + ' query fail, err : ' + JSON.stringify(err)); - ExpectFalse(); - done(); - return; - } - }); - - /* - * @tc.number Telephony_SmsMms_batchInsert_Promise_0500 - * @tc.name - * @tc.desc Function test - */ - it('Telephony_SmsMms_batchInsert_Promise_0500', 0, async function (done) { - const CASE_NAME = 'Telephony_SmsMms_batchInsert_Promise_0500'; - let valuesBuckets = []; - let num = 1; - for (let i = 0; i < num; i++) { - valuesBuckets[i] = smsMmsInfoErr; - } - try { - let data = await DAHelper.batchInsert(URL_INFO, valuesBuckets); - ExpectTrue(data === -1); - console.log(CASE_NAME + ' batchInsert Success , data:' + JSON.stringify(data)); - done(); - return; - } catch (err) { - console.log(CASE_NAME + ' batchInsert failed, err : ' + JSON.stringify(err)); - ExpectTrue(true); - done(); - } - }); - }); -} \ No newline at end of file diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/resources/base/element/string.json b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/resources/base/element/string.json deleted file mode 100644 index f06b8e11e03c5c8129ae01d6388a3e41a40a7129..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/resources/base/element/string.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "sms_mms Test" - }, - { - "name": "mainability_description", - "value": "sms_mms Test" - }, - { - "name": "MainAbility_desc", - "value": "description" - }, - { - "name": "MainAbility_label", - "value": "label" - }, - { - "name": "TestAbility_desc", - "value": "description" - }, - { - "name": "TestAbility_label", - "value": "label" - } - ] -} \ No newline at end of file diff --git a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/resources/base/media/icon.png b/telephony/telephonyjstest/telephony_base/sms_mms/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/telephony/telephonyjstest/telephony_base/sms_mms/src/main/resources/base/media/icon.png and /dev/null differ