diff --git a/frameworks/native/power_mgr_client.cpp b/frameworks/native/power_mgr_client.cpp index c205db8e69bf7178d31fe8af464e9d9f408f3eb6..52b01220836963d05313048d2f839c7d92073a2f 100644 --- a/frameworks/native/power_mgr_client.cpp +++ b/frameworks/native/power_mgr_client.cpp @@ -129,7 +129,7 @@ void PowerMgrClient::WakeupDevice(WakeupDeviceType reason, const std::string& de void PowerMgrClient::RefreshActivity(UserActivityType type) { - RETURN_IF_WITH_LOG(type == UserActivityType::USER_ACTIVITY_TYPE_ATTENTION, " is not supported!"); + RETURN_IF_WITH_LOG(type == UserActivityType::USER_WAKENESS_TYPE_ATTENTION, " is not supported!"); RETURN_IF(Connect() != ERR_OK); proxy_->RefreshActivity(GetTickCount(), type, true); diff --git a/interfaces/innerkits/native/include/power_mgr_client.h b/interfaces/innerkits/native/include/power_mgr_client.h index d62d45a0501a47335e278f76123e09a2f069d24b..27b15308b3c535231aaee4fe0ec610bd686e0667 100644 --- a/interfaces/innerkits/native/include/power_mgr_client.h +++ b/interfaces/innerkits/native/include/power_mgr_client.h @@ -70,7 +70,7 @@ public: * @param needChangeBacklight Whether to change the backlight state, for example, from DIM to BRIGHT. * Set it to false if you don't want to change the backlight state. */ - void RefreshActivity(UserActivityType type = UserActivityType::USER_ACTIVITY_TYPE_OTHER); + void RefreshActivity(UserActivityType type = UserActivityType::USER_WAKENESS_TYPE_OTHER); /** * Check whether the device screen is on. The result may be true or false, depending on the system state. diff --git a/interfaces/innerkits/native/include/power_state_machine_info.h b/interfaces/innerkits/native/include/power_state_machine_info.h index 720cf8c513616002114b56456ef35e8c7325c1e2..a6b093f4ca17a25df5d6fd35d75d28b4cee14021 100644 --- a/interfaces/innerkits/native/include/power_state_machine_info.h +++ b/interfaces/innerkits/native/include/power_state_machine_info.h @@ -81,13 +81,13 @@ enum class DisplayState : uint32_t { // UserActivityType list, must sync with A_PMS enum class UserActivityType : uint32_t { - USER_ACTIVITY_TYPE_OTHER = 0, - USER_ACTIVITY_TYPE_BUTTON = 1, - USER_ACTIVITY_TYPE_TOUCH = 2, - USER_ACTIVITY_TYPE_ACCESSIBILITY = 3, - USER_ACTIVITY_TYPE_ATTENTION = 4, - USER_ACTIVITY_TYPE_SOFTWARE = 5, - USER_ACTIVITY_TYPE_MAX = USER_ACTIVITY_TYPE_SOFTWARE, + USER_WAKENESS_TYPE_OTHER = 0, + USER_WAKENESS_TYPE_BUTTON = 1, + USER_WAKENESS_TYPE_TOUCH = 2, + USER_WAKENESS_TYPE_ACCESSIBILITY = 3, + USER_WAKENESS_TYPE_ATTENTION = 4, + USER_WAKENESS_TYPE_SOFTWARE = 5, + USER_WAKENESS_TYPE_MAX = USER_WAKENESS_TYPE_SOFTWARE, }; // WakeupReasonType list diff --git a/services/BUILD.gn b/services/BUILD.gn index 6df3d000c169c9d3d3c0290b94f8d394251a3f36..5c6bfdb2af0ca2a227415753e2327e40d6b63458 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -17,6 +17,7 @@ config("powermgr_private_config") { include_dirs = [ "//utils/system/safwk/native/include", "//base/sensors/sensor/interfaces/native/include", + "//foundation/multimodalinput/input/interfaces/native/innerkits/proxy/include", ] } @@ -73,6 +74,7 @@ ohos_shared_library("powermgrservice") { "hisysevent_native:libhisysevent", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", "sensor:sensor_interface_native", diff --git a/services/native/include/actions/idevice_state_action.h b/services/native/include/actions/idevice_state_action.h index 8faf522c56e5b68503c06256cbe72eb0be2882fe..3024e9135d68928af8a93e64bf2777a1cf38c8cf 100644 --- a/services/native/include/actions/idevice_state_action.h +++ b/services/native/include/actions/idevice_state_action.h @@ -38,7 +38,8 @@ public: const std::string& pkgName) = 0; virtual void RefreshActivity(int64_t callTimeMs, UserActivityType type, uint32_t flags) = 0; virtual DisplayState GetDisplayState() = 0; - virtual uint32_t SetDisplayState(DisplayState state) = 0; + virtual uint32_t SetDisplayState(DisplayState state, + StateChangeReason reason = StateChangeReason::STATE_CHANGE_REASON_UNKNOWN) = 0; virtual uint32_t GoToSleep(const std::function onSuspend, const std::function onWakeup, bool force) = 0; }; diff --git a/services/native/include/power_mgr_service.h b/services/native/include/power_mgr_service.h index 2a1e31259ca0dc261a818d8df51b9aee59b3e8fc..b665b2e4b8de997deeb86bb1106718d12b06a555 100644 --- a/services/native/include/power_mgr_service.h +++ b/services/native/include/power_mgr_service.h @@ -110,6 +110,7 @@ public: { powerStateMachine_->SetSleepTime(time); } + void HandlePowerKeyTimeout(); void EnableMock(IDeviceStateAction* stateAction, IDevicePowerAction* powerAction, IRunningLockAction* lockAction) @@ -130,8 +131,14 @@ public: PowerStateMachine::onWakeup(); } private: + static constexpr int32_t LONG_PRESS_TIME = 3000; + static constexpr int32_t POWER_KEY_PRESS_TIME = 30000; bool Init(); bool PowerStateMachineInit(); + void KeyMonitorInit(); + void HandlePowerKeyUp(); + void HandleKeyEvent(int32_t keyCode); + void HandlePointEvent(); void NotifyRunningLockChanged(bool isUnLock); void FillUserIPCInfo(UserIPCInfo &userIPCinfo); bool ready_ {false}; @@ -143,6 +150,7 @@ private: std::shared_ptr powerMgrNotify_; ShutdownService shutdownService_; PowerModeModule powerModeModule_; + bool powerkeyPressed_ {false}; uint32_t mockCount_ {0}; }; } // namespace PowerMgr diff --git a/services/native/include/power_state_machine.h b/services/native/include/power_state_machine.h index 0dda9103acab1972d1f517531cfbea3d1fa2b09f..e47754ef6a14db1186e7ed55e7f0eb938dc69933 100644 --- a/services/native/include/power_state_machine.h +++ b/services/native/include/power_state_machine.h @@ -123,7 +123,7 @@ private: class StateController { public: StateController(PowerState state, std::shared_ptr owner, - std::function action) + std::function action) : state_(state), owner_(owner), action_(action) {} ~StateController() = default; PowerState GetState() @@ -137,7 +137,7 @@ private: bool CheckState(); PowerState state_; std::weak_ptr owner_; - std::function action_; + std::function action_; }; struct classcomp { @@ -159,7 +159,7 @@ private: void HandleActivityOffTimeout(); void HandleActivitySleepTimeout(); void HandleSystemWakeup(); - StateChangeReason GetReasonByUserActivity(UserActivityType type); + StateChangeReason GetReasonByUserWakeness(UserActivityType type); StateChangeReason GetReasonByWakeType(WakeupDeviceType type); StateChangeReason GetReasionBySuspendType(SuspendDeviceType type); diff --git a/services/native/include/powerms_event_handler.h b/services/native/include/powerms_event_handler.h index 5bad9de908a6cb7dc6d8f33df3ab0e1ca6d988d9..ab166d537e4a300c9da95b5b0e2844eaef50ee5d 100644 --- a/services/native/include/powerms_event_handler.h +++ b/services/native/include/powerms_event_handler.h @@ -27,10 +27,11 @@ class PowermsEventHandler : public AppExecFwk::EventHandler { public: enum { CHECK_RUNNINGLOCK_OVERTIME_MSG = 1, - CHECK_USER_ACTIVITY_TIMEOUT_MSG = 2, - CHECK_USER_ACTIVITY_OFF_TIMEOUT_MSG = 3, - CHECK_USER_ACTIVITY_SLEEP_TIMEOUT_MSG = 4, + CHECK_USER_WAKENESS_TIMEOUT_MSG = 2, + CHECK_USER_WAKENESS_OFF_TIMEOUT_MSG = 3, + CHECK_USER_WAKENESS_SLEEP_TIMEOUT_MSG = 4, SYSTEM_WAKE_UP_MSG = 5, + POWER_KEY_TIMEOUT_MSG = 6, }; PowermsEventHandler(const std::shared_ptr& runner, diff --git a/services/native/src/actions/default/BUILD.gn b/services/native/src/actions/default/BUILD.gn index fa5fe42cf317d861188fd944a14049f71f0d6121..760a7a288763323bfcb9f920fb4a1ace463191cc 100644 --- a/services/native/src/actions/default/BUILD.gn +++ b/services/native/src/actions/default/BUILD.gn @@ -37,6 +37,8 @@ ohos_source_set("${powermgr_actions_default_target}") { deps = [ "${powermgr_hdi_path}/client:power_hdf_client", "../:powermgr_actions_common", + "//foundation/windowmanager/wm:libwm", + "//foundation/windowmanager/utils:libwmutil", "//utils/native/base:utils", ] diff --git a/services/native/src/actions/default/device_state_action.cpp b/services/native/src/actions/default/device_state_action.cpp index d68564924e62cf335ce5a5c2f2b0eaaf0d8045c8..9c81aef236b4ab5010c34bac2f2e5626af73a9dc 100644 --- a/services/native/src/actions/default/device_state_action.cpp +++ b/services/native/src/actions/default/device_state_action.cpp @@ -15,20 +15,36 @@ #include "device_state_action.h" +#include "display_manager.h" #include "display_power_mgr_client.h" #include "system_suspend_controller.h" #include "power_state_machine_info.h" +#include "hilog_wrapper.h" using namespace std; namespace OHOS { namespace PowerMgr { using namespace DisplayPowerMgr; +using namespace Rosen; + +DeviceStateAction::DeviceStateAction() +{ + dispCallback_ = new DisplayPowerCallback(); + DisplayPowerMgrClient::GetInstance().RegisterCallback(dispCallback_); +} + +DeviceStateAction::~DeviceStateAction() +{ + DisplayPowerMgrClient::GetInstance().RegisterCallback(nullptr); + dispCallback_ = nullptr; +} void DeviceStateAction::Suspend(int64_t callTimeMs, SuspendDeviceType type, uint32_t flags) { // Display is controlled by PowerStateMachine // Don't suspend until GoToSleep is called + DisplayManager::GetInstance().SuspendBegin(PowerStateChangeReason::POWER_BUTTON); } void DeviceStateAction::ForceSuspend() @@ -39,6 +55,7 @@ void DeviceStateAction::ForceSuspend() void DeviceStateAction::Wakeup(int64_t callTimeMs, WakeupDeviceType type, const string& details, const string& pkgName) { + DisplayManager::GetInstance().WakeUpBegin(PowerStateChangeReason::POWER_BUTTON); SystemSuspendController::GetInstance().Wakeup(); } @@ -65,7 +82,7 @@ DisplayState DeviceStateAction::GetDisplayState() return ret; } -uint32_t DeviceStateAction::SetDisplayState(const DisplayState state) +uint32_t DeviceStateAction::SetDisplayState(const DisplayState state, StateChangeReason reason) { DisplayPowerMgr::DisplayState dispState = DisplayPowerMgr::DisplayState::DISPLAY_ON; switch (state) { @@ -85,7 +102,7 @@ uint32_t DeviceStateAction::SetDisplayState(const DisplayState state) break; } - bool ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(dispState); + bool ret = DisplayPowerMgrClient::GetInstance().SetDisplayState(dispState, reason); return ret ? ActionResult::SUCCESS : ActionResult::FAILED; } @@ -95,5 +112,27 @@ uint32_t DeviceStateAction::GoToSleep(const std::function onSuspend, SystemSuspendController::GetInstance().Suspend(onSuspend, onWakeup, force); return ActionResult::SUCCESS; } + +void DeviceStateAction::DisplayPowerCallback::OnDisplayStateChanged(uint32_t displayId, + DisplayPowerMgr::DisplayState state) +{ + int32_t mainDisp = DisplayPowerMgrClient::GetInstance().GetMainDisplayId(); + if (mainDisp < 0 || static_cast(mainDisp) != displayId) { + POWER_HILOGI(MODULE_SERVICE, "It's not main display, skip!"); + return; + } + switch (state) + { + case DisplayPowerMgr::DisplayState::DISPLAY_ON: + DisplayManager::GetInstance().WakeUpEnd(); + break; + case DisplayPowerMgr::DisplayState::DISPLAY_OFF: + DisplayManager::GetInstance().SuspendEnd(); + break; + default: + break; + } + return; +} } // namespace PowerMgr } // namespace OHOS diff --git a/services/native/src/actions/default/device_state_action.h b/services/native/src/actions/default/device_state_action.h index 458d9a72992eddb9b33c032e42b5da92b94e0910..c2129e5fa288e0a77bc8ac8591f86f662b6c17f6 100644 --- a/services/native/src/actions/default/device_state_action.h +++ b/services/native/src/actions/default/device_state_action.h @@ -17,11 +17,14 @@ #define POWERMGR_DEVICE_STATE_ACTION_H #include "actions/idevice_state_action.h" +#include "display_power_callback_stub.h" namespace OHOS { namespace PowerMgr { class DeviceStateAction : public IDeviceStateAction { public: + DeviceStateAction(); + ~DeviceStateAction(); void Suspend(int64_t callTimeMs, SuspendDeviceType type, uint32_t flags) override; void ForceSuspend() override; void Wakeup(int64_t callTimeMs, WakeupDeviceType type, const std::string& details, @@ -29,8 +32,16 @@ public: void RefreshActivity(const int64_t callTimeMs, UserActivityType type, const uint32_t flags) override {} DisplayState GetDisplayState() override; - uint32_t SetDisplayState(const DisplayState state) override; + uint32_t SetDisplayState(const DisplayState state, + StateChangeReason reason = StateChangeReason::STATE_CHANGE_REASON_UNKNOWN) override; uint32_t GoToSleep(std::function onSuspend, std::function onWakeup, bool force) override; + +private: + class DisplayPowerCallback : public DisplayPowerMgr::DisplayPowerCallbackStub { + public: + virtual void OnDisplayStateChanged(uint32_t displayId, DisplayPowerMgr::DisplayState state) override; + }; + sptr dispCallback_; }; } // namespace PowerMgr } // namespace OHOS diff --git a/services/native/src/power_mgr_service.cpp b/services/native/src/power_mgr_service.cpp index 3ca7654d07f99c6b7dbc948e207184661ff96c48..82bb7d1f62d7b18bd6e0ccd2bc028be99b83f0bd 100644 --- a/services/native/src/power_mgr_service.cpp +++ b/services/native/src/power_mgr_service.cpp @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -24,6 +25,7 @@ #include #include +#include "input_manager.h" #include "permission.h" #include "power_common.h" #include "power_mgr_dumper.h" @@ -33,11 +35,14 @@ namespace PowerMgr { namespace { const std::string POWERMGR_SERVICE_NAME = "PowerMgrService"; const std::string TASK_RUNNINGLOCK_UNLOCK = "RunningLock_UnLock"; +const std::string REASON_POWER_KEY = "power_key"; constexpr int APP_FIRST_UID = APP_FIRST_UID_VALUE; auto pms = DelayedSpSingleton::GetInstance(); const bool G_REGISTER_RESULT = SystemAbility::MakeAndRegisterAbility(pms.GetRefPtr()); } +using namespace MMI; + PowerMgrService::PowerMgrService() : SystemAbility(POWER_MANAGER_SERVICE_ID, true) {} PowerMgrService::~PowerMgrService() {} @@ -93,6 +98,7 @@ bool PowerMgrService::Init() } else { POWER_HILOGE(MODULE_SERVICE, "power mode init fail!"); } + KeyMonitorInit(); POWER_HILOGI(MODULE_SERVICE, "Init success"); return true; } @@ -113,7 +119,127 @@ bool PowerMgrService::PowerStateMachineInit() return true; } -void PowerMgrService::OnStop() +void PowerMgrService::KeyMonitorInit() +{ + std::shared_ptr keyOption = std::make_shared(); + std::vector preKeys; + + keyOption->SetPreKeys(preKeys); + keyOption->SetFinalKey(OHOS::MMI::KeyEvent::KEYCODE_POWER); + keyOption->SetFinalKeyDown(true); + keyOption->SetFinalKeyDownDuration(LONG_PRESS_TIME); + int32_t id = InputManager::GetInstance()->SubscribeKeyEvent(keyOption, + [this](std::shared_ptr keyEvent) { + POWER_HILOGI(MODULE_SERVICE, "Receive long press powerkey"); + this->ShutDownDevice(REASON_POWER_KEY); + }); + + keyOption.reset(); + keyOption = std::make_shared(); + keyOption->SetPreKeys(preKeys); + keyOption->SetFinalKey(OHOS::MMI::KeyEvent::KEYCODE_POWER); + keyOption->SetFinalKeyDown(true); + keyOption->SetFinalKeyDownDuration(0); + id = InputManager::GetInstance()->SubscribeKeyEvent(keyOption, + [this](std::shared_ptr keyEvent) { + POWER_HILOGI(MODULE_SERVICE, "Receive short press powerkey"); + powerkeyPressed_ = true; + handler_->SendEvent(PowermsEventHandler::POWER_KEY_TIMEOUT_MSG, 0, POWER_KEY_PRESS_TIME); + }); + + keyOption.reset(); + keyOption = std::make_shared(); + keyOption->SetPreKeys(preKeys); + keyOption->SetFinalKey(OHOS::MMI::KeyEvent::KEYCODE_POWER); + keyOption->SetFinalKeyDown(false); + id = InputManager::GetInstance()->SubscribeKeyEvent(keyOption, + [this](std::shared_ptr keyEvent) { + powerkeyPressed_ = false; + handler_->RemoveEvent(PowermsEventHandler::POWER_KEY_TIMEOUT_MSG); + this->HandlePowerKeyUp(); + }); + + InputManager::GetInstance()->AddMonitor([this](std::shared_ptr event) { + this->HandleKeyEvent(event->GetKeyCode()); + }); + + InputManager::GetInstance()->AddMonitor([this](std::shared_ptr event) { + this->HandlePointEvent(); + }); +} + +void PowerMgrService::HandlePowerKeyUp() +{ + POWER_HILOGI(MODULE_SERVICE, "Receive release powerkey"); + + if (this->shutdownService_.IsShuttingDown()) { + POWER_HILOGI(MODULE_SERVICE, "System is shutting down"); + return; + } + time_t t = time(0); + if (t <= 0) { + POWER_HILOGI(MODULE_SERVICE, "Can't get current time"); + } + int64_t now = static_cast(t); + if (this->IsScreenOn()) { + this->SuspendDevice(now, SuspendDeviceType::SUSPEND_DEVICE_REASON_POWER_BUTTON, false); + } else { + this->WakeupDevice(now, WakeupDeviceType::WAKEUP_DEVICE_POWER_BUTTON, REASON_POWER_KEY); + } +} + +void PowerMgrService::HandleKeyEvent(int32_t keyCode) +{ + POWER_HILOGI(MODULE_SERVICE, "HandleKeyEvent: %{public}d", keyCode); + time_t t = time(0); + if (t <= 0) { + POWER_HILOGI(MODULE_SERVICE, "Can't get current time"); + } + int64_t now = static_cast(t); + if (IsScreenOn()) { + this->RefreshActivity(now, UserActivityType::USER_WAKENESS_TYPE_BUTTON, false); + } else { + if (keyCode >= KeyEvent::KEYCODE_0 + && keyCode <= KeyEvent::KEYCODE_NUMPAD_RIGHT_PAREN) { + POWER_HILOGI(MODULE_SERVICE, "wakeup by keyboard"); + std::string reason = "keyboard:"; + reason.append(std::to_string(keyCode)); + this->WakeupDevice(now, WakeupDeviceType::WAKEUP_DEVICE_POWER_BUTTON, reason); + } + } +} + +void PowerMgrService::HandlePointEvent() +{ + POWER_HILOGI(MODULE_SERVICE, "HandlePointEvent"); + time_t t = time(0); + if (t <= 0) { + POWER_HILOGI(MODULE_SERVICE, "Can't get current time"); + } + int64_t now = static_cast(t); + this->RefreshActivity(now, UserActivityType::USER_WAKENESS_TYPE_TOUCH, false); +} + +void PowerMgrService::HandlePowerKeyTimeout() +{ + POWER_HILOGI(MODULE_SERVICE, "HandlePowerKeyTimeout"); + if (powerkeyPressed_) { + const int logLevel = 2; + const std::string tag = "TAG_POWER"; + HiviewDFX::HiSysEvent::Write(HiviewDFX::HiSysEvent::Domain::POWERMGR, "Service", + HiviewDFX::HiSysEvent::EventType::FAULT, + "LOG_LEVEL", + logLevel, + "TAG", + tag, + "MESSAGE", + "POWER KEY PRESS TIMEOUT"); + POWER_HILOGI(MODULE_SERVICE, "PowerKey press Timeout"); + powerkeyPressed_ = false; + } +} + +void PowerMgrService::PowerMgrService::OnStop() { POWER_HILOGI(MODULE_SERVICE, "stop service"); if (!ready_) { @@ -169,11 +295,11 @@ void PowerMgrService::RebootDevice(const std::string& reason) } POWER_HILOGI(MODULE_SERVICE, "Cancel auto sleep timer"); powerStateMachine_->CancelDelayTimer( - PowermsEventHandler::CHECK_USER_ACTIVITY_TIMEOUT_MSG); + PowermsEventHandler::CHECK_USER_WAKENESS_TIMEOUT_MSG); powerStateMachine_->CancelDelayTimer( - PowermsEventHandler::CHECK_USER_ACTIVITY_OFF_TIMEOUT_MSG); + PowermsEventHandler::CHECK_USER_WAKENESS_OFF_TIMEOUT_MSG); powerStateMachine_->CancelDelayTimer( - PowermsEventHandler::CHECK_USER_ACTIVITY_SLEEP_TIMEOUT_MSG); + PowermsEventHandler::CHECK_USER_WAKENESS_SLEEP_TIMEOUT_MSG); POWER_HILOGI(MODULE_SERVICE, "PID: %{public}d Call %{public}s !", pid, __func__); shutdownService_.Reboot(reason); @@ -193,11 +319,11 @@ void PowerMgrService::ShutDownDevice(const std::string& reason) } POWER_HILOGI(MODULE_SERVICE, "Cancel auto sleep timer"); powerStateMachine_->CancelDelayTimer( - PowermsEventHandler::CHECK_USER_ACTIVITY_TIMEOUT_MSG); + PowermsEventHandler::CHECK_USER_WAKENESS_TIMEOUT_MSG); powerStateMachine_->CancelDelayTimer( - PowermsEventHandler::CHECK_USER_ACTIVITY_OFF_TIMEOUT_MSG); + PowermsEventHandler::CHECK_USER_WAKENESS_OFF_TIMEOUT_MSG); powerStateMachine_->CancelDelayTimer( - PowermsEventHandler::CHECK_USER_ACTIVITY_SLEEP_TIMEOUT_MSG); + PowermsEventHandler::CHECK_USER_WAKENESS_SLEEP_TIMEOUT_MSG); POWER_HILOGI(MODULE_SERVICE, "PID: %{public}d Call %{public}s !", pid, __func__); shutdownService_.Shutdown(reason); diff --git a/services/native/src/power_state_machine.cpp b/services/native/src/power_state_machine.cpp index 152a307855df9f8d036f62268c0de2039233d61c..1bcfc27676679667e088d4fb9c3e8dc8bfe92708 100644 --- a/services/native/src/power_state_machine.cpp +++ b/services/native/src/power_state_machine.cpp @@ -92,9 +92,10 @@ bool PowerStateMachine::Init() void PowerStateMachine::EmplaceAwake() { controllerMap_.emplace(PowerState::AWAKE, - std::make_shared(PowerState::AWAKE, shared_from_this(), [this] { + std::make_shared(PowerState::AWAKE, shared_from_this(), + [this](StateChangeReason reason) { mDeviceState_.screenState.lastOnTime = GetTickCount(); - uint32_t ret = this->stateAction_->SetDisplayState(DisplayState::DISPLAY_ON); + uint32_t ret = this->stateAction_->SetDisplayState(DisplayState::DISPLAY_ON, reason); if (ret != ActionResult::SUCCESS) { POWER_HILOGE(MODULE_SERVICE, "Failed to go to AWAKE, Display Err"); return TransitResult::HDI_ERR; @@ -107,7 +108,8 @@ void PowerStateMachine::EmplaceAwake() void PowerStateMachine::EmplaceInactive() { controllerMap_.emplace(PowerState::INACTIVE, - std::make_shared(PowerState::INACTIVE, shared_from_this(), [this] { + std::make_shared(PowerState::INACTIVE, shared_from_this(), + [this](StateChangeReason reason) { POWER_HILOGI(MODULE_SERVICE, "StateController_INACTIVE: func is Start."); mDeviceState_.screenState.lastOffTime = GetTickCount(); DisplayState state = DisplayState::DISPLAY_OFF; @@ -115,7 +117,7 @@ void PowerStateMachine::EmplaceInactive() POWER_HILOGI(MODULE_SERVICE, "display suspend enabled"); state = DisplayState::DISPLAY_SUSPEND; } - uint32_t ret = this->stateAction_->SetDisplayState(state); + uint32_t ret = this->stateAction_->SetDisplayState(state, reason); if (ret != ActionResult::SUCCESS) { POWER_HILOGE(MODULE_SERVICE, "Failed to go to INACTIVE, Display Err"); return TransitResult::HDI_ERR; @@ -128,13 +130,14 @@ void PowerStateMachine::EmplaceInactive() void PowerStateMachine::EmplaceSleep() { controllerMap_.emplace(PowerState::SLEEP, - std::make_shared(PowerState::SLEEP, shared_from_this(), [this] { + std::make_shared(PowerState::SLEEP, shared_from_this(), + [this](StateChangeReason reason) { DisplayState state = DisplayState::DISPLAY_OFF; if (enableDisplaySuspend_) { POWER_HILOGI(MODULE_SERVICE, "display suspend enabled"); state = DisplayState::DISPLAY_SUSPEND; } - uint32_t ret = this->stateAction_->SetDisplayState(state); + uint32_t ret = this->stateAction_->SetDisplayState(state, reason); if (ret != ActionResult::SUCCESS) { POWER_HILOGE(MODULE_SERVICE, "Failed to go to SLEEP, Display Err"); return TransitResult::HDI_ERR; @@ -231,7 +234,7 @@ void PowerStateMachine::RefreshActivityInner(pid_t pid, bool needChangeBacklight) { POWER_HILOGI(MODULE_SERVICE, "PID: %{public}d Start to RefreshActivity!!", pid); - if (type > UserActivityType::USER_ACTIVITY_TYPE_MAX) { + if (type > UserActivityType::USER_WAKENESS_TYPE_MAX) { POWER_HILOGE(MODULE_SERVICE, "Invalid type: %{public}d", type); return; } @@ -248,7 +251,7 @@ void PowerStateMachine::RefreshActivityInner(pid_t pid, stateAction_->RefreshActivity(callTimeMs, type, needChangeBacklight ? REFRESH_ACTIVITY_NEED_CHANGE_LIGHTS : REFRESH_ACTIVITY_NO_CHANGE_LIGHTS); mDeviceState_.screenState.lastOnTime = GetTickCount(); - stateAction_->SetDisplayState(DisplayState::DISPLAY_ON); + stateAction_->SetDisplayState(DisplayState::DISPLAY_ON, GetReasonByUserWakeness(type)); } // reset timer ResetInactiveTimer(); @@ -540,9 +543,9 @@ void PowerStateMachine::CancelDelayTimer(int32_t event) void PowerStateMachine::ResetInactiveTimer() { POWER_HILOGD(MODULE_SERVICE, "ResetInactiveTimer: fun is Start!"); - CancelDelayTimer(PowermsEventHandler::CHECK_USER_ACTIVITY_TIMEOUT_MSG); - CancelDelayTimer(PowermsEventHandler::CHECK_USER_ACTIVITY_OFF_TIMEOUT_MSG); - CancelDelayTimer(PowermsEventHandler::CHECK_USER_ACTIVITY_SLEEP_TIMEOUT_MSG); + CancelDelayTimer(PowermsEventHandler::CHECK_USER_WAKENESS_TIMEOUT_MSG); + CancelDelayTimer(PowermsEventHandler::CHECK_USER_WAKENESS_OFF_TIMEOUT_MSG); + CancelDelayTimer(PowermsEventHandler::CHECK_USER_WAKENESS_SLEEP_TIMEOUT_MSG); if (this->GetDisplayOffTime() < 0) { POWER_HILOGI(MODULE_SERVICE, "Display Auto OFF is disabled"); return; @@ -552,7 +555,7 @@ void PowerStateMachine::ResetInactiveTimer() const uint32_t TWO = 2; const uint32_t THREE = 3; this->SetDelayTimer(this->GetDisplayOffTime() * TWO / THREE, - PowermsEventHandler::CHECK_USER_ACTIVITY_TIMEOUT_MSG); + PowermsEventHandler::CHECK_USER_WAKENESS_TIMEOUT_MSG); } POWER_HILOGD(MODULE_SERVICE, "ResetInactiveTimer: fun is End!"); } @@ -560,9 +563,9 @@ void PowerStateMachine::ResetInactiveTimer() void PowerStateMachine::ResetSleepTimer() { POWER_HILOGD(MODULE_SERVICE, "ResetSleepTimer: fun is Start!"); - CancelDelayTimer(PowermsEventHandler::CHECK_USER_ACTIVITY_TIMEOUT_MSG); - CancelDelayTimer(PowermsEventHandler::CHECK_USER_ACTIVITY_OFF_TIMEOUT_MSG); - CancelDelayTimer(PowermsEventHandler::CHECK_USER_ACTIVITY_SLEEP_TIMEOUT_MSG); + CancelDelayTimer(PowermsEventHandler::CHECK_USER_WAKENESS_TIMEOUT_MSG); + CancelDelayTimer(PowermsEventHandler::CHECK_USER_WAKENESS_OFF_TIMEOUT_MSG); + CancelDelayTimer(PowermsEventHandler::CHECK_USER_WAKENESS_SLEEP_TIMEOUT_MSG); if (this->GetSleepTime() < 0) { POWER_HILOGI(MODULE_SERVICE, "Auto Sleep is disabled"); return; @@ -570,7 +573,7 @@ void PowerStateMachine::ResetSleepTimer() if (this->CheckRunningLock(PowerState::SLEEP)) { this->SetDelayTimer(this->GetSleepTime(), - PowermsEventHandler::CHECK_USER_ACTIVITY_SLEEP_TIMEOUT_MSG); + PowermsEventHandler::CHECK_USER_WAKENESS_SLEEP_TIMEOUT_MSG); } POWER_HILOGD(MODULE_SERVICE, "ResetSleepTimer: fun is End!"); } @@ -579,13 +582,13 @@ void PowerStateMachine::HandleDelayTimer(int32_t event) { POWER_HILOGD(MODULE_SERVICE, "handle delay timer: (%{public}d)", event); switch (event) { - case PowermsEventHandler::CHECK_USER_ACTIVITY_TIMEOUT_MSG: + case PowermsEventHandler::CHECK_USER_WAKENESS_TIMEOUT_MSG: HandleActivityTimeout(); break; - case PowermsEventHandler::CHECK_USER_ACTIVITY_OFF_TIMEOUT_MSG: + case PowermsEventHandler::CHECK_USER_WAKENESS_OFF_TIMEOUT_MSG: HandleActivityOffTimeout(); break; - case PowermsEventHandler::CHECK_USER_ACTIVITY_SLEEP_TIMEOUT_MSG: + case PowermsEventHandler::CHECK_USER_WAKENESS_SLEEP_TIMEOUT_MSG: HandleActivitySleepTimeout(); break; case PowermsEventHandler::SYSTEM_WAKE_UP_MSG: @@ -608,13 +611,14 @@ void PowerStateMachine::HandleActivityTimeout() return; } if (dispState == DisplayState::DISPLAY_ON) { - stateAction_->SetDisplayState(DisplayState::DISPLAY_DIM); + stateAction_->SetDisplayState(DisplayState::DISPLAY_DIM, + StateChangeReason::STATE_CHANGE_REASON_TIMEOUT); if (this->GetDisplayOffTime() < 0) { POWER_HILOGI(MODULE_SERVICE, "Display Auto OFF is disabled"); return; } else { SetDelayTimer(GetDisplayOffTime() / THREE, - PowermsEventHandler::CHECK_USER_ACTIVITY_OFF_TIMEOUT_MSG); + PowermsEventHandler::CHECK_USER_WAKENESS_OFF_TIMEOUT_MSG); } } else { POWER_HILOGW(MODULE_SERVICE, @@ -761,36 +765,38 @@ void PowerStateMachine::SetDisplaySuspend(bool enable) if (GetState() == PowerState::INACTIVE) { POWER_HILOGI(MODULE_SERVICE, "Change display state"); if (enable) { - stateAction_->SetDisplayState(DisplayState::DISPLAY_SUSPEND); + stateAction_->SetDisplayState(DisplayState::DISPLAY_SUSPEND, + StateChangeReason::STATE_CHANGE_REASON_APPLICATION); } else { - stateAction_->SetDisplayState(DisplayState::DISPLAY_OFF); + stateAction_->SetDisplayState(DisplayState::DISPLAY_OFF, + StateChangeReason::STATE_CHANGE_REASON_APPLICATION); } } } -StateChangeReason PowerStateMachine::GetReasonByUserActivity(UserActivityType type) +StateChangeReason PowerStateMachine::GetReasonByUserWakeness(UserActivityType type) { - POWER_HILOGI(MODULE_SERVICE, "GetReasonByUserActivity Start:%{public}d", type); + POWER_HILOGI(MODULE_SERVICE, "GetReasonByUserWakeness Start:%{public}d", type); StateChangeReason ret = StateChangeReason::STATE_CHANGE_REASON_UNKNOWN; switch (type) { - case UserActivityType::USER_ACTIVITY_TYPE_BUTTON: + case UserActivityType::USER_WAKENESS_TYPE_BUTTON: ret = StateChangeReason::STATE_CHANGE_REASON_HARD_KEY; break; - case UserActivityType::USER_ACTIVITY_TYPE_TOUCH: + case UserActivityType::USER_WAKENESS_TYPE_TOUCH: ret = StateChangeReason::STATE_CHANGE_REASON_TOUCH; break; - case UserActivityType::USER_ACTIVITY_TYPE_ACCESSIBILITY: + case UserActivityType::USER_WAKENESS_TYPE_ACCESSIBILITY: ret = StateChangeReason::STATE_CHANGE_REASON_ACCESSIBILITY; break; - case UserActivityType::USER_ACTIVITY_TYPE_SOFTWARE: + case UserActivityType::USER_WAKENESS_TYPE_SOFTWARE: ret = StateChangeReason::STATE_CHANGE_REASON_APPLICATION; break; - case UserActivityType::USER_ACTIVITY_TYPE_ATTENTION: // fail through - case UserActivityType::USER_ACTIVITY_TYPE_OTHER: // fail through + case UserActivityType::USER_WAKENESS_TYPE_ATTENTION: // fail through + case UserActivityType::USER_WAKENESS_TYPE_OTHER: // fail through default: break; } - POWER_HILOGI(MODULE_SERVICE, "GetReasonByUserActivity: fun is End!"); + POWER_HILOGI(MODULE_SERVICE, "GetReasonByUserWakeness: fun is End!"); return ret; } @@ -934,7 +940,7 @@ TransitResult PowerStateMachine::StateController::TransitTo( POWER_HILOGE(MODULE_SERVICE, "TransitTo: running lock block"); return TransitResult::LOCKING; } - ret = action_(); + ret = action_(reason); if (ret == TransitResult::SUCCESS) { lastReason_ = reason; lastTime_ = GetTickCount(); diff --git a/services/native/src/powerms_event_handler.cpp b/services/native/src/powerms_event_handler.cpp index 0ee31b926db4941a4f131e625c6194f279775648..732e58c50978f8769185621247a76a1d3da57def 100644 --- a/services/native/src/powerms_event_handler.cpp +++ b/services/native/src/powerms_event_handler.cpp @@ -44,9 +44,9 @@ void PowermsEventHandler::ProcessEvent([[maybe_unused]] const AppExecFwk::InnerE runningLockMgr->CheckOverTime(); break; } - case CHECK_USER_ACTIVITY_TIMEOUT_MSG: // fallthrough - case CHECK_USER_ACTIVITY_OFF_TIMEOUT_MSG: // fallthrough - case CHECK_USER_ACTIVITY_SLEEP_TIMEOUT_MSG: // fallthrough + case CHECK_USER_WAKENESS_TIMEOUT_MSG: // fallthrough + case CHECK_USER_WAKENESS_OFF_TIMEOUT_MSG: // fallthrough + case CHECK_USER_WAKENESS_SLEEP_TIMEOUT_MSG: // fallthrough case SYSTEM_WAKE_UP_MSG: { auto powerStateMachine = pmsptr->GetPowerStateMachine(); if (powerStateMachine == nullptr) { @@ -55,6 +55,10 @@ void PowermsEventHandler::ProcessEvent([[maybe_unused]] const AppExecFwk::InnerE powerStateMachine->HandleDelayTimer(event->GetInnerEventId()); break; } + case POWER_KEY_TIMEOUT_MSG: { + pmsptr->HandlePowerKeyTimeout(); + break; + } default: POWER_HILOGD(MODULE_SERVICE, "PowermsEventHandler::no event id matched."); } diff --git a/services/native/src/running_lock_mgr.cpp b/services/native/src/running_lock_mgr.cpp index 84005099d6ed6d8f57d8fbda485e46594c965a83..c045705b1ea70680496d8f8434feb80d7c1a6f1a 100644 --- a/services/native/src/running_lock_mgr.cpp +++ b/services/native/src/running_lock_mgr.cpp @@ -95,9 +95,9 @@ void RunningLockMgr::InitLocksTypeScreen() stateMachine->SetState(PowerState::AWAKE, StateChangeReason::STATE_CHANGE_REASON_RUNNING_LOCK); stateMachine->CancelDelayTimer( - PowermsEventHandler::CHECK_USER_ACTIVITY_TIMEOUT_MSG); + PowermsEventHandler::CHECK_USER_WAKENESS_TIMEOUT_MSG); stateMachine->CancelDelayTimer( - PowermsEventHandler::CHECK_USER_ACTIVITY_OFF_TIMEOUT_MSG); + PowermsEventHandler::CHECK_USER_WAKENESS_OFF_TIMEOUT_MSG); } else { POWER_HILOGI(MODULE_SERVICE, "RUNNINGLOCK_SCREEN inactive!"); if (stateMachine->GetState() == PowerState::AWAKE) { @@ -134,7 +134,7 @@ void RunningLockMgr::InitLocksTypeBackground() if (active) { POWER_HILOGI(MODULE_SERVICE, "RUNNINGLOCK_BACKGROUND active!"); stateMachine->CancelDelayTimer( - PowermsEventHandler::CHECK_USER_ACTIVITY_SLEEP_TIMEOUT_MSG); + PowermsEventHandler::CHECK_USER_WAKENESS_SLEEP_TIMEOUT_MSG); pSysLock->Lock(); } else { POWER_HILOGI(MODULE_SERVICE, "RUNNINGLOCK_BACKGROUND inactive!"); @@ -185,9 +185,9 @@ void RunningLockMgr::InitLocksTypeProximity() StateChangeReason::STATE_CHANGE_REASON_RUNNING_LOCK, true); } stateMachine->CancelDelayTimer( - PowermsEventHandler::CHECK_USER_ACTIVITY_TIMEOUT_MSG); + PowermsEventHandler::CHECK_USER_WAKENESS_TIMEOUT_MSG); stateMachine->CancelDelayTimer( - PowermsEventHandler::CHECK_USER_ACTIVITY_OFF_TIMEOUT_MSG); + PowermsEventHandler::CHECK_USER_WAKENESS_OFF_TIMEOUT_MSG); pSysLock->Lock(); } else { POWER_HILOGI(MODULE_SERVICE, diff --git a/services/native/test/unittest/mock/mock_state_action.h b/services/native/test/unittest/mock/mock_state_action.h index a0040ed5b92102f6cf2b5b487170650a47103ec0..4fb9e84c860ab1f276fb844657a21edb4e95b65a 100644 --- a/services/native/test/unittest/mock/mock_state_action.h +++ b/services/native/test/unittest/mock/mock_state_action.h @@ -31,7 +31,7 @@ public: const std::string& details, const std::string& pkgName)); MOCK_METHOD3(RefreshActivity, void(int64_t callTimeMs, UserActivityType type, uint32_t flags)); MOCK_METHOD0(GetDisplayState, DisplayState()); - MOCK_METHOD1(SetDisplayState, uint32_t(DisplayState state)); + MOCK_METHOD2(SetDisplayState, uint32_t(DisplayState state, StateChangeReason reason)); MOCK_METHOD3(GoToSleep, uint32_t(std::function onSuspend, std::function onWakeup, bool force)); }; } // namespace PowerMgr diff --git a/services/native/test/unittest/src/power_mgr_mock_test.cpp b/services/native/test/unittest/src/power_mgr_mock_test.cpp index c8b4460964bbd7ee876304f085e7c67fc83d3409..fc8449e6b46d0649749900d67dcdb91146fd38eb 100644 --- a/services/native/test/unittest/src/power_mgr_mock_test.cpp +++ b/services/native/test/unittest/src/power_mgr_mock_test.cpp @@ -129,7 +129,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest003, TestSize.Level2) } POWER_HILOGD(MODULE_SERVICE, "PowerMgrUnittest003:Start mock."); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -158,7 +158,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest004, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrUnittest004: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -186,7 +186,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest005, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrUnittest005: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -214,7 +214,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest006, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrUnittest006: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -242,7 +242,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest007, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrUnittest007: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -270,7 +270,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest008, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrUnittest008: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -298,7 +298,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest009, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrUnittest009: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -326,7 +326,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest010, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrUnittest010: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -354,7 +354,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest011, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrUnittest011: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -383,7 +383,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest012, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -413,7 +413,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest013, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -443,7 +443,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest014, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -473,7 +473,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest015, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -503,7 +503,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest016, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -533,7 +533,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest017, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -563,7 +563,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest018, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -593,7 +593,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest019, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -623,7 +623,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest020, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -653,7 +653,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest021, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -683,7 +683,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest022, TestSize.Level2) } pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_UNKNOWN, std::string("test")); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -755,12 +755,12 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest024, TestSize.Level2) EXPECT_CALL(*g_stateAction, GetDisplayState()) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, - RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_TOUCH, _)).Times(1); - pms->RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_TOUCH, true); + RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_TOUCH, _)).Times(1); + pms->RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_TOUCH, true); sleep(SCREEN_OFF_WAIT_TIME_S + SLEEP_WAIT_TIME_S + 1); ResetMockAction(); @@ -920,7 +920,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest030, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)).Times(0); sleep(SCREEN_DIM_WAIT_TIME_S + 1); pms->UnLock(token); @@ -984,7 +984,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest032, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrUnittest032: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)).Times(0); sptr token = new RunningLockTokenStub(); RunningLockInfo info("test1", RunningLockType::RUNNINGLOCK_PROXIMITY_SCREEN_CONTROL); pms->CreateRunningLock(token, info); @@ -993,7 +993,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest032, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)).Times(0); sleep(SCREEN_DIM_WAIT_TIME_S + 1); EXPECT_CALL(*g_lockAction, Unlock(_, _)).Times(1); @@ -1054,12 +1054,12 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest034, TestSize.Level2) EXPECT_CALL(*g_stateAction, GetDisplayState()) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, - RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_OTHER, _)).Times(1); - pms->RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_OTHER, true); + RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_OTHER, _)).Times(1); + pms->RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_OTHER, true); sleep(SCREEN_OFF_WAIT_TIME_S + SLEEP_WAIT_TIME_S + 1); ResetMockAction(); @@ -1086,12 +1086,12 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest035, TestSize.Level2) EXPECT_CALL(*g_stateAction, GetDisplayState()) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, - RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_BUTTON, _)).Times(1); - pms->RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_BUTTON, true); + RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_BUTTON, _)).Times(1); + pms->RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_BUTTON, true); sleep(SCREEN_OFF_WAIT_TIME_S + SLEEP_WAIT_TIME_S + 1); ResetMockAction(); @@ -1118,12 +1118,12 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest036, TestSize.Level2) EXPECT_CALL(*g_stateAction, GetDisplayState()) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, - RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_ACCESSIBILITY, _)).Times(1); - pms->RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_ACCESSIBILITY, true); + RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_ACCESSIBILITY, _)).Times(1); + pms->RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_ACCESSIBILITY, true); sleep(SCREEN_OFF_WAIT_TIME_S + SLEEP_WAIT_TIME_S + 1); ResetMockAction(); @@ -1150,12 +1150,12 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest037, TestSize.Level2) EXPECT_CALL(*g_stateAction, GetDisplayState()) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, - RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_ATTENTION, _)).Times(1); - pms->RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_ATTENTION, true); + RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_ATTENTION, _)).Times(1); + pms->RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_ATTENTION, true); sleep(SCREEN_OFF_WAIT_TIME_S + SLEEP_WAIT_TIME_S + 1); ResetMockAction(); @@ -1182,12 +1182,12 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest038, TestSize.Level2) EXPECT_CALL(*g_stateAction, GetDisplayState()) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, - RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_SOFTWARE, _)).Times(1); - pms->RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_SOFTWARE, true); + RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_SOFTWARE, _)).Times(1); + pms->RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_SOFTWARE, true); sleep(SCREEN_OFF_WAIT_TIME_S + SLEEP_WAIT_TIME_S + 1); ResetMockAction(); @@ -1252,7 +1252,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest040, TestSize.Level2) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); EXPECT_CALL(*g_stateAction, RefreshActivity(0, _, _)).Times(0); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->RefreshActivity(0, abnormaltype, true); @@ -1281,7 +1281,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest041, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(0); EXPECT_CALL(*g_stateAction, Wakeup(0, _, @@ -1312,7 +1312,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest042, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(0); EXPECT_CALL(*g_stateAction, Wakeup(0, _, @@ -1347,7 +1347,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest043, TestSize.Level2) sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*1/3) + 1); @@ -1375,7 +1375,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest044, TestSize.Level2) } pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_UNKNOWN, std::string("test")); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); ON_CALL(*g_stateAction, GetDisplayState()) @@ -1412,7 +1412,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest045, TestSize.Level2) sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) /2); @@ -1503,7 +1503,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest048, TestSize.Level2) } pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_POWER_BUTTON, std::string("test")); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -1541,7 +1541,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest049, TestSize.Level2) pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_POWER_BUTTON, std::string("test")); EXPECT_CALL(*g_stateAction, Suspend(0, _, false)).Times(0); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)).Times(0); pms->SuspendDevice(0, abnormaltype, false); EXPECT_EQ(PowerState::AWAKE, pms->GetState()); @@ -1570,7 +1570,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest050, TestSize.Level2) pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_POWER_BUTTON, std::string("test")); EXPECT_CALL(*g_stateAction, Suspend(0, _, false)).Times(0); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)).Times(0); pms->SuspendDevice(0, abnormaltype, false); EXPECT_EQ(PowerState::AWAKE, pms->GetState()); @@ -1596,7 +1596,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest051, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -1718,13 +1718,13 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest055, TestSize.Level2) pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_LID, std::string("test")); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*1/3) + 1); @@ -1750,7 +1750,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest056, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrUnittest056: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)).Times(0); sptr token = new RunningLockTokenStub(); RunningLockInfo info("test1", RunningLockType::RUNNINGLOCK_SCREEN); pms->CreateRunningLock(token, info); @@ -1758,7 +1758,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest056, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)).Times(0); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); @@ -1791,7 +1791,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest057, TestSize.Level2) sptr token = new RunningLockTokenStub(); RunningLockInfo info("test1", RunningLockType::RUNNINGLOCK_SCREEN); pms->CreateRunningLock(token, info); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->Lock(token, info, 0); @@ -1822,10 +1822,10 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest058, TestSize.Level2) } ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->SetDisplayOffTime(time); @@ -1860,7 +1860,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest059, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)).Times(0); sleep(SCREEN_DIM_WAIT_TIME_S + 1); pms->UnLock(token); @@ -1893,10 +1893,10 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest060, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)).Times(0); sleep(SLEEP_WAIT_TIME_S*10); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)).Times(0); EXPECT_EQ(PowerState::AWAKE, pms->GetState()); @@ -1929,7 +1929,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest061, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)).Times(0); sleep(SCREEN_OFF_WAIT_TIME_S + 1); pms->UnLock(token); @@ -1966,7 +1966,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest062, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); @@ -2169,7 +2169,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest067, TestSize.Level2) ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*1/3) + 1); @@ -2210,7 +2210,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest068, TestSize.Level2) ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); pms->CreateRunningLock(token, info); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, GoToSleep(_, _, _)).Times(0); @@ -2261,12 +2261,12 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest069, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); sleep(SLEEP_WAIT_TIME_S + 1); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_UNKNOWN, std::string("test")); sleep(SLEEP_WAIT_TIME_S + 1); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)).Times(0); EXPECT_CALL(*g_lockAction, Unlock(_, _)).Times(1); pms->UnLock(token); EXPECT_EQ(pms->IsUsed(token), false); @@ -2335,12 +2335,12 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest071, TestSize.Level2) sptr token = new RunningLockTokenStub(); RunningLockInfo info("test1", RunningLockType::RUNNINGLOCK_PROXIMITY_SCREEN_CONTROL); pms->CreateRunningLock(token, info); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); EXPECT_EQ(PowerState::INACTIVE, pms->GetState()); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(SCREEN_OFF_WAIT_TIME_S + 1); @@ -2379,7 +2379,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest072, TestSize.Level2) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_EQ(pms->ForceSuspendDevice(0), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(SCREEN_OFF_WAIT_TIME_S + 1); @@ -2424,7 +2424,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest073, TestSize.Level2) sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*1/3) + 1); @@ -2466,7 +2466,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest074, TestSize.Level2) EXPECT_EQ(pms->IsUsed(token), true); sleep(SCREEN_OFF_WAIT_TIME_S+1); EXPECT_EQ(PowerState::AWAKE, pms->GetState()); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, GoToSleep(_, _, _)).Times(0); @@ -2501,7 +2501,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest075, TestSize.Level2) sleep(SLEEP_WAIT_TIME_S*10); EXPECT_EQ(PowerState::AWAKE, pms->GetState()); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, GoToSleep(_, _, _)).Times(0); @@ -2543,7 +2543,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest076, TestSize.Level2) } pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, GoToSleep(_, _, _)).Times(0); @@ -2577,7 +2577,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest077, TestSize.Level2) EXPECT_CALL(*g_lockAction, Lock(_, _)).Times(1); pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, GoToSleep(_, _, false)) @@ -2690,7 +2690,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest080, TestSize.Level2) sleep(((time/1000)*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(time/1000*1/3+1); @@ -2730,7 +2730,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest081, TestSize.Level2) sleep(((time/1000)*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(((time/1000)*1/3)+1); @@ -2769,7 +2769,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest082, TestSize.Level2) sleep(((time/1000)*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(time/1000*1/3+1); @@ -2807,7 +2807,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest083, TestSize.Level2) sleep(((time/1000)*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(time/1000*1/3+1); @@ -2845,7 +2845,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest084, TestSize.Level2) sleep(((time/1000)*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(time/1000*1/3+1); @@ -2883,7 +2883,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest085, TestSize.Level2) sleep(((time/1000)*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(time/1000*1/3+1); @@ -2920,10 +2920,10 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest086, TestSize.Level2) POWER_HILOGD(MODULE_SERVICE, "PowerMgrUnittest086:DeviceStateAction::SetDisplayState."); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); POWER_HILOGD(MODULE_SERVICE, "PowerMgrUnittest086:Start sleep."); @@ -2957,10 +2957,10 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest087, TestSize.Level2) } ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->SetDisplayOffTime(time); @@ -2992,10 +2992,10 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest088, TestSize.Level2) } ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->SetDisplayOffTime(time); @@ -3026,10 +3026,10 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest089, TestSize.Level2) } ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->SetDisplayOffTime(time); @@ -3060,10 +3060,10 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest090, TestSize.Level2) } ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->SetDisplayOffTime(time); @@ -3106,7 +3106,7 @@ HWTEST_F (PowerMgrMockTest, PowerMgrUnittest091, TestSize.Level2) sleep((SCREEN_OFF_WAIT_TIME_S*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*1/3) + 1); diff --git a/test/systemtest/mock/mock_state_action.h b/test/systemtest/mock/mock_state_action.h index a0040ed5b92102f6cf2b5b487170650a47103ec0..4fb9e84c860ab1f276fb844657a21edb4e95b65a 100644 --- a/test/systemtest/mock/mock_state_action.h +++ b/test/systemtest/mock/mock_state_action.h @@ -31,7 +31,7 @@ public: const std::string& details, const std::string& pkgName)); MOCK_METHOD3(RefreshActivity, void(int64_t callTimeMs, UserActivityType type, uint32_t flags)); MOCK_METHOD0(GetDisplayState, DisplayState()); - MOCK_METHOD1(SetDisplayState, uint32_t(DisplayState state)); + MOCK_METHOD2(SetDisplayState, uint32_t(DisplayState state, StateChangeReason reason)); MOCK_METHOD3(GoToSleep, uint32_t(std::function onSuspend, std::function onWakeup, bool force)); }; } // namespace PowerMgr diff --git a/test/systemtest/src/power_mgr_mock_system_test.cpp b/test/systemtest/src/power_mgr_mock_system_test.cpp index 00b30e395a53de570913e7643e8fc65fefea484f..d620b48b4d49f59c28739d1d7b9963bf8ca976b9 100644 --- a/test/systemtest/src/power_mgr_mock_system_test.cpp +++ b/test/systemtest/src/power_mgr_mock_system_test.cpp @@ -78,7 +78,7 @@ HWTEST_F (PowerMgrMockSystemTest, PowerMgrMock102, TestSize.Level2) } POWER_HILOGD(MODULE_SERVICE, "PowerMgrMock102:Start mock."); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_SUSPEND)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_SUSPEND, testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -109,7 +109,7 @@ HWTEST_F (PowerMgrMockSystemTest, PowerMgrMock103, TestSize.Level2) } pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_UNKNOWN, std::string("test")); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_SUSPEND)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_SUSPEND, testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -146,7 +146,7 @@ HWTEST_F (PowerMgrMockSystemTest, PowerMgrMock104, TestSize.Level2) sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_SUSPEND)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_SUSPEND, testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*1/3) + 1); @@ -180,7 +180,7 @@ HWTEST_F (PowerMgrMockSystemTest, PowerMgrMock105, TestSize.Level2) sleep(((time/1000)*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_SUSPEND)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_SUSPEND, testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(((time/1000)*1/3)+1); @@ -216,7 +216,7 @@ HWTEST_F (PowerMgrMockSystemTest, PowerMgrMock106, TestSize.Level2) EXPECT_EQ(pms->IsUsed(token), true); sleep(SLEEP_WAIT_TIME_S*10); EXPECT_EQ(PowerState::AWAKE, pms->GetState()); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_SUSPEND)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_SUSPEND, testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, GoToSleep(_, _, _)).Times(0); @@ -253,7 +253,7 @@ HWTEST_F (PowerMgrMockSystemTest, PowerMgrMock107, TestSize.Level2) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); pms->SetDisplaySuspend(true); pms->CreateRunningLock(token, info); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_SUSPEND)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_SUSPEND, testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, GoToSleep(_, _, _)).Times(0); diff --git a/test/systemtest/src/power_mgr_powersavemode_test.cpp b/test/systemtest/src/power_mgr_powersavemode_test.cpp index f3db086ae0acd224a1597b9c7389e269a78f1411..2c703418d17263b81e716e724b06f47e38caa85c 100644 --- a/test/systemtest/src/power_mgr_powersavemode_test.cpp +++ b/test/systemtest/src/power_mgr_powersavemode_test.cpp @@ -26,7 +26,6 @@ #include "power_state_machine.h" #include "sys_param.h" #include "power_state_machine_info.h" -#include "display_info.h" #include "running_lock_info.h" #include "running_lock.h" #include "ipower_mode_callback.h" diff --git a/test/systemtest/src/power_mgr_st_mock_test.cpp b/test/systemtest/src/power_mgr_st_mock_test.cpp index 3b6c3e4ea58f6e1ddcfce9e8af05dddf756c7832..a13dc945bf18c317ac9be308b71b090b33456e9d 100644 --- a/test/systemtest/src/power_mgr_st_mock_test.cpp +++ b/test/systemtest/src/power_mgr_st_mock_test.cpp @@ -129,7 +129,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock003, TestSize.Level2) } POWER_HILOGD(MODULE_SERVICE, "PowerMgrMock003:Start mock."); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -158,7 +158,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock004, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrMock004: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -186,7 +186,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock005, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrMock005: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -214,7 +214,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock006, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrMock006: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -242,7 +242,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock007, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrMock007: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -270,7 +270,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock008, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrMock008: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -298,7 +298,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock009, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrMock009: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -326,7 +326,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock010, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrMock010: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -354,7 +354,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock011, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrMock011: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -383,7 +383,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock012, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -413,7 +413,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock013, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -443,7 +443,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock014, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -473,7 +473,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock015, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -503,7 +503,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock016, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -533,7 +533,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock017, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -563,7 +563,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock018, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -593,7 +593,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock019, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -623,7 +623,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock020, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -653,7 +653,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock021, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -683,7 +683,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock022, TestSize.Level2) } pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_UNKNOWN, std::string("test")); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -755,12 +755,12 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock024, TestSize.Level2) EXPECT_CALL(*g_stateAction, GetDisplayState()) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, - RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_TOUCH, _)).Times(1); - pms->RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_TOUCH, true); + RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_TOUCH, _)).Times(1); + pms->RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_TOUCH, true); sleep(SCREEN_OFF_WAIT_TIME_S + SLEEP_WAIT_TIME_S + 1); ResetMockAction(); @@ -920,7 +920,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock030, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)).Times(0); sleep(SCREEN_DIM_WAIT_TIME_S + 1); pms->UnLock(token); @@ -984,7 +984,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock032, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrMock032: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)).Times(0); sptr token = new RunningLockTokenStub(); RunningLockInfo info("test1", RunningLockType::RUNNINGLOCK_PROXIMITY_SCREEN_CONTROL); pms->CreateRunningLock(token, info); @@ -993,7 +993,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock032, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)).Times(0); sleep(SCREEN_DIM_WAIT_TIME_S + 1); EXPECT_CALL(*g_lockAction, Unlock(_, _)).Times(1); @@ -1054,12 +1054,12 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock034, TestSize.Level2) EXPECT_CALL(*g_stateAction, GetDisplayState()) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, - RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_OTHER, _)).Times(1); - pms->RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_OTHER, true); + RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_OTHER, _)).Times(1); + pms->RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_OTHER, true); sleep(SCREEN_OFF_WAIT_TIME_S + SLEEP_WAIT_TIME_S + 1); ResetMockAction(); @@ -1086,12 +1086,12 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock035, TestSize.Level2) EXPECT_CALL(*g_stateAction, GetDisplayState()) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, - RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_BUTTON, _)).Times(1); - pms->RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_BUTTON, true); + RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_BUTTON, _)).Times(1); + pms->RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_BUTTON, true); sleep(SCREEN_OFF_WAIT_TIME_S + SLEEP_WAIT_TIME_S + 1); ResetMockAction(); @@ -1118,12 +1118,12 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock036, TestSize.Level2) EXPECT_CALL(*g_stateAction, GetDisplayState()) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, - RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_ACCESSIBILITY, _)).Times(1); - pms->RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_ACCESSIBILITY, true); + RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_ACCESSIBILITY, _)).Times(1); + pms->RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_ACCESSIBILITY, true); sleep(SCREEN_OFF_WAIT_TIME_S + SLEEP_WAIT_TIME_S + 1); ResetMockAction(); @@ -1150,12 +1150,12 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock037, TestSize.Level2) EXPECT_CALL(*g_stateAction, GetDisplayState()) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, - RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_ATTENTION, _)).Times(1); - pms->RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_ATTENTION, true); + RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_ATTENTION, _)).Times(1); + pms->RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_ATTENTION, true); sleep(SCREEN_OFF_WAIT_TIME_S + SLEEP_WAIT_TIME_S + 1); ResetMockAction(); @@ -1182,12 +1182,12 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock038, TestSize.Level2) EXPECT_CALL(*g_stateAction, GetDisplayState()) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, - RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_SOFTWARE, _)).Times(1); - pms->RefreshActivity(0, UserActivityType::USER_ACTIVITY_TYPE_SOFTWARE, true); + RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_SOFTWARE, _)).Times(1); + pms->RefreshActivity(0, UserActivityType::USER_WAKENESS_TYPE_SOFTWARE, true); sleep(SCREEN_OFF_WAIT_TIME_S + SLEEP_WAIT_TIME_S + 1); ResetMockAction(); @@ -1251,7 +1251,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock040, TestSize.Level2) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); EXPECT_CALL(*g_stateAction, RefreshActivity(0, _, _)).Times(0); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->RefreshActivity(0, abnormaltype, true); @@ -1280,7 +1280,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock041, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(0); EXPECT_CALL(*g_stateAction, Wakeup(0, _, @@ -1311,7 +1311,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock042, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(0); EXPECT_CALL(*g_stateAction, Wakeup(0, _, @@ -1346,7 +1346,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock043, TestSize.Level2) sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*1/3) + 1); @@ -1374,7 +1374,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock044, TestSize.Level2) } pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_UNKNOWN, std::string("test")); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); ON_CALL(*g_stateAction, GetDisplayState()) @@ -1411,7 +1411,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock045, TestSize.Level2) sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) /2); @@ -1502,7 +1502,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock048, TestSize.Level2) } pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_POWER_BUTTON, std::string("test")); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -1540,7 +1540,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock049, TestSize.Level2) pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_POWER_BUTTON, std::string("test")); EXPECT_CALL(*g_stateAction, Suspend(0, _, false)).Times(0); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)).Times(0); pms->SuspendDevice(0, abnormaltype, false); EXPECT_EQ(PowerState::AWAKE, pms->GetState()); @@ -1569,7 +1569,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock050, TestSize.Level2) pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_POWER_BUTTON, std::string("test")); EXPECT_CALL(*g_stateAction, Suspend(0, _, false)).Times(0); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)).Times(0); pms->SuspendDevice(0, abnormaltype, false); EXPECT_EQ(PowerState::AWAKE, pms->GetState()); @@ -1595,7 +1595,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock051, TestSize.Level2) } pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, @@ -1717,13 +1717,13 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock055, TestSize.Level2) pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_LID, std::string("test")); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*1/3) + 1); @@ -1749,7 +1749,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock056, TestSize.Level2) GTEST_LOG_(INFO) << "PowerMgrMock056: Failed to get PowerMgrService"; } - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)).Times(0); sptr token = new RunningLockTokenStub(); RunningLockInfo info("test1", RunningLockType::RUNNINGLOCK_SCREEN); pms->CreateRunningLock(token, info); @@ -1757,7 +1757,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock056, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)).Times(0); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); @@ -1790,7 +1790,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock057, TestSize.Level2) sptr token = new RunningLockTokenStub(); RunningLockInfo info("test1", RunningLockType::RUNNINGLOCK_SCREEN); pms->CreateRunningLock(token, info); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->Lock(token, info, 0); @@ -1821,10 +1821,10 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock058, TestSize.Level2) } ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->SetDisplayOffTime(time); @@ -1859,7 +1859,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock059, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)).Times(0); sleep(SCREEN_DIM_WAIT_TIME_S + 1); pms->UnLock(token); @@ -1891,9 +1891,9 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock060, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)).Times(0); sleep(SLEEP_WAIT_TIME_S*10); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)).Times(0); EXPECT_EQ(PowerState::AWAKE, pms->GetState()); ResetMockAction(); @@ -1924,7 +1924,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock061, TestSize.Level2) for (i=0; i<10; i++) { pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)).Times(0); sleep(SCREEN_OFF_WAIT_TIME_S + 1); pms->UnLock(token); EXPECT_EQ(pms->IsUsed(token), false); @@ -1960,7 +1960,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock062, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); @@ -2161,7 +2161,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock067, TestSize.Level2) sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*1/3) + 1); @@ -2200,7 +2200,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock068, TestSize.Level2) ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); pms->CreateRunningLock(token, info); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, GoToSleep(_, _, _)).Times(0); @@ -2251,12 +2251,12 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock069, TestSize.Level2) pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); sleep(SLEEP_WAIT_TIME_S + 1); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->WakeupDevice(0, WakeupDeviceType::WAKEUP_DEVICE_UNKNOWN, std::string("test")); sleep(SLEEP_WAIT_TIME_S + 1); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)).Times(0); + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)).Times(0); EXPECT_CALL(*g_lockAction, Unlock(_, _)).Times(1); pms->UnLock(token); @@ -2328,12 +2328,12 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock071, TestSize.Level2) sptr token = new RunningLockTokenStub(); RunningLockInfo info("test1", RunningLockType::RUNNINGLOCK_PROXIMITY_SCREEN_CONTROL); pms->CreateRunningLock(token, info); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->SuspendDevice(0, SuspendDeviceType::SUSPEND_DEVICE_REASON_APPLICATION, false); EXPECT_EQ(PowerState::INACTIVE, pms->GetState()); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(SCREEN_OFF_WAIT_TIME_S + 1); @@ -2373,7 +2373,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock072, TestSize.Level2) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_EQ(pms->ForceSuspendDevice(0), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_ON, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(SCREEN_OFF_WAIT_TIME_S + 1); @@ -2419,7 +2419,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock073, TestSize.Level2) sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*1/3) + 1); @@ -2462,7 +2462,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock074, TestSize.Level2) EXPECT_EQ(pms->IsUsed(token), true); sleep(SCREEN_OFF_WAIT_TIME_S+1); EXPECT_EQ(PowerState::AWAKE, pms->GetState()); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, GoToSleep(_, _, _)).Times(0); @@ -2496,7 +2496,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock075, TestSize.Level2) EXPECT_EQ(pms->IsUsed(token), true); sleep(SLEEP_WAIT_TIME_S*10); EXPECT_EQ(PowerState::AWAKE, pms->GetState()); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, GoToSleep(_, _, _)).Times(0); @@ -2538,7 +2538,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock076, TestSize.Level2) } pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, GoToSleep(_, _, _)).Times(0); @@ -2572,7 +2572,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock077, TestSize.Level2) EXPECT_CALL(*g_lockAction, Lock(_, _)).Times(1); pms->Lock(token, info, 0); EXPECT_EQ(pms->IsUsed(token), true); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); EXPECT_CALL(*g_stateAction, GoToSleep(_, _, false)) @@ -2689,7 +2689,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock080, TestSize.Level2) sleep(((time/1000)*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(time/1000*1/3+1); @@ -2729,7 +2729,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock081, TestSize.Level2) sleep(((time/1000)*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(((time/1000)*1/3)+1); @@ -2768,7 +2768,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock082, TestSize.Level2) sleep(((time/1000)*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(time/1000*1/3+1); @@ -2806,7 +2806,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock083, TestSize.Level2) sleep(((time/1000)*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(time/1000*1/3+1); @@ -2844,7 +2844,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock084, TestSize.Level2) sleep(((time/1000)*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(time/1000*1/3+1); @@ -2882,7 +2882,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock085, TestSize.Level2) sleep(((time/1000)*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep(time/1000*1/3+1); @@ -2919,10 +2919,10 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock086, TestSize.Level2) POWER_HILOGD(MODULE_SERVICE, "PowerMgrMock086:DeviceStateAction::SetDisplayState."); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); POWER_HILOGD(MODULE_SERVICE, "PowerMgrMock086:Start sleep."); @@ -2956,10 +2956,10 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock087, TestSize.Level2) } ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->SetDisplayOffTime(time); @@ -2991,10 +2991,10 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock088, TestSize.Level2) } ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->SetDisplayOffTime(time); @@ -3025,10 +3025,10 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock089, TestSize.Level2) } ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->SetDisplayOffTime(time); @@ -3059,10 +3059,10 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock090, TestSize.Level2) } ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); pms->SetDisplayOffTime(time); @@ -3105,7 +3105,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock091, TestSize.Level2) sleep((SCREEN_OFF_WAIT_TIME_S*2/3)+1); ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_DIM)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_OFF, ::testing::_)) .Times(::testing::AtLeast(1)) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*1/3) + 1); @@ -3134,7 +3134,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock092, TestSize.Level2) ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); @@ -3168,7 +3168,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock093, TestSize.Level2) ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); @@ -3202,7 +3202,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock094, TestSize.Level2) ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); @@ -3236,7 +3236,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock095, TestSize.Level2) ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); @@ -3270,7 +3270,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock096, TestSize.Level2) ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); @@ -3304,7 +3304,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock097, TestSize.Level2) ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); @@ -3338,7 +3338,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock098, TestSize.Level2) ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); @@ -3372,7 +3372,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock099, TestSize.Level2) ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); @@ -3406,7 +3406,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock100, TestSize.Level2) ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1); @@ -3440,7 +3440,7 @@ HWTEST_F (PowerMgrSTMockTest, PowerMgrMock101, TestSize.Level2) ON_CALL(*g_stateAction, GetDisplayState()) .WillByDefault(::testing::Return(DisplayState::DISPLAY_ON)); - EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM)) + EXPECT_CALL(*g_stateAction, SetDisplayState(DisplayState::DISPLAY_DIM, ::testing::_)) .Times(1) .WillOnce(::testing::Return(ActionResult::SUCCESS)); sleep((SCREEN_OFF_WAIT_TIME_S*2/3) + 1);