!3916 【xts_acts】【monthly_20220614】解决电源子系统描述重复命名导致report出现blocked问题分支合入

Merge pull request !3916 from 郭永强/monthly_20220614

powermgr/battery_manager/src/main/js/default/test/battery_common_event.test.js

@@ -14,7 +14,7 @@
  */
 import commonEvent from '@ohos.commonEvent';
 
-describe('appInfoTest', function () {
+describe('appInfoTest_battery_1', function () {
     console.log("*************Battery commonEvent Test Begin*************");
 
     /**

powermgr/battery_manager/src/main/js/default/test/battery_unit.test.js

@@ -18,7 +18,7 @@ import batteryInfo from '@ohos.batteryinfo';
 import brightness from '@ohos.brightness';
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 
-describe('appInfoTest', function () {
+describe('appInfoTest_battery_2', function () {
     console.log("*************Battery Unit Test Begin*************");
 
     /**

powermgr/battery_manager/src/main/js/default/test/batterymanager_performance.test.js

@@ -16,7 +16,7 @@
 import batteryInfo from '@ohos.batteryinfo';
 import { describe, it, expect } from 'deccjsunit/index';
 
-describe('appInfoTest', function () {
+describe('appInfoTest_battery_4', function () {
 
     console.log("*************Edited Battery Performance Test Begin*************");
     const MAXNUM = 1000;

powermgr/battery_manager/src/main/js/default/test/system_battery.test.js

@@ -39,7 +39,7 @@ function completeFunc(tag) {
     console.log(tag + ": The device information is obtained successfully.");
 }
 
-describe('appInfoTest', function () {
+describe('appInfoTest_battery_3', function () {
     console.log("*************System Battery Unit Test Begin*************");
 
     /**

powermgr/display_manager/src/main/js/default/test/system_display.test.js

@@ -28,7 +28,7 @@ function sleep(time){
     return new Promise((resolve) => setTimeout(resolve, time));
 }
 
-describe('appInfoTest', function () {
+describe('appInfoTest_display', function () {
   console.log("*************System SystemDisplay Unit Test Begin*************");
 
     /**

powermgr/thermal_manager/src/main/js/default/test/thermal_common_event.test.js

@@ -15,7 +15,7 @@
 import commonEvent from '@ohos.commonEvent';
 import thermal from "@ohos.thermal"
 
-describe('appInfoTest', function () {
+describe('appInfoTest_thermal_3', function () {
     console.log("*************Thermal commonEvent Test Begin*************");
 
     /**

powermgr/thermal_manager/src/main/js/default/test/thermal_performance.test.js

@@ -16,7 +16,7 @@
 import thermal from "@ohos.thermal"
 import { describe, it, expect } from 'deccjsunit/index';
 
-describe('appInfoTest', function () {
+describe('appInfoTest_thermal_4', function () {
     console.log("*************Thermal Performance Test Begin*************");
     performanceTest1();
     performanceTest2();

powermgr/thermal_manager/src/main/js/default/test/thermal_uint.test.js

@@ -19,7 +19,7 @@ import thermal from "@ohos.thermal"
 import ThermalLevel from "@ohos.thermal"
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 
-describe('appInfoTest', function () {
+describe('appInfoTest_thermal_2', function () {
     console.log("*************Thermal API Test Begin*************");
     test1();
     test2();

powermgr/thermal_manager/src/main/js/default/test/thermal_unittest.test.js

@@ -19,7 +19,7 @@ import ThermalLevel from "@ohos.thermal"
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 const MSEC_1000 = 1000;
 
-describe('appInfoTest', function () {
+describe('appInfoTest_thermal_1', function () {
     console.log("*************Thermal API Test Begin*************");
     test14();
     test15();