From 102c72b4287dc59eaf8355b779f219ae1df20729 Mon Sep 17 00:00:00 2001 From: ShiJie Date: Fri, 10 Feb 2023 13:51:28 +0800 Subject: [PATCH] fix: update common event battery changed key Signed-off-by: ShiJie Change-Id: I48326c47e35a7c491bdee455ab838a068e23d11d --- .../main/js/test/battery_common_event.test.js | 6 +- .../src/main/js/test/battery_unit.test.js | 120 ++++++------------ 2 files changed, 42 insertions(+), 84 deletions(-) diff --git a/powermgr/battery_manager/src/main/js/test/battery_common_event.test.js b/powermgr/battery_manager/src/main/js/test/battery_common_event.test.js index 9f1db24bb..aeca7db91 100644 --- a/powermgr/battery_manager/src/main/js/test/battery_common_event.test.js +++ b/powermgr/battery_manager/src/main/js/test/battery_common_event.test.js @@ -13,6 +13,7 @@ * limitations under the License. */ import commonEvent from '@ohos.commonEvent'; +import batteryInfo from '@ohos.batteryInfo'; import { describe, it, expect } from '@ohos/hypium' export default function BatteryCommonEventTest() { @@ -7444,8 +7445,9 @@ function createBatteryChangedSubscriber() { console.info("commonEventData event: " + commonEventData.event); console.info("commonEventData bundleName: " + commonEventData.bundleName); console.info("commonEventData data: " + commonEventData.data); - console.info("commonEventData parameter: " + commonEventData.parameters[0]); - var capacity = commonEventData.parameters['0']; + let socKey = batteryInfo.CommonEventBatteryChangedKey.EXTRA_SOC; + console.info("commonEventData parameter: " + commonEventData.parameters[socKey]); + var capacity = commonEventData.parameters[socKey]; console.info("capacity is:" + capacity); expect(capacity >= 0 && capacity <= 100).assertTrue(); }); diff --git a/powermgr/battery_manager/src/main/js/test/battery_unit.test.js b/powermgr/battery_manager/src/main/js/test/battery_unit.test.js index 65b322961..46461a9f7 100644 --- a/powermgr/battery_manager/src/main/js/test/battery_unit.test.js +++ b/powermgr/battery_manager/src/main/js/test/battery_unit.test.js @@ -368,17 +368,6 @@ describe('BatteryUnitTest', function () { expect(batteryLevelState == 7).assertTrue(); }) - /** - * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1820 - * @tc.name remainingChargeTime_JSTest - * @tc.desc Battry Present Interface Test - */ - it('remainingChargeTime_JSTest', 0, function () { - let remainingChargeTime = batteryInfo.estimatedRemainingChargeTime; - console.info('remainingChargeTime = ' + remainingChargeTime); - expect(remainingChargeTime >= -1).assertTrue(); - }) - /** * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1830 * @tc.name CommonEventBatteryChangedCode_EXTRA_SOC_JSTest @@ -386,129 +375,96 @@ describe('BatteryUnitTest', function () { */ it('CommonEventBatteryChangedCode_EXTRA_SOC_JSTest', 0, function () { console.info('CommonEventBatteryChangedCode_EXTRA_SOC = ' - + batteryInfo.CommonEventBatteryChangedCode.EXTRA_SOC); - expect(batteryInfo.CommonEventBatteryChangedCode.EXTRA_SOC == 0).assertTrue(); + + batteryInfo.CommonEventBatteryChangedKey.EXTRA_SOC); + expect(batteryInfo.CommonEventBatteryChangedKey.EXTRA_SOC == 'soc').assertTrue(); }) /** - * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1840 - * @tc.name CommonEventBatteryChangedCode_EXTRA_VOLTAGE_JSTest + * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1940 + * @tc.name CommonEventBatteryChangedCode_EXTRA_CHARGE_STATE_JSTest * @tc.desc Battry Present Interface Test */ - it('CommonEventBatteryChangedCode_EXTRA_VOLTAGE_JSTest', 0, function () { - console.info('CommonEventBatteryChangedCode_EXTRA_VOLTAGE = ' - + batteryInfo.CommonEventBatteryChangedCode.EXTRA_VOLTAGE); - expect(batteryInfo.CommonEventBatteryChangedCode.EXTRA_VOLTAGE == 1).assertTrue(); + it('CommonEventBatteryChangedCode_EXTRA_CHARGE_STATE_JSTest', 0, function () { + console.info('CommonEventBatteryChangedCode_EXTRA_CHARGE_STATE = ' + + batteryInfo.CommonEventBatteryChangedKey.EXTRA_CHARGE_STATE); + expect(batteryInfo.CommonEventBatteryChangedKey.EXTRA_CHARGE_STATE == 'chargeState').assertTrue(); }) /** * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1850 - * @tc.name CommonEventBatteryChangedCode_EXTRA_TEMPERATURE_JSTest - * @tc.desc Battry Present Interface Test - */ - it('CommonEventBatteryChangedCode_EXTRA_TEMPERATURE_JSTest', 0, function () { - console.info('CommonEventBatteryChangedCode_EXTRA_TEMPERATURE = ' - + batteryInfo.CommonEventBatteryChangedCode.EXTRA_TEMPERATURE); - expect(batteryInfo.CommonEventBatteryChangedCode.EXTRA_TEMPERATURE == 2).assertTrue(); - }) - - /** - * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1860 * @tc.name CommonEventBatteryChangedCode_EXTRA_HEALTH_STATE_JSTest * @tc.desc Battry Present Interface Test */ it('CommonEventBatteryChangedCode_EXTRA_HEALTH_STATE_JSTest', 0, function () { console.info('CommonEventBatteryChangedCode_EXTRA_HEALTH_STATE = ' - + batteryInfo.CommonEventBatteryChangedCode.EXTRA_HEALTH_STATE); - expect(batteryInfo.CommonEventBatteryChangedCode.EXTRA_HEALTH_STATE == 3).assertTrue(); + + batteryInfo.CommonEventBatteryChangedKey.EXTRA_HEALTH_STATE); + expect(batteryInfo.CommonEventBatteryChangedKey.EXTRA_HEALTH_STATE == 'healthState').assertTrue(); }) /** - * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1870 + * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1860 * @tc.name CommonEventBatteryChangedCode_EXTRA_PLUGGED_TYPE_JSTest * @tc.desc Battry Present Interface Test */ it('CommonEventBatteryChangedCode_EXTRA_PLUGGED_TYPE_JSTest', 0, function () { console.info('CommonEventBatteryChangedCode_EXTRA_PLUGGED_TYPE = ' - + batteryInfo.CommonEventBatteryChangedCode.EXTRA_PLUGGED_TYPE); - expect(batteryInfo.CommonEventBatteryChangedCode.EXTRA_PLUGGED_TYPE == 4).assertTrue(); - }) - - /** - * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1880 - * @tc.name CommonEventBatteryChangedCode_EXTRA_MAX_CURRENT_JSTest - * @tc.desc Battry Present Interface Test - */ - it('CommonEventBatteryChangedCode_EXTRA_MAX_CURRENT_JSTest', 0, function () { - console.info('CommonEventBatteryChangedCode_EXTRA_MAX_CURRENT = ' - + batteryInfo.CommonEventBatteryChangedCode.EXTRA_MAX_CURRENT); - expect(batteryInfo.CommonEventBatteryChangedCode.EXTRA_MAX_CURRENT == 5).assertTrue(); + + batteryInfo.CommonEventBatteryChangedKey.EXTRA_PLUGGED_TYPE); + expect(batteryInfo.CommonEventBatteryChangedKey.EXTRA_PLUGGED_TYPE == 'pluggedType').assertTrue(); }) /** - * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1890 - * @tc.name CommonEventBatteryChangedCode_EXTRA_MAX_VOLTAGE_JSTest + * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1870 + * @tc.name CommonEventBatteryChangedCode_EXTRA_VOLTAGE_JSTest * @tc.desc Battry Present Interface Test */ - it('CommonEventBatteryChangedCode_EXTRA_MAX_VOLTAGE_JSTest', 0, function () { - console.info('CommonEventBatteryChangedCode_EXTRA_MAX_VOLTAGE = ' - + batteryInfo.CommonEventBatteryChangedCode.EXTRA_MAX_VOLTAGE); - expect(batteryInfo.CommonEventBatteryChangedCode.EXTRA_MAX_VOLTAGE == 6).assertTrue(); + it('CommonEventBatteryChangedCode_EXTRA_VOLTAGE_JSTest', 0, function () { + console.info('CommonEventBatteryChangedCode_EXTRA_VOLTAGE = ' + + batteryInfo.CommonEventBatteryChangedKey.EXTRA_VOLTAGE); + expect(batteryInfo.CommonEventBatteryChangedKey.EXTRA_VOLTAGE == 'voltage').assertTrue(); }) /** - * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1900 - * @tc.name CommonEventBatteryChangedCode_EXTRA_CHARGE_STATE_JSTest + * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1880 + * @tc.name CommonEventBatteryChangedCode_EXTRA_TECHNOLOGY_JSTest * @tc.desc Battry Present Interface Test */ - it('CommonEventBatteryChangedCode_EXTRA_CHARGE_STATE_JSTest', 0, function () { - console.info('CommonEventBatteryChangedCode_EXTRA_CHARGE_STATE = ' - + batteryInfo.CommonEventBatteryChangedCode.EXTRA_CHARGE_STATE); - expect(batteryInfo.CommonEventBatteryChangedCode.EXTRA_CHARGE_STATE == 7).assertTrue(); + it('CommonEventBatteryChangedCode_EXTRA_TECHNOLOGY_JSTest', 0, function () { + console.info('CommonEventBatteryChangedCode_EXTRA_TECHNOLOGY = ' + + batteryInfo.CommonEventBatteryChangedKey.EXTRA_TECHNOLOGY); + expect(batteryInfo.CommonEventBatteryChangedKey.EXTRA_TECHNOLOGY == 'technology').assertTrue(); }) /** - * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1910 - * @tc.name CommonEventBatteryChangedCode_EXTRA_CHARGE_COUNTER_JSTest + * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1890 + * @tc.name CommonEventBatteryChangedCode_EXTRA_TEMPERATURE_JSTest * @tc.desc Battry Present Interface Test */ - it('CommonEventBatteryChangedCode_EXTRA_CHARGE_COUNTER_JSTest', 0, function () { - console.info('CommonEventBatteryChangedCode_EXTRA_CHARGE_COUNTER = ' - + batteryInfo.CommonEventBatteryChangedCode.EXTRA_CHARGE_COUNTER); - expect(batteryInfo.CommonEventBatteryChangedCode.EXTRA_CHARGE_COUNTER == 8).assertTrue(); + it('CommonEventBatteryChangedCode_EXTRA_TEMPERATURE_JSTest', 0, function () { + console.info('CommonEventBatteryChangedCode_EXTRA_TEMPERATURE = ' + + batteryInfo.CommonEventBatteryChangedKey.EXTRA_TEMPERATURE); + expect(batteryInfo.CommonEventBatteryChangedKey.EXTRA_TEMPERATURE == 'temperature').assertTrue(); }) /** - * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1920 + * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1900 * @tc.name CommonEventBatteryChangedCode_EXTRA_PRESENT_JSTest * @tc.desc Battry Present Interface Test */ it('CommonEventBatteryChangedCode_EXTRA_PRESENT_JSTest', 0, function () { console.info('CommonEventBatteryChangedCode_EXTRA_PRESENT = ' - + batteryInfo.CommonEventBatteryChangedCode.EXTRA_PRESENT); - expect(batteryInfo.CommonEventBatteryChangedCode.EXTRA_PRESENT == 9).assertTrue(); - }) - - /** - * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1930 - * @tc.name CommonEventBatteryChangedCode_EXTRA_TECHNOLOGY_JSTest - * @tc.desc Battry Present Interface Test - */ - it('CommonEventBatteryChangedCode_EXTRA_TECHNOLOGY_JSTest', 0, function () { - console.info('CommonEventBatteryChangedCode_EXTRA_TECHNOLOGY = ' - + batteryInfo.CommonEventBatteryChangedCode.EXTRA_TECHNOLOGY); - expect(batteryInfo.CommonEventBatteryChangedCode.EXTRA_TECHNOLOGY == 10).assertTrue(); + + batteryInfo.CommonEventBatteryChangedKey.EXTRA_PRESENT); + expect(batteryInfo.CommonEventBatteryChangedKey.EXTRA_PRESENT == 'present').assertTrue(); }) /** - * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1940 + * @tc.number SUB_PowerSystem_BatteryManager_JSTest_1910 * @tc.name CommonEventBatteryChangedCode_CAPACITY_LEVEL_JSTest * @tc.desc Battry Present Interface Test */ it('CommonEventBatteryChangedCode_CAPACITY_LEVEL_JSTest', 0, function () { console.info('CommonEventBatteryChangedCode_CAPACITY_LEVEL = ' - + batteryInfo.CommonEventBatteryChangedCode.EXTRA_CAPACITY_LEVEL); - expect(batteryInfo.CommonEventBatteryChangedCode.EXTRA_CAPACITY_LEVEL == 11).assertTrue(); + + batteryInfo.CommonEventBatteryChangedKey.EXTRA_CAPACITY_LEVEL); + expect(batteryInfo.CommonEventBatteryChangedKey.EXTRA_CAPACITY_LEVEL == 'capacityLevel').assertTrue(); }) }) -} \ No newline at end of file +} -- GitLab