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 abbc6f7ce78be726f2ede9d8e9c669864db62474..d133601682602f168f4ffc11d8fa6c6c4f489f75 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 @@ -527,15 +527,23 @@ export default function ObjectInterfaceTest() { } console.info("contactsApi_addContact_test_100 data = " + JSON.stringify(data)); expect(data > 0).assertTrue(); - contact.deleteContact(data + '', (err) => { + contact.queryKey(data, (err, keyData) => { if (err) { console.info("contactsApi_addContact_test_100 err = " + JSON.stringify(err)); expect(false).assertTrue(); done(); return; } - console.log('deleteContact success'); - done(); + contact.deleteContact(keyData, (keyData) => { + if (err) { + console.info("contactsApi_addContact_test_100 err = " + JSON.stringify(err)); + expect(false).assertTrue(); + done(); + return; + } + console.log('deleteContact success'); + done(); + }); }); }); sleep(500); @@ -546,15 +554,23 @@ export default function ObjectInterfaceTest() { promise.then((data) => { console.info("contactsApi_addContact_test_200 data = " + JSON.stringify(data)); expect(data > 0).assertTrue(); - let promise = contact.deleteContact(data + ''); - promise.then(() => { - console.log(`deleteContact success`); - done(); - }).catch((err) => { - console.info("contactsApi_addContact_test_200 err = " + JSON.stringify(err)); - expect(false).assertTrue(); - done(); - return; + contact.queryKey(data, (err, keyData) => { + if (err) { + console.info("contactsApi_addContact_test_200 err = " + JSON.stringify(err)); + expect(false).assertTrue(); + done(); + return; + } + let promise = contact.deleteContact(keyData); + promise.then(() => { + console.log(`deleteContact success`); + done(); + }).catch((err) => { + console.info("contactsApi_addContact_test_200 err = " + JSON.stringify(err)); + expect(false).assertTrue(); + done(); + return; + }); }); }).catch((err) => { console.info("contactsApi_addContact_test_200 err = " + JSON.stringify(err)); @@ -581,16 +597,24 @@ export default function ObjectInterfaceTest() { } console.info("contactsApi_queryContact_test_100 data = " + JSON.stringify(data)); expect(data > 0).assertTrue(); - contact.queryContact(data + '', (err, data) => { + contact.queryKey(data, holder, (err, keyData) => { if (err) { console.info("contactsApi_queryContact_test_100 err = " + JSON.stringify(err)); expect(false).assertTrue(); done(); return; } - console.info("contactsApi_queryContact_test_100 data = " + JSON.stringify(data)); - expect(data.emails[0].email != '').assertTrue(); - done(); + contact.queryContact(keyData, (err, data) => { + if (err) { + console.info("contactsApi_queryContact_test_100 err = " + JSON.stringify(err)); + expect(false).assertTrue(); + done(); + return; + } + console.info("contactsApi_queryContact_test_100 data = " + JSON.stringify(data)); + expect(data.emails[0].email != '').assertTrue(); + done(); + }); }); }); sleep(500); @@ -606,16 +630,24 @@ export default function ObjectInterfaceTest() { } console.info("contactsApi_queryContact_test_200 data = " + JSON.stringify(data)); expect(data > 0).assertTrue(); - contact.queryContact(data + '', holder, (err, data) => { + contact.queryKey(data, (err, keyData) => { if (err) { console.info("contactsApi_queryContact_test_200 err = " + JSON.stringify(err)); expect(false).assertTrue(); done(); return; } - console.info("contactsApi_queryContact_test_200 data = " + JSON.stringify(data)); - expect(data.emails[0].email != '').assertTrue(); - done(); + contact.queryContact(keyData, holder, (err, data) => { + if (err) { + console.info("contactsApi_queryContact_test_200 err = " + JSON.stringify(err)); + expect(false).assertTrue(); + done(); + return; + } + console.info("contactsApi_queryContact_test_200 data = " + JSON.stringify(data)); + expect(data.emails[0].email != '').assertTrue(); + done(); + }); }); }); sleep(500); @@ -631,16 +663,24 @@ export default function ObjectInterfaceTest() { } console.info("contactsApi_queryContact_test_300 data = " + JSON.stringify(data)); expect(data > 0).assertTrue(); - contact.queryContact(data + '', attr, (err, data) => { + contact.queryKey(data, (err, keyData) => { if (err) { console.info("contactsApi_queryContact_test_300 err = " + JSON.stringify(err)); expect(false).assertTrue(); done(); return; } - console.info("contactsApi_queryContact_test_300 data = " + JSON.stringify(data)); - expect(data.emails[0].email != '').assertTrue(); - done(); + contact.queryContact(keyData, attr, (err, data) => { + if (err) { + console.info("contactsApi_queryContact_test_300 err = " + JSON.stringify(err)); + expect(false).assertTrue(); + done(); + return; + } + console.info("contactsApi_queryContact_test_300 data = " + JSON.stringify(data)); + expect(data.emails[0].email != '').assertTrue(); + done(); + }); }); }); sleep(500); @@ -656,16 +696,24 @@ export default function ObjectInterfaceTest() { } console.info("contactsApi_queryContact_test_400 data = " + JSON.stringify(data)); expect(data > 0).assertTrue(); - contact.queryContact(data + '', holder, attr, (err, data) => { + contact.queryKey(data, (err, keyData) => { if (err) { console.info("contactsApi_queryContact_test_400 err = " + JSON.stringify(err)); expect(false).assertTrue(); done(); return; } - console.info("contactsApi_queryContact_test_400 data = " + JSON.stringify(data)); - expect(data.emails[0].email != '').assertTrue(); - done(); + contact.queryContact(keyData, holder, attr, (err, data) => { + if (err) { + console.info("contactsApi_queryContact_test_400 err = " + JSON.stringify(err)); + expect(false).assertTrue(); + done(); + return; + } + console.info("contactsApi_queryContact_test_400 data = " + JSON.stringify(data)); + expect(data.emails[0].email != '').assertTrue(); + done(); + }); }); }); sleep(500); @@ -681,16 +729,24 @@ export default function ObjectInterfaceTest() { } console.info("contactsApi_queryContact_test_500 data = " + JSON.stringify(data)); expect(data > 0).assertTrue(); - let promise = contact.queryContact(data + '', holder, attr); - promise.then((data) => { - console.info("contactsApi_queryContact_test_500 data = " + JSON.stringify(data)); - expect(data.emails[0].email != '').assertTrue(); - done(); - }).catch((err) => { - console.info("contactsApi_queryContact_test_500 err = " + JSON.stringify(err)); - expect(false).assertTrue(); - done(); - return; + contact.queryKey(data, (err, keyData) => { + if (err) { + console.info("contactsApi_queryContact_test_500 err = " + JSON.stringify(err)); + expect(false).assertTrue(); + done(); + return; + } + let promise = contact.queryContact(keyData, holder, attr); + promise.then((data) => { + console.info("contactsApi_queryContact_test_500 data = " + JSON.stringify(data)); + expect(data.emails[0].email != '').assertTrue(); + done(); + }).catch((err) => { + console.info("contactsApi_queryContact_test_500 err = " + JSON.stringify(err)); + expect(false).assertTrue(); + done(); + return; + }); }); }); sleep(500); @@ -1325,16 +1381,24 @@ export default function ObjectInterfaceTest() { return; } console.log('updateContact success'); - contact.queryContact(data + '', (err, data) => { + contact.queryKey(data, (err, keyData) => { if (err) { console.info("contactsApi_updateContact_test_100 err = " + JSON.stringify(err)); expect(false).assertTrue(); done(); return; } - console.info("contactsApi_updateContact_test_100 data = " + JSON.stringify(data)); - expect(data.emails[0].email == "13800000001@email.com").assertTrue(); - done(); + contact.queryContact(keyData, (err, data) => { + if (err) { + console.info("contactsApi_updateContact_test_100 err = " + JSON.stringify(err)); + expect(false).assertTrue(); + done(); + return; + } + console.info("contactsApi_updateContact_test_100 data = " + JSON.stringify(data)); + expect(data.emails[0].email == "13800000001@email.com").assertTrue(); + done(); + }); }); }); }); @@ -1368,16 +1432,24 @@ export default function ObjectInterfaceTest() { return; } console.log('updateContact success'); - contact.queryContact(data + '', (err, data) => { + contact.queryKey(data, (err, keyData) => { if (err) { console.info("contactsApi_updateContact_test_200 err = " + JSON.stringify(err)); expect(false).assertTrue(); done(); return; } - console.info("contactsApi_updateContact_test_200 data = " + JSON.stringify(data)); - expect(data.emails[0].email == "13800000001@email.com").assertTrue(); - done(); + contact.queryContact(keyData, (err, data) => { + if (err) { + console.info("contactsApi_updateContact_test_200 err = " + JSON.stringify(err)); + expect(false).assertTrue(); + done(); + return; + } + console.info("contactsApi_updateContact_test_200 data = " + JSON.stringify(data)); + expect(data.emails[0].email == "13800000001@email.com").assertTrue(); + done(); + }); }); }); }); @@ -1406,16 +1478,24 @@ export default function ObjectInterfaceTest() { }, attr); promise.then(() => { console.log('updateContact success'); - contact.queryContact(data + '', (err, data) => { + contact.queryKey(data, (err, keyData) => { if (err) { console.info("contactsApi_updateContact_test_300 err = " + JSON.stringify(err)); expect(false).assertTrue(); done(); return; } - console.info("contactsApi_updateContact_test_300 data = " + JSON.stringify(data)); - expect(data.emails[0].email == "13800000001@email.com").assertTrue(); - done(); + contact.queryContact(keyData, (err, data) => { + if (err) { + console.info("contactsApi_updateContact_test_300 err = " + JSON.stringify(err)); + expect(false).assertTrue(); + done(); + return; + } + console.info("contactsApi_updateContact_test_300 data = " + JSON.stringify(data)); + expect(data.emails[0].email == "13800000001@email.com").assertTrue(); + done(); + }); }); }).catch((err) => { console.info("contactsApi_updateContact_test_300 err = " + JSON.stringify(err)); diff --git a/telephony/telephonyjstest/telephony_base/BUILD.gn b/telephony/telephonyjstest/telephony_base/BUILD.gn index 06e307ca1afde0636c95dd1b7dfcd2c7b92475ed..14d77b74c7bfbc9d57774cf07c1f65e87b822012 100644 --- a/telephony/telephonyjstest/telephony_base/BUILD.gn +++ b/telephony/telephonyjstest/telephony_base/BUILD.gn @@ -18,7 +18,6 @@ group("telephony_base") { if (is_standard_system) { deps = [ "call_manager:ActsBaseCallManagerTest", - "cellular_data:ActsBaseCellularDataTest", "sms_mms:ActsBaseSmsMmsTest", ] } diff --git a/telephony/telephonyjstest/telephony_base/cellular_data/BUILD.gn b/telephony/telephonyjstest/telephony_base/cellular_data/BUILD.gn deleted file mode 100644 index 5643cd9ee36e8a106ab84acc430e905794ecf71c..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/BUILD.gn +++ /dev/null @@ -1,35 +0,0 @@ -# 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("ActsBaseCellularDataTest") { - hap_profile = "./src/main/config.json" - deps = [ - ":hjs_demo_js_assets", - ":hjs_demo_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsBaseCellularDataTest" - part_name = "cellular_data" - 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/cellular_data/Test.json b/telephony/telephonyjstest/telephony_base/cellular_data/Test.json deleted file mode 100644 index 4f675dc28ca9435a9fe7a8fa70d2cbab4ffe9314..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/Test.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "description": "Function test of sim manager interface", - "driver": { - "type": "OHJSUnitTest", - "test-timeout": "900000", - "bundle-name": "com.ohos.cellular_data", - "package-name": "com.ohos.cellular_data", - "shell-timeout": "900000", - "testcase-timeout": "30000" - }, - "kits": [ - { - "test-file-name": [ - "$module.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} diff --git a/telephony/telephonyjstest/telephony_base/cellular_data/signature/openharmony_sx.p7b b/telephony/telephonyjstest/telephony_base/cellular_data/signature/openharmony_sx.p7b deleted file mode 100644 index 5d2256ef22054365b117ed7db99447d689f01679..0000000000000000000000000000000000000000 Binary files a/telephony/telephonyjstest/telephony_base/cellular_data/signature/openharmony_sx.p7b and /dev/null differ diff --git a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/config.json b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/config.json deleted file mode 100644 index 74b5fe73e2532c20ba7b562a846bdd190d3203cd..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/config.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "app": { - "bundleName": "com.ohos.cellular_data", - "vendor": "ohos", - "version": { - "code": 1000000, - "name": "1.0.0" - }, - "apiVersion": { - "compatible": 4, - "target": 7, - "releaseType": "Release" - } - }, - "deviceConfig": {}, - "module": { - "package": "com.ohos.cellular_data", - "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" - } - ], - "reqPermissions":[ - { - "name":"ohos.permission.SET_TELEPHONY_STATE", - "reason":"need use ohos.permission.SET_TELEPHONY_STATE" - }, - { - "name":"ohos.permission.GET_TELEPHONY_STATE", - "reason":"need use ohos.permission.GET_TELEPHONY_STATE" - } - ], - "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/cellular_data/src/main/js/MainAbility/app.js b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/MainAbility/app.js deleted file mode 100644 index a54db6874b44e7914f7245bea8349188b1a8347c..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/MainAbility/app.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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('TestApplication onCreate') - - }, - onDestroy() { - console.info("TestApplication onDestroy"); - } -}; \ No newline at end of file diff --git a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/MainAbility/i18n/en-US.json b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/MainAbility/i18n/en-US.json deleted file mode 100644 index 55561b83737c3c31d082fbfa11e5fc987a351104..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/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/cellular_data/src/main/js/MainAbility/i18n/zh-CN.json b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/MainAbility/i18n/zh-CN.json deleted file mode 100644 index cce1af06761a42add0cac1a0567aa3237eda8cb4..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/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/cellular_data/src/main/js/MainAbility/pages/index/index.css b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/MainAbility/pages/index/index.css deleted file mode 100644 index 6fda792753f2e15f22b529c7b90a82185b2770bf..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/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/cellular_data/src/main/js/MainAbility/pages/index/index.hml b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/MainAbility/pages/index/index.hml deleted file mode 100644 index 1761ec52614d15e232d2e5ba45299eff2b1179f9..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/MainAbility/pages/index/index.hml +++ /dev/null @@ -1,5 +0,0 @@ -
- - SIM TEST - -
diff --git a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/MainAbility/pages/index/index.js b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/MainAbility/pages/index/index.js deleted file mode 100644 index 51b16517bf634ec6b35c2299f96888242fea71ad..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/MainAbility/pages/index/index.js +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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 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/cellular_data/src/main/js/TestAbility/app.js b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/TestAbility/app.js deleted file mode 100644 index 065cded0a5f0da1c4f86460db4bd0b3445816805..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/TestAbility/app.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2022 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/cellular_data/src/main/js/TestAbility/i18n/en-US.json b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/TestAbility/i18n/en-US.json deleted file mode 100644 index 55561b83737c3c31d082fbfa11e5fc987a351104..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/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/cellular_data/src/main/js/TestAbility/i18n/zh-CN.json b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/TestAbility/i18n/zh-CN.json deleted file mode 100644 index cce1af06761a42add0cac1a0567aa3237eda8cb4..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/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/cellular_data/src/main/js/TestAbility/pages/index/index.css b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/TestAbility/pages/index/index.css deleted file mode 100644 index b21c92c6290ea747bd891e2ab673721afc5521ed..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/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/cellular_data/src/main/js/TestAbility/pages/index/index.hml b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/TestAbility/pages/index/index.hml deleted file mode 100644 index f64b040a5ae394dbaa5e185e1ecd4f4556b92184..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/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/cellular_data/src/main/js/TestAbility/pages/index/index.js b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/TestAbility/pages/index/index.js deleted file mode 100644 index d94b75c085fa1c16a0b2721609b18c57a7295476..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/TestAbility/pages/index/index.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2022 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/cellular_data/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/TestRunner/OpenHarmonyTestRunner.js deleted file mode 100644 index 527be90a1240e77ba994eb71d2868331533bb464..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/TestRunner/OpenHarmonyTestRunner.js +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2022 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/cellular_data/src/main/js/test/List.test.js b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/test/List.test.js deleted file mode 100644 index 8d9c5457d13abaa2353cebd1da656fa5fa3611f2..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/test/List.test.js +++ /dev/null @@ -1,20 +0,0 @@ -/* - * 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 PdpProfileDataStorageFunction from './PdpProfileDataStorageFunction.test.js'; - -export default function testsuite() { - PdpProfileDataStorageFunction(); -} \ No newline at end of file diff --git a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/test/PdpProfileDataStorageFunction.test.js b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/test/PdpProfileDataStorageFunction.test.js deleted file mode 100644 index 541d55ed288ff8c721adc0be86857f2ceb2a211a..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/js/test/PdpProfileDataStorageFunction.test.js +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Copyright (C) 2022 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 ohosDataAbility from '@ohos.data.dataAbility'; -import { describe, beforeAll, beforeEach, afterAll, it, expect } from "@ohos/hypium"; -export default function ActsBaseCellularDataTest() { - - var inItialState = false; - const time = 2000; - - const pdpprofileabilityUrl = "dataability:///com.ohos.pdpprofileability"; - const pdpProfileUri = "net/pdp_profile"; - const pdpProfileFullUri = pdpprofileabilityUrl + '/' + pdpProfileUri; - const dataAbilityHelper = featureAbility.acquireDataAbilityHelper(pdpprofileabilityUrl); - - describe("TelephonyCellularDataFunction", function () { - const sleep = (time) => { - return new Promise((resolve, reject) => { - setTimeout(() => { - resolve(); - }, time); - }) - }; - - beforeAll(function () { - let stringValue = { - profile_Name: "test_profile_name", - mcc: "460", - mnc: "91" - }; - dataAbilityHelper.insert(pdpProfileFullUri, stringValue).then(data => { - console.log(`Telephony_DataStorage_beforeAll success, insetId=${data}`); - expect(data > 0).assertTrue(); - }).catch(error => { - expect().assertFail(); - console.log("Telephony_DataStorage_beforeAll failed"); - done(); - }); - }) - - beforeEach(function () { - }) - - afterAll(function () { - var condition = new ohosDataAbility.DataAbilityPredicates(); - condition.equalTo("profile_name", "test_profile_name"); - dataAbilityHelper.delete(pdpProfileFullUri, condition).then(data => { - console.log("Telephony_DataStorage_PdpProfile_afterAll: delete success data: " + JSON.stringify(data)); - expect(data === 0).assertTrue(); - }).catch(error => { - expect().assertFail(); - console.log("Telephony_DataStorage_PdpProfile_afterAll failed"); - done(); - }); - }) - - /* - * @tc.number Telephony_DataStorage_InsetIntoPdpProfile_Async_0100 - * @tc.name Insert into pdpProfile database - * @tc.desc Function test - */ - it("Telephony_DataStorage_PdpProfile_Insert_Async_0100", 0, async function (done) { - let stringValue = { - profile_Name: "test_profile_name", - mcc: "460", - mnc: "91" - }; - dataAbilityHelper.insert(pdpProfileFullUri, stringValue).then(data => { - console.log(`Telephony_DataStorage_InsetIntoPdpProfile_Async_0100 success, insertId=${data}`); - expect(data > 0).assertTrue(); - done(); - }).catch(error => { - expect().assertFail(); - console.log("Telephony_DataStorage_InsetIntoPdpProfile_Async_0100 failed"); - done(); - }); - }) - - /* - * @tc.number Telephony_DataStorage_PdpProfile_Query_Async_0100 - * @tc.name query from pdpProfile database - * @tc.desc Function test - */ - it("Telephony_DataStorage_PdpProfile_Query_Async_0100", 0, async function (done) { - let condition = new ohosDataAbility.DataAbilityPredicates(); - let resultColumns = [ - "profile_name", - "mcc", - "mnc", - ]; - condition.equalTo("profile_name", "test_profile_name"); - dataAbilityHelper.query(pdpProfileFullUri, resultColumns, condition).then(resultSet => { - let pdpProfiles = []; - console.log("Telephony_DataStorage_PdpProfile_Query_Async_0100 resultSet: " - + JSON.stringify(resultSet)); - while (resultSet.goToNextRow()) { - let pdpProfile = {}; - pdpProfile.profile_Name = resultSet.getString(0); - pdpProfile.mcc = resultSet.getString(1); - pdpProfile.mnc = resultSet.getString(2); - pdpProfiles.push(pdpProfile); - } - console.log("Telephony_DataStorage_PdpProfile_Query_Async_0100 pdpProfiles: " - + JSON.stringify(pdpProfiles)); - expect(pdpProfiles.length >= 1).assertTrue(); - done(); - }).catch(error => { - expect().assertFail(); - console.log("Telephony_DataStorage_PdpProfile_Query_Async_0100 failed"); - done(); - }); - }) - - /* - * @tc.number Telephony_DataStorage_PdpProfile_Update_Async_0100 - * @tc.name update test data of pdpProfile database - * @tc.desc Function test - */ - it("Telephony_DataStorage_PdpProfile_Update_Async_0100", 0, async function (done) { - var condition = new ohosDataAbility.DataAbilityPredicates(); - condition.equalTo("profile_name", "test_profile_name"); - var stringValue = { - 'mcc': "461", - 'mnc': "92", - }; - dataAbilityHelper.update(pdpProfileFullUri, stringValue, condition).then(data => { - console.log("Telephony_DataStorage_PdpProfile_Update_Async_0100: update success data: " - + JSON.stringify(data)); - expect(data === 0).assertTrue(); - done(); - }).catch(error => { - expect().assertFail(); - console.log("Telephony_DataStorage_PdpProfile_Update_Async_0100 failed"); - done(); - }); - }) - - /* - * @tc.number Telephony_DataStorage_PdpProfile_Delete_Async_0100 - * @tc.name delete test data from pdpProfile database - * @tc.desc Function test - */ - it("Telephony_DataStorage_PdpProfile_Delete_Async_0100", 0, async function (done) { - var condition = new ohosDataAbility.DataAbilityPredicates(); - condition.equalTo("profile_name", "test_profile_name"); - dataAbilityHelper.delete(pdpProfileFullUri, condition).then(data => { - console.log("Telephony_DataStorage_PdpProfile_Delete_Async_0100: delete success data: " - + JSON.stringify(data)); - expect(data === 0).assertTrue(); - done(); - }).catch(error => { - expect().assertFail(); - console.log("Telephony_DataStorage_PdpProfile_Update_Async_0100 failed"); - done(); - }); - }) - }) -} diff --git a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/resources/base/element/string.json b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/resources/base/element/string.json deleted file mode 100644 index d51fd51ba91957ec1c986cfd99d00655c80c65fc..0000000000000000000000000000000000000000 --- a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/resources/base/element/string.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "Sim Test" - }, - { - "name": "mainability_description", - "value": "Sim Test - sim manager interface 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/cellular_data/src/main/resources/base/media/icon.png b/telephony/telephonyjstest/telephony_base/cellular_data/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/telephony/telephonyjstest/telephony_base/cellular_data/src/main/resources/base/media/icon.png and /dev/null differ