fix: The rectification directory

Signed-off-by: Nqiuxiangdong <qiuxiangdong3@huawei.com>
Change-Id: Ic3bf9632c9c616a5a2bc24a203c1da7e75a30c54

powermgr/BUILD.gn

@@ -14,9 +14,9 @@ import("//build/ohos_var.gni")
 group("powermgr") {
   testonly = true
   deps = [
-    "powermgrbattery:powermgr_battery_test",
-    "powermgrdisplay:powermgr_display_test",
-    "powermgrpower:powermgr_power_test",
-    "powermgrthermal:powermgr_thermal_test",
+    "battery_manager:powermgr_battery_test",
+    "display_manager:powermgr_display_test",
+    "power_manager:powermgr_power_test",
+    "thermal_manager:powermgr_thermal_test",
   ]
 }

powermgr/powermgrbattery/src/main/js/default/pages/index/index.js → powermgr/battery_manager/src/main/js/default/pages/index/index.js

@@ -14,7 +14,6 @@
  */
 import app from '@system.app'
 
-//import {Core, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index'
 import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
@@ -31,12 +30,7 @@ export default {
             'id': 'extend'
         })
         core.addService('expect', expectExtend)
-//        core.addService('report', instrumentLog)
         core.init()
-//        core.subscribeEvent('spec', instrumentLog)
-//        core.subscribeEvent('suite', instrumentLog)
-//        core.subscribeEvent('task', instrumentLog)
-
         const configService = core.getDefaultService('config')
         configService.setConfig(this)
 

powermgr/powermgrbattery/src/main/js/default/test/List.test.js → powermgr/battery_manager/src/main/js/default/test/List.test.js

@@ -14,5 +14,4 @@
  */
 require('./battery_unit.test.js')
 require('./battery_common_event.test.js')
-require('./power_manager_running_lock.test.js')
 require('./system_battery.test.js')
\ No newline at end of file

powermgr/powermgrbattery/src/main/js/default/test/power_manager_running_lock.test.js

-/*
- * 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 app from '@system.app'
-import Context from '@ohos.napi_context'
-import runningLock from '@ohos.runningLock';
-import power from '@ohos.power';
-import '@ohos.permission.RUNNING_LOCK'
-
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
-
-describe('appInfoTest', function () {
-    console.log("*************Power Unit Test Begin*************");
-    //createRunningLock(name: string, type: RunningLockType): Promise<RunningLock>
-    it('create_running_lock_promise_test', 0, async function (done) {
-        runningLock.createRunningLock("running_lock_test_1", runningLock.RunningLockType.BACKGROUND)
-            .then(runninglock => {
-                expect(runninglock !== null).assertTrue();
-                console.info('create_running_lock_promise_test success');
-                done();
-            })
-            .catch(error => {
-                console.log('create_running_lock_promise_test error: ' + error);
-                expect().assertFail();
-                done();
-            })
-    })
-    //createRunningLock(name: string, type: RunningLockType, callback: AsyncCallback<RunningLock>)
-    it('create_running_lock_callback_test', 0, async function (done) {
-        runningLock.createRunningLock("running_lock_test_2", runningLock.RunningLockType.BACKGROUND, (error, runninglock) => {
-            if (typeof error === "undefined") {
-                console.info('create_running_lock_callback_test: runningLock is ' + runninglock);
-                expect(runninglock !== null).assertTrue();
-                let used = runninglock.isUsed();
-                console.info('create_running_lock_callback_test is used: ' + used);
-                expect(used).assertFalse();
-                runninglock.lock(500);
-                used = runninglock.isUsed();
-                console.info('after lock create_running_lock_callback_test is used: ' + used);
-                expect(used).assertTrue();
-                console.info('create_running_lock_callback_test success');
-                done();
-            } else {
-                console.log('create_running_lock_callback_test: ' + error);
-                expect().assertFail();
-                done();
-            }
-        })
-    })
-    //lock(timeout: number)
-    it('running_lock_lock_test', 0, async function (done) {
-        runningLock.createRunningLock("running_lock_test_3", runningLock.RunningLockType.BACKGROUND)
-            .then(runninglock => {
-                expect(runninglock !== null).assertTrue();
-                let used = runninglock.isUsed();
-                console.info('running_lock_lock_test is used: ' + used);
-                expect(used).assertFalse();
-                runninglock.lock(500);
-                used = runninglock.isUsed();
-                console.info('after lock running_lock_lock_test is used: ' + used);
-                expect(used).assertTrue();
-                console.info('running_lock_lock_test success');
-                done();
-            })
-            .catch(error => {
-                console.log('running_lock_lock_test error: ' + error);
-                expect().assertFail();
-                done();
-            })
-    })
-    //isUsed()
-    it('running_lock_isused_test', 0, async function (done) {
-        runningLock.createRunningLock("running_lock_test_4", runningLock.RunningLockType.BACKGROUND)
-            .then(runninglock => {
-                expect(runninglock !== null).assertTrue();
-                let used = runninglock.isUsed();
-                console.info('running_lock_isused_test used: ' + used);
-                expect(used).assertFalse();
-                console.info('running_lock_isused_test success');
-                done();
-            })
-            .catch(error => {
-                console.log('running_lock_isused_test error: ' + error);
-                expect().assertFail();
-                done();
-            })
-    })
-    //unlock()
-    it('running_lock_unlock_test', 0, async function (done) {
-        runningLock.createRunningLock("running_lock_test_5", runningLock.RunningLockType.BACKGROUND)
-            .then(runninglock => {
-                expect(runninglock !== null).assertTrue();
-                let used = runninglock.isUsed();
-                console.info('running_lock_unlock_test is used: ' + used);
-                expect(used).assertFalse();
-                runninglock.lock(500);
-                used = runninglock.isUsed();
-                console.info('after lock running_lock_unlock_test is used: ' + used);
-                expect(used).assertTrue();
-                runninglock.unlock();
-                used = runninglock.isUsed();
-                console.info('after unlock running_lock_unlock_test is used: ' + used);
-                expect(used).assertFalse();
-                console.info('running_lock_unlock_test success');
-                done();
-            })
-            .catch(error => {
-                console.log('running_lock_unlock_test error: ' + error);
-                expect().assertFail();
-                done();
-            })
-    })
-    //Runninglock锁的类型为BACKGROUND
-    it('enum_runningLock_type_background_test', 0, function () {
-        let runningLockType = runningLock.RunningLockType.BACKGROUND;
-        console.info('runningLockType = ' + runningLockType);
-        expect(runningLockType == 1).assertTrue();
-        console.info('enum_runningLock_type_background_test success');
-    })
-    //Runninglock锁的类型为PROXIMITY_SCREEN_CONTROL
-    it('enum_runningLock_type_proximityscreencontrol_test', 0, function () {
-        let runningLockType = runningLock.RunningLockType.PROXIMITY_SCREEN_CONTROL;
-        console.info('runningLockType = ' + runningLockType);
-        expect(runningLockType == 2).assertTrue();
-        console.info('enum_runningLock_type_proximityscreencontrol_test success');
-    })
-    //isRunningLockTypeSupported(type: RunningLockType): Promise<boolean>
-    it('is_runninglock_type_supported_promise_test_1', 0, async function (done) {
-        runningLock.isRunningLockTypeSupported(runningLock.RunningLockType.PROXIMITY_SCREEN_CONTROL)
-            .then(supported => {
-                console.info('is_runninglock_type_supported_test_1 PROXIMITY_SCREEN_CONTROL supported is ' + supported);
-                expect(supported).assertTrue();
-                console.info('is_runninglock_type_supported_test_1 success');
-                done();
-            })
-            .catch(error => {
-                console.log('is_runninglock_type_supported_test_1 error: ' + error);
-                expect().assertFail();
-                done();
-            })
-    })
-    //isRunningLockTypeSupported(type: RunningLockType)  多余
-    it('is_runninglock_type_supported_promise_test_2', 0, async function (done) {
-        runningLock.isRunningLockTypeSupported(runningLock.RunningLockType.BACKGROUND)
-            .then(supported => {
-                console.info('is_runninglock_type_supported_promise_test_2 BACKGROUND supported is ' + supported);
-                expect(supported).assertTrue();
-                console.info('is_runninglock_type_supported_promise_test_2 success');
-                done();
-            })
-            .catch(error => {
-                console.log('is_runninglock_type_supported_promise_test_2 error: ' + error);
-                expect().assertFail();
-                done();
-            })
-    })
-    //isRunningLockTypeSupported(type: RunningLockType, callback: AsyncCallback<boolean>)
-    it('is_runninglock_type_supported_callback_test_3', 0, async function (done) {
-        runningLock.isRunningLockTypeSupported(runningLock.RunningLockType.BACKGROUND, (error, supported) => {
-            if (typeof error === "undefined") {
-                console.info('is_runninglock_type_supported_callback_test_3 BACKGROUND supported is ' + supported);
-                expect(supported).assertTrue();
-                console.info('is_runninglock_type_supported_callback_test_3 success');
-                done();
-            } else {
-                console.log('is_runninglock_type_supported_callback_test_3: ' + error);
-                expect().assertFail();
-                done();
-            }
-        })
-    })
-    it('power_is_screen_on_promise_test', 0, async function (done) {//isScreenOn(): Promise<boolean>
-        power.isScreenOn()
-            .then(screenOn => {
-                console.info('power_is_screen_on_promise_test screenOn is ' + screenOn);
-                expect(screenOn).assertTrue();
-                console.info('power_is_screen_on_promise_test success');
-                done();
-            })
-            .catch(error => {
-                console.log('power_is_screen_on_promise_test error: ' + error);
-                expect().assertFail();
-                done();
-            })
-    })
-    it('power_is_screen_on_callback_test', 0, async function (done) {//isScreenOn(callback: AsyncCallback<boolean>)
-        power.isScreenOn((error, screenOn) => {
-            if (typeof error === "undefined") {
-                console.info('power_is_screen_on_callback_test screenOn is ' + screenOn);
-                expect(screenOn).assertTrue();
-                console.info('power_is_screen_on_callback_test success');
-                done();
-            } else {
-                console.log('power_is_screen_on_callback_test: ' + error);
-                expect().assertFail();
-                done();
-            }
-        })
-    })
-})

powermgr/powermgrbattery/src/main/js/default/test/power_manager_running_lock_dev.test.js

-/*
- * 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 app from '@system.app'
-import Context from '@ohos.napi_context'
-import runningLock from '@ohos.runningLock';
-import power from '@ohos.power';
-import '@ohos.permission.RUNNING_LOCK'
-
-import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
-
-describe('appInfoTest', function () {
-    console.log("*************Power Unit Test Begin*************");
-    it('power_reboot_device_test', 0, function () {//rebootDevice(reason: string): void
-        power.rebootDevice("power_js_test_reboot");
-        console.info('power_reboot_device_test success');
-    })
-})