!3522 【Power】【Master】修改test.json和getThermalLevel接口取值问题

Merge pull request !3522 from 郭永强/master

powermgr/battery_manager/Test.json

@@ -2,9 +2,9 @@
     "description": "Configuration for powermgr battery Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "90000",
         "package": "com.example.mybatteryapp",
-        "shell-timeout": "60000"
+        "shell-timeout": "90000"
     },
     "kits": [
         {

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

@@ -37,7 +37,7 @@ function test14() {
             setTimeout(() => {
                 let level = thermal.getThermalLevel();
                 console.info("level is: " + level);
-                expect(level == -1).assertTrue();
+                expect(level >= 0 && level <= 6).assertTrue();
                 resolve();
                 done();
             }, MSEC_1000 * 4);
@@ -54,7 +54,7 @@ function test15() {
     it('Thermal_015', 0, async function (done) {
         thermal.subscribeThermalLevel((level) => {
             console.info("level is: " + level);
-            expect(level == -1).assertTrue();
+              expect(level >= 0 && level <= 6).assertTrue();
             done();
         })
         await new Promise((resolve, reject) => {