diff --git a/multimodalinput/input_js_standard/src/main/js/default/test/InputConsumer.test.js b/multimodalinput/input_js_standard/src/main/js/default/test/InputConsumer.test.js deleted file mode 100755 index ac9bcaaafb788e512748df37da8dc9f8c36953aa..0000000000000000000000000000000000000000 --- a/multimodalinput/input_js_standard/src/main/js/default/test/InputConsumer.test.js +++ /dev/null @@ -1,48 +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 inputConsumer from '@ohos.multimodalInput.inputConsumer' -import { - describe, - beforeAll, - beforeEach, - afterEach, - afterAll, - it, - expect -} from 'deccjsunit/index' - -describe('MultimodalInputConsumer_test', function () { - it('inputDevice::inputConsumer_test01', 0, async function () { - function callback(error, data) { - if (error) { - console.log(`inputDevice::inputConsumer_test01 Error` + error); - expect(false).assertTrue(); - done(); - } else { - console.log(`inputDevice::inputConsumer_test01 Success` + data); - expect(data).assertInstanceOf(inputConsumer.KeyOptions); - done(); - } - } - console.log(`inputDevice::inputConsumer_test01 enter`); - inputConsumer.on('key', { preKeys: [2072], finalKey: 2019, isFinalKeyDown: false, finalKeyDownDuration: 0 }, - callback); - done(); - inputConsumer.off('key', { preKeys: [2072], finalKey: 2019, isFinalKeyDown: false, finalKeyDownDuration: 0, }, - callback); - done(); - }) -}) diff --git a/powermgr/BUILD.gn b/powermgr/BUILD.gn index 54074eddd1b957a73002202f128a5ba63b0377b3..d328d4e575402f1a43ea19a00fbd757597cde038 100755 --- a/powermgr/BUILD.gn +++ b/powermgr/BUILD.gn @@ -17,7 +17,6 @@ group("powermgr") { if (is_standard_system) { deps = [ "powermgrbattery_rk3568:powermgr_battery_test_rk3568", - "powermgrbatterystats:powermgr_batterystats_test", "powermgrthermal:powermgr_thermal_test", ] } @@ -25,7 +24,6 @@ group("powermgr") { if (is_standard_system) { deps = [ "powermgrbattery:powermgr_battery_test", - "powermgrbatterystats:powermgr_batterystats_test", "powermgrthermal:powermgr_thermal_test", ] } diff --git a/powermgr/powermgrbattery/src/main/js/default/test/power_manager_running_lock_dev.test.js b/powermgr/powermgrbattery/src/main/js/default/test/power_manager_running_lock_dev.test.js index fb51ce59d063885507de75bc5e2c52d3368d2b48..b65aec22df22116b341dc8e5df3fe2d3a81d10d7 100755 --- a/powermgr/powermgrbattery/src/main/js/default/test/power_manager_running_lock_dev.test.js +++ b/powermgr/powermgrbattery/src/main/js/default/test/power_manager_running_lock_dev.test.js @@ -27,8 +27,4 @@ describe('appInfoTest', function () { power.rebootDevice("power_js_test_reboot"); console.info('power_reboot_device_test success'); }) - it('power_shutdown_device_test', 0, function () {//shutdownDevice(reason: string): void - power.shutdownDevice("power_js_test_shutdown"); - console.info('power_shutdown_device_test success'); - }) }) diff --git a/powermgr/powermgrbatterystats/BUILD.gn b/powermgr/powermgrbatterystats/BUILD.gn deleted file mode 100755 index e8ad81e6da40da39e68f9c35986e46465c0f35db..0000000000000000000000000000000000000000 --- a/powermgr/powermgrbatterystats/BUILD.gn +++ /dev/null @@ -1,31 +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("//test/xts/tools/build/suite.gni") - -ohos_js_hap_suite("powermgr_batterystats_test") { - hap_profile = "./src/main/config.json" - deps = [ - ":powermgr_batterystats_js_assets", - ":powermgr_batterystats_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsPowerMgrBatterystatsTest" -} -ohos_js_assets("powermgr_batterystats_js_assets") { - source_dir = "./src/main/js/default" -} -ohos_resources("powermgr_batterystats_resources") { - sources = [ "./src/main/resources" ] - hap_profile = "./src/main/config.json" -} diff --git a/powermgr/powermgrbatterystats/Test.json b/powermgr/powermgrbatterystats/Test.json deleted file mode 100755 index 4e6bd50d30757715fc38f79e5a3b6b1e67c08abc..0000000000000000000000000000000000000000 --- a/powermgr/powermgrbatterystats/Test.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "description": "Configuration for powermgr batterystats Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "60000", - "package": "com.example.mybatterystatsapp", - "shell-timeout": "60000" - }, - "kits": [ - { - "test-file-name": [ - "ActsPowerMgrBatterystatsTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} - diff --git a/powermgr/powermgrbatterystats/signature/openharmony_sx.p7b b/powermgr/powermgrbatterystats/signature/openharmony_sx.p7b deleted file mode 100755 index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..0000000000000000000000000000000000000000 Binary files a/powermgr/powermgrbatterystats/signature/openharmony_sx.p7b and /dev/null differ diff --git a/powermgr/powermgrbatterystats/src/main/config.json b/powermgr/powermgrbatterystats/src/main/config.json deleted file mode 100755 index f09b8517ddd75def17d104809fef1be4ee1f22ce..0000000000000000000000000000000000000000 --- a/powermgr/powermgrbatterystats/src/main/config.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "app": { - "bundleName": "com.example.mybatterystatsapp", - "vendor": "example", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.mybatterystatsapp", - "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.example.mybatterystatsapp.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 - } - } - ] - } -} diff --git a/powermgr/powermgrbatterystats/src/main/js/default/app.js b/powermgr/powermgrbatterystats/src/main/js/default/app.js deleted file mode 100755 index 7726f03d9bbb38d87d4397fb60c4fb63d8d57ede..0000000000000000000000000000000000000000 --- a/powermgr/powermgrbatterystats/src/main/js/default/app.js +++ /dev/null @@ -1,24 +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 device from '@system.device'; - -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; diff --git a/powermgr/powermgrbatterystats/src/main/js/default/i18n/en-US.json b/powermgr/powermgrbatterystats/src/main/js/default/i18n/en-US.json deleted file mode 100755 index a4c13dcbdc39c537073f638393d7726ac9a5cdc4..0000000000000000000000000000000000000000 --- a/powermgr/powermgrbatterystats/src/main/js/default/i18n/en-US.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - } -} \ No newline at end of file diff --git a/powermgr/powermgrbatterystats/src/main/js/default/i18n/zh-CN.json b/powermgr/powermgrbatterystats/src/main/js/default/i18n/zh-CN.json deleted file mode 100755 index b1c02368f72f929e4375a43170444de95dcc5984..0000000000000000000000000000000000000000 --- a/powermgr/powermgrbatterystats/src/main/js/default/i18n/zh-CN.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - } -} \ No newline at end of file diff --git a/powermgr/powermgrbatterystats/src/main/js/default/pages/index/index.css b/powermgr/powermgrbatterystats/src/main/js/default/pages/index/index.css deleted file mode 100755 index cff50023ce54b7fbbbae9ecd72ab5a49e0b50291..0000000000000000000000000000000000000000 --- a/powermgr/powermgrbatterystats/src/main/js/default/pages/index/index.css +++ /dev/null @@ -1,24 +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. - */ - -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 100px; -} diff --git a/powermgr/powermgrbatterystats/src/main/js/default/pages/index/index.hml b/powermgr/powermgrbatterystats/src/main/js/default/pages/index/index.hml deleted file mode 100755 index 936e04ebdb33a919d0ce918652dac1da8bb6ec92..0000000000000000000000000000000000000000 --- a/powermgr/powermgrbatterystats/src/main/js/default/pages/index/index.hml +++ /dev/null @@ -1,20 +0,0 @@ - - -
- - {{ $t('strings.hello') }} {{ title }} - -
diff --git a/powermgr/powermgrbatterystats/src/main/js/default/pages/index/index.js b/powermgr/powermgrbatterystats/src/main/js/default/pages/index/index.js deleted file mode 100755 index a69afb42c6948ec9537bfc3c504f8b9f22eb2621..0000000000000000000000000000000000000000 --- a/powermgr/powermgrbatterystats/src/main/js/default/pages/index/index.js +++ /dev/null @@ -1,43 +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 app from '@system.app' - -import {Core, ExpectExtend} from 'deccjsunit/index' - -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 diff --git a/powermgr/powermgrbatterystats/src/main/js/default/test/List.test.js b/powermgr/powermgrbatterystats/src/main/js/default/test/List.test.js deleted file mode 100755 index 70dd56dd531774c5ac9ae34245b06c39b9ec32a3..0000000000000000000000000000000000000000 --- a/powermgr/powermgrbatterystats/src/main/js/default/test/List.test.js +++ /dev/null @@ -1,15 +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. - */ -require('./batterystats_uint.test.js') \ No newline at end of file diff --git a/powermgr/powermgrbatterystats/src/main/js/default/test/batterystats_uint.test.js b/powermgr/powermgrbatterystats/src/main/js/default/test/batterystats_uint.test.js deleted file mode 100755 index 36ecab22806ba8e150f3aa9ead76b39208e9fe4d..0000000000000000000000000000000000000000 --- a/powermgr/powermgrbatterystats/src/main/js/default/test/batterystats_uint.test.js +++ /dev/null @@ -1,405 +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 app from '@system.app' -import batteryStats from "@ohos.batteryStatistics" -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' - -let ConsumptionType = { - CONSUMPTION_TYPE_INVALID: -17, - CONSUMPTION_TYPE_APP: -16, - CONSUMPTION_TYPE_BLUETOOTH: -15, - CONSUMPTION_TYPE_IDLE: -14, - CONSUMPTION_TYPE_PHONE: -13, - CONSUMPTION_TYPE_RADIO: -12, - CONSUMPTION_TYPE_SCREEN: -11, - CONSUMPTION_TYPE_USER: -10, - CONSUMPTION_TYPE_WIFI: -9, -} - -describe('appInfoTest', function () { - console.log("*************batteryStats API Test Begin*************"); - - /** - /* @tc.number batteryStats_js_001 - * @tc.name batteryStats_001 - * @tc.desc batteryStats getBatteryStats Interface Test type = ConsumptionType.CONSUMPTION_TYPE_BLUETOOTH - */ - it('batteryStats_001', 0, async function (done) { - let infoList; - let promise = batteryStats.getBatteryStats().then(function (value) { - infoList = value; - console.info("Executing"); - }, function (msg) { - console.info("Promise error:" + msg); - }); - await promise; - console.info("Waiting"); - let found = false; - for (let i = 0; i < infoList.length; i++) { - if (infoList[i].type == ConsumptionType.CONSUMPTION_TYPE_BLUETOOTH) { - expect(infoList[i].uid).assertEqual(-1); - console.info("Found Bluetooth consumption"); - found = true; - } - } - done(); - expect(found).assertTrue(); - }) - - /** - /* @tc.number batteryStats_js_002 - * @tc.name batteryStats_002 - * @tc.desc batteryStats getBatteryStats Interface Test type = ConsumptionType.CONSUMPTION_TYPE_IDLE - */ - it('batteryStats_002', 0, async function (done) { - let infoList; - let promise = batteryStats.getBatteryStats().then(function (value) { - infoList = value; - console.info("Executing"); - }, function (msg) { - console.info("Promise error:" + msg); - }); - await promise; - console.info("Waiting"); - let found = false; - for (let i = 0; i < infoList.length; i++) { - if (infoList[i].type == ConsumptionType.CONSUMPTION_TYPE_IDLE) { - expect(infoList[i].uid).assertEqual(-1); - console.info("Found Idle consumption"); - found = true; - } - } - done(); - expect(found).assertTrue(); - }) - - /** - /* @tc.number batteryStats_js_003 - * @tc.name batteryStats_003 - * @tc.desc batteryStats getBatteryStats Interface Test type = ConsumptionType.CONSUMPTION_TYPE_PHONE - */ - it('batteryStats_003', 0, async function (done) { - let infoList; - let promise = batteryStats.getBatteryStats().then(function (value) { - infoList = value; - console.info("Executing"); - }, function (msg) { - console.info("Promise error:" + msg); - }); - await promise; - console.info("Waiting"); - let found = false; - for (let i = 0; i < infoList.length; i++) { - if (infoList[i].type == ConsumptionType.CONSUMPTION_TYPE_PHONE) { - expect(infoList[i].uid).assertEqual(-1); - console.info("Found Phone consumption"); - found = true; - } - } - done(); - expect(found).assertTrue(); - }) - - /** - /* @tc.number batteryStats_js_004 - * @tc.name batteryStats_004 - * @tc.desc batteryStats getBatteryStats Interface Test type = ConsumptionType.CONSUMPTION_TYPE_RADIO - */ - it('batteryStats_004', 0, async function (done) { - let infoList; - let promise = batteryStats.getBatteryStats().then(function (value) { - infoList = value; - console.info("Executing"); - }, function (msg) { - console.info("Promise error:" + msg); - }); - await promise; - console.info("Waiting"); - let found = false; - for (let i = 0; i < infoList.length; i++) { - if (infoList[i].type == ConsumptionType.CONSUMPTION_TYPE_RADIO) { - expect(infoList[i].uid).assertEqual(-1); - console.info("Found Radio consumption"); - found = true; - } - } - done(); - expect(found).assertTrue(); - }) - - /** - /* @tc.number batteryStats_js_005 - * @tc.name batteryStats_005 - * @tc.desc batteryStats getBatteryStats Interface Test type = ConsumptionType.CONSUMPTION_TYPE_SCREEN - */ - it('batteryStats_005', 0, async function (done) { - let infoList; - let promise = batteryStats.getBatteryStats().then(function (value) { - infoList = value; - console.info("Executing"); - }, function (msg) { - console.info("Promise error:" + msg); - }); - await promise; - console.info("Waiting"); - let found = false; - for (let i = 0; i < infoList.length; i++) { - if (infoList[i].type == ConsumptionType.CONSUMPTION_TYPE_SCREEN) { - expect(infoList[i].uid).assertEqual(-1); - console.info("Found Screen consumption"); - found = true; - } - } - done(); - expect(found).assertTrue(); - }) - - /* @tc.number batteryStats_js_006 - * @tc.name batteryStats_006 - * @tc.desc batteryStats getAppPowerValue Interface Test uid = 111 - */ - it('batteryStats_006', 0, function () { - let power = batteryStats.getAppPowerValue(111); - console.info("App consumption power of uid 111 is: " + power); - expect(power >= 0).assertTrue(); - }) - - /* @tc.number batteryStats_js_007 - * @tc.name batteryStats_007 - * @tc.desc batteryStats getAppPowerValue Interface Test uid = -111 - */ - it('batteryStats_007', 0, function () { - let power = batteryStats.getAppPowerValue(-111); - console.info("App consumption power of uid -111 is: " + power); - expect(power).assertEqual(0); - }) - - /* @tc.number batteryStats_js_008 - * @tc.name batteryStats_008 - * @tc.desc batteryStats getAppPowerValue Interface Test uid = 0 - */ - it('batteryStats_008', 0, function () { - let power = batteryStats.getAppPowerValue(0); - console.info("App consumption power of uid 0 is: " + power); - expect(power >= 0).assertTrue(); - }) - - /* @tc.number batteryStats_js_009 - * @tc.name batteryStats_009 - * @tc.desc batteryStats getAppPowerValue Interface Test uid = "111" - */ - it('batteryStats_009', 0, function () { - try { - batteryStats.getAppPowerValue("111"); - } catch (e) { - let errorMsg = "Argument type check works: " + e; - console.debug("errorMsg"); - expect(errorMsg.includes("Wrong argument type")).assertTrue(); - } - }) - - /* @tc.number batteryStats_js_010 - * @tc.name batteryStats_010 - * @tc.desc batteryStats getAppPowerValue Interface Test uid = 111, 222 - */ - it('batteryStats_010', 0, function () { - try { - batteryStats.getAppPowerValue(111, 222); - } catch (e) { - let errorMsg = "Argument number check works: " + e; - console.debug(errorMsg); - expect(errorMsg.includes("Wrong number of arguments")).assertTrue(); - } - }) - - /* @tc.number batteryStats_js_011 - * @tc.name batteryStats_011 - * @tc.desc batteryStats getAppPowerPercent Interface Test uid = 111 - */ - it('batteryStats_011', 0, function () { - let powerPercent = batteryStats.getAppPowerPercent(111); - console.info("App consumption percent of uid 111 is: " + powerPercent); - expect(powerPercent >= 0).assertTrue(); - }) - - /* @tc.number batteryStats_js_012 - * @tc.name batteryStats_012 - * @tc.desc batteryStats getAppPowerPercent Interface Test uid = -111 - */ - it('batteryStats_012', 0, function () { - let powerPercent = batteryStats.getAppPowerPercent(-111); - console.info("App consumption percent of uid -111 is: " + powerPercent); - expect(powerPercent).assertEqual(0); - }) - - /* @tc.number batteryStats_js_013 - * @tc.name batteryStats_013 - * @tc.desc batteryStats getAppPowerPercent Interface Test uid = 0 - */ - it('batteryStats_013', 0, function () { - let powerPercent = batteryStats.getAppPowerPercent(0); - console.info("App consumption percent of uid 0 is: " + powerPercent); - expect(powerPercent >= 0).assertTrue(); - }) - - /* @tc.number batteryStats_js_014 - * @tc.name batteryStats_014 - * @tc.desc batteryStats getAppPowerPercent Interface Test uid = "111" - */ - it('batteryStats_014', 0, function () { - try { - batteryStats.getAppPowerPercent("111"); - } catch (e) { - let errorMsg = "Argument type check works: " + e; - console.debug("errorMsg"); - expect(errorMsg.includes("Wrong argument type")).assertTrue(); - } - }) - - /* @tc.number batteryStats_js_015 - * @tc.name batteryStats_015 - * @tc.desc batteryStats getAppPowerPercent Interface Test uid = 111, 222 - */ - it('batteryStats_015', 0, function () { - try { - batteryStats.getAppPowerPercent(111, 222); - } catch (e) { - let errorMsg = "Argument number check works: " + e; - console.debug(errorMsg); - expect(errorMsg.includes("Wrong number of arguments")).assertTrue(); - } - }) - - /* @tc.number batteryStats_js_016 - * @tc.name batteryStats_016 - * @tc.desc batteryStats getHardwareUnitPowerValue Interface Test type = ConsumptionType.CONSUMPTION_TYPE_IDLE - */ - it('batteryStats_016', 0, function () { - let power = batteryStats.getHardwareUnitPowerValue(ConsumptionType.CONSUMPTION_TYPE_IDLE); - console.info("Idle consumption power is: " + power); - expect(power >= 0).assertTrue(); - }) - - /* @tc.number batteryStats_js_017 - * @tc.name batteryStats_017 - * @tc.desc batteryStats getHardwareUnitPowerValue Interface Test type = 111 - */ - it('batteryStats_017', 0, function () { - let power = batteryStats.getHardwareUnitPowerValue(111); - console.info("111's consumption power is: " + power); - expect(power).assertEqual(0); - }) - - /* @tc.number batteryStats_js_018 - * @tc.name batteryStats_018 - * @tc.desc batteryStats getHardwareUnitPowerValue Interface Test type = 0 - */ - it('batteryStats_018', 0, function () { - let power = batteryStats.getHardwareUnitPowerValue(0); - console.info("0's consumption power is: " + power); - expect(power).assertEqual(0); - }) - - /* @tc.number batteryStats_js_019 - * @tc.name batteryStats_019 - * @tc.desc batteryStats getHardwareUnitPowerValue Interface Test type = "test" - */ - it('batteryStats_019', 0, function () { - try { - batteryStats.getHardwareUnitPowerValue("test"); - } catch (e) { - let errorMsg = "Argument type check works: " + e; - console.debug("errorMsg"); - expect(errorMsg.includes("Wrong argument type")).assertTrue(); - } - }) - - /* @tc.number batteryStats_js_020 - * @tc.name batteryStats_020 - * @tc.desc batteryStats getHardwareUnitPowerValue Interface Test type = ConsumptionType.CONSUMPTION_TYPE_IDLE - * and ConsumptionType.CONSUMPTION_TYPE_WIFI - */ - it('batteryStats_020', 0, function () { - try { - batteryStats.getHardwareUnitPowerValue(ConsumptionType.CONSUMPTION_TYPE_IDLE, - ConsumptionType.CONSUMPTION_TYPE_WIFI); - } catch (e) { - let errorMsg = "Argument number check works: " + e; - console.debug(errorMsg); - expect(errorMsg.includes("Wrong number of arguments")).assertTrue(); - } - }) - - /* @tc.number batteryStats_js_021 - * @tc.name batteryStats_021 - * @tc.desc batteryStats getHardwareUnitPowerPercent Interface Test type = ConsumptionType.CONSUMPTION_TYPE_IDLE - */ - it('batteryStats_021', 0, function () { - let powerPercent = batteryStats.getHardwareUnitPowerPercent(ConsumptionType.CONSUMPTION_TYPE_IDLE); - console.info("Idle consumption percent is: " + powerPercent); - expect(powerPercent >= 0).assertTrue(); - }) - - /* @tc.number batteryStats_js_022 - * @tc.name batteryStats_022 - * @tc.desc batteryStats getHardwareUnitPowerPercent Interface Test type = 111 - */ - it('batteryStats_022', 0, function () { - let powerPercent = batteryStats.getHardwareUnitPowerPercent(111); - console.info("111's consumption percent is: " + powerPercent); - expect(powerPercent).assertEqual(0); - }) - - /* @tc.number batteryStats_js_023 - * @tc.name batteryStats_023 - * @tc.desc batteryStats getHardwareUnitPowerPercent Interface Test type = 0 - */ - it('batteryStats_023', 0, function () { - let powerPercent = batteryStats.getHardwareUnitPowerPercent(0); - console.info("0's consumption percent is: " + powerPercent); - expect(powerPercent).assertEqual(0); - }) - - /* @tc.number batteryStats_js_024 - * @tc.name batteryStats_024 - * @tc.desc batteryStats getHardwareUnitPowerPercent Interface Test type = "test" - */ - it('batteryStats_024', 0, function () { - try { - batteryStats.getHardwareUnitPowerPercent("test"); - } catch (e) { - let errorMsg = "Argument type check works: " + e; - console.debug("errorMsg"); - expect(errorMsg.includes("Wrong argument type")).assertTrue(); - } - }) - - /* @tc.number batteryStats_js_025 - * @tc.name batteryStats_025 - * @tc.desc batteryStats getHardwareUnitPowerPercent Interface Test type = ConsumptionType.CONSUMPTION_TYPE_IDLE - * and ConsumptionType.CONSUMPTION_TYPE_WIFI - */ - it('batteryStats_025', 0, function () { - try { - batteryStats.getHardwareUnitPowerPercent(ConsumptionType.CONSUMPTION_TYPE_IDLE, - ConsumptionType.CONSUMPTION_TYPE_WIFI); - } catch (e) { - let errorMsg = "Argument number check works: " + e; - console.debug(errorMsg); - expect(errorMsg.includes("Wrong number of arguments")).assertTrue(); - } - }) -}) \ No newline at end of file diff --git a/powermgr/powermgrbatterystats/src/main/resources/base/element/string.json b/powermgr/powermgrbatterystats/src/main/resources/base/element/string.json deleted file mode 100755 index c2b9320278e56b4b76db4a71ad6b22c4840ad0ed..0000000000000000000000000000000000000000 --- a/powermgr/powermgrbatterystats/src/main/resources/base/element/string.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "MyBatterystatsApp" - }, - { - "name": "mainability_description", - "value": "JS_Phone_Empty Feature Ability" - } - ] -} \ No newline at end of file diff --git a/powermgr/powermgrbatterystats/src/main/resources/base/media/icon.png b/powermgr/powermgrbatterystats/src/main/resources/base/media/icon.png deleted file mode 100755 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/powermgr/powermgrbatterystats/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/sensors/sensor_standard/src/main/js/default/test/SensorGeneralalgorithm.test.js b/sensors/sensor_standard/src/main/js/default/test/SensorGeneralalgorithm.test.js index 7e0eb18170e5d0fe913ea952fa362bdcb203851f..254fa78455b7e473b656fd9c5343fd9c8d5f7801 100755 --- a/sensors/sensor_standard/src/main/js/default/test/SensorGeneralalgorithm.test.js +++ b/sensors/sensor_standard/src/main/js/default/test/SensorGeneralalgorithm.test.js @@ -120,8 +120,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_068 * @tc.desc: Verification results of the incorrect parameters of the test interface. - * @tc.require: AR000GH2RV - * @tc.author: */ it('SensorJsTest_068', 0, async function (done) { sensor.createRotationMatrix(gravity[0], geomagnetic[0], (error, data) => { @@ -141,8 +139,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_069 * @tc.desc: Verification results of the incorrect parameters of the test interface. - * @tc.require: AR000GH2RV - * @tc.author: */ it('SensorJsTest_069', 0, async function (done) { @@ -163,8 +159,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_070 * @tc.desc: Verification results of the incorrect parameters of the test interface. - * @tc.require: AR000GH2RV - * @tc.author: */ it('SensorJsTest_070', 0, async function (done) { sensor.getDirection(rotationMatrix[0], (error, data) => { @@ -186,8 +180,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_071 * @tc.desc: Verification results of the incorrect parameters of the test interface. - * @tc.require: AR000GH2RV - * @tc.author: */ it('SensorJsTest_071', 0, async function (done) { sensor.getDirection(rotationMatrix[1], function (error, data) { @@ -209,8 +201,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_072 * @tc.desc: Verification results of the incorrect parameters of the test interface. - * @tc.require: AR000GH2RV - * @tc.author: */ it('SensorJsTest_072', 0, async function (done) { sensor.createRotationMatrix(gravity[0], geomagnetic[0]).then((data) => { @@ -228,8 +218,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_073 * @tc.desc: Verification results of the incorrect parameters of the test interface. - * @tc.require: AR000GH2RV - * @tc.author: */ it('SensorJsTest_073', 0, async function (done) { sensor.createRotationMatrix(gravity[1], geomagnetic[1]).then((data) => { @@ -247,8 +235,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_074 * @tc.desc: Verification results of the incorrect parameters of the test interface. - * @tc.require: AR000GH2RV - * @tc.author: */ it('SensorJsTest_074', 0, async function (done) { sensor.createRotationMatrix(gravity[2], geomagnetic[2]).then((data) => { @@ -266,8 +252,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_075 * @tc.desc: Verification results of the incorrect parameters of the test interface. - * @tc.require: AR000GH2RN - * @tc.author: */ it('SensorJsTest_075', 0, async function (done) { sensor.getDirection(rotationMatrix[0]).then((data) => { @@ -287,8 +271,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_076 * @tc.desc: Verification results of the incorrect parameters of the test interface. - * @tc.require: AR000GH2RN - * @tc.author: */ it('SensorJsTest_076', 0, async function (done) { sensor.getDirection(rotationMatrix[1]).then((data) => { @@ -308,8 +290,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_077 * @tc.desc: Verification results of the incorrect parameters of the test interface. - * @tc.require: AR000GH2RN - * @tc.author: */ it('SensorJsTest_077', 0, async function (done) { sensor.getDirection([1, 2, 3, 1, 2, 3, 1, 2, 3, 0]).then((data) => { @@ -337,8 +317,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_078 * @tc.desc: - * @tc.require: AR000GH2SL - * @tc.author: */ it('SensorJsTest_078', 0, async function (done) { console.info("SensorJsAPI--->SensorJsTest_078"); @@ -363,8 +341,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_079 * @tc.desc: - * @tc.require: AR000GH2SL - * @tc.author: */ it('SensorJsTest_079', 0, async function (done) { console.info("SensorJsAPI--->SensorJsTest_079"); @@ -393,8 +369,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_080 * @tc.desc: - * @tc.require: AR000GH2SL - * @tc.author: */ it('SensorJsTest_080', 0, async function (done) { console.info("SensorJsAPI--->SensorJsTest_080"); @@ -423,8 +397,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_081 * @tc.desc: - * @tc.require: AR000GH2SL - * @tc.author: */ it('SensorJsTest_081', 0, async function (done) { console.info("SensorJsAPI--->SensorJsTest_081"); @@ -453,8 +425,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_082 * @tc.desc: - * @tc.require: AR000GH2SL - * @tc.author: */ it('SensorJsTest_082', 0, async function (done) { console.info("SensorJsAPI--->SensorJsTest_082"); @@ -480,8 +450,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_083 * @tc.desc: - * @tc.require: AR000GH2SL - * @tc.author: */ it('SensorJsTest_083', 0, async function (done) { console.info("SensorJsAPI--->SensorJsTest_083"); @@ -505,8 +473,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_084 * @tc.desc: - * @tc.require: AR000GH2SL - * @tc.author: */ it('SensorJsTest_084', 0, async function (done) { console.info("SensorJsAPI--->SensorJsTest_084"); @@ -533,8 +499,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_085 * @tc.desc: - * @tc.require: AR000GH2SL - * @tc.author: */ it('SensorJsTest_085', 0, async function (done) { console.info("SensorJsAPI--->SensorJsTest_085"); @@ -561,8 +525,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_086 * @tc.desc: - * @tc.require: AR000GH2SL - * @tc.author: */ it('SensorJsTest_086', 0, async function (done) { console.info("SensorJsAPI--->SensorJsTest_076"); @@ -589,8 +551,6 @@ describe("SensorJsTest", function () { * * @tc.name: SensorJsTest_087 * @tc.desc: - * @tc.require: AR000GH2SL - * @tc.author: */ it('SensorJsTest_087', 0, async function (done) { console.info("SensorJsAPI--->SensorJsTest_087"); @@ -621,8 +581,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_088 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2RP - * @tc.author: */ it('SensorJsTest_088', 0, async function (done) { console.info('SensorJsTest_088 start') @@ -644,8 +602,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_089 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2RP - * @tc.author: */ it('SensorJsTest_089', 0, async function (done) { console.info('SensorJsTest_089 start') @@ -666,8 +622,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_090 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2RP - * @tc.author: */ it('SensorJsTest_090', 0, async function (done) { console.info('SensorJsTest_090 start') @@ -689,8 +643,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_091 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2RP - * @tc.author: */ it('SensorJsTest_091', 0, async function (done) { console.info('SensorJsTest_091 start') @@ -712,8 +664,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_092 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2RP - * @tc.author: */ it('SensorJsTest_092', 0, async function (done) { console.info('SensorJsTest_092 start') @@ -732,8 +682,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_093 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2RP - * @tc.author: */ it('SensorJsTest_093', 0, async function (done) { console.info('SensorJsTest_093 start') @@ -755,8 +703,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_094 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2RP - * @tc.author: */ it('SensorJsTest_094', 0, async function (done) { console.info('SensorJsTest_094 start') @@ -775,8 +721,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_095 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2RP - * @tc.author: */ it('SensorJsTest_095', 0, async function (done) { console.info('SensorJsTest_095 start') @@ -798,8 +742,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_096 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2RP - * @tc.author: */ it('SensorJsTest_096', 0, async function (done) { console.info('SensorJsTest_096 start') @@ -820,8 +762,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_097 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2RP - * @tc.author: */ it('SensorJsTest_097', 0, async function (done) { console.info('SensorJsTest_097 start') @@ -845,8 +785,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_098 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2RV - * @tc.author: */ it('SensorJsTest_098', 0, async function (done) { console.info("SensorJsTest_098 start"); @@ -869,8 +807,6 @@ describe("SensorJsTest", function () { /* * tc.name: SensorJsTest_099 * tc.desc: Verfication results of the incorrect parameters of test interface. - * tc.require: SR000GH2A2 - * @tc.author: */ it('SensorJsTest_099', 0, async function (done) { console.info('SensorJsTest_099 start') @@ -891,8 +827,6 @@ describe("SensorJsTest", function () { /* * tc.name: SensorJsTest_100 * tc.desc: Verfication results of the incorrect parameters of test interface. - * tc.require: AR000GH2RV - * @tc.author: */ it('SensorJsTest_100', 0, async function (done) { console.info('SensorJsTest_100 start') @@ -915,8 +849,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_101 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2OG - * @tc.author: */ it('SensorJsTest_101', 0, async function (done) { console.info('SensorJsTest_101 start') @@ -937,8 +869,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_102 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2OG - * @tc.author: */ it('SensorJsTest_102', 0, async function (done) { console.info('SensorJsTest_102 start') @@ -958,8 +888,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_103 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2OG - * @tc.author: */ it('SensorJsTest_103', 0, async function (done) { console.info('SensorJsTest_103 start') @@ -979,8 +907,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_104 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2OG - * @tc.author: */ it('SensorJsTest_104', 0, async function (done) { console.info('SensorJsTest_104 start') @@ -1000,8 +926,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_105 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2OG - * @tc.author: */ it('SensorJsTest_105', 0, async function (done) { sensor.getAltitude(0, 100).then((data) => { @@ -1018,8 +942,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_106 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2OG - * @tc.author: */ it('SensorJsTest_106', 0, async function (done) { sensor.getAltitude(5, 0).then((data) => { @@ -1046,8 +968,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_107 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2TR - * @tc.author: */ it('SensorJsTest_107', 0, async function (done) { console.info("---------------------------SensorJsTest_107----------------------------------"); @@ -1069,8 +989,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_108 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2TR - * @tc.author: */ it('SensorJsTest_108', 0, async function (done) { console.info("---------------------------SensorJsTest_108----------------------------------"); @@ -1090,8 +1008,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_109 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2TR - * @tc.author: */ it("SensorJsTest_109", 0, async function (done) { console.info("---------------------------SensorJsTest_109----------------------------------"); @@ -1114,8 +1030,6 @@ describe("SensorJsTest", function () { /* * @tc.name: SensorJsTest_110 * @tc.desc: Verfication results of the incorrect parameters of test interface. - * @tc.require: AR000GH2TR - * @tc.author: */ it("SensorJsTest_110", 0, async function (done) { console.info("---------------------------SensorJsTest_110----------------------------------");