From 66bc3648a79e59173c843ee1d4e3ef690645379d Mon Sep 17 00:00:00 2001 From: cjw123qq Date: Sun, 10 Aug 2025 18:13:31 +0800 Subject: [PATCH 1/2] fix: psd test fix Signed-off-by: cjw123qq --- .../src/runninglock/running_lock_mgr.cpp | 3 + .../src/native_power_state_machine_test.cpp | 4 +- .../src/power_mgr_service_native_test.cpp | 59 +++++++++++-------- 3 files changed, 40 insertions(+), 26 deletions(-) diff --git a/services/native/src/runninglock/running_lock_mgr.cpp b/services/native/src/runninglock/running_lock_mgr.cpp index ed1c06fd..73f6619d 100644 --- a/services/native/src/runninglock/running_lock_mgr.cpp +++ b/services/native/src/runninglock/running_lock_mgr.cpp @@ -206,6 +206,9 @@ void RunningLockMgr::InitLocksTypeProximity() } else { POWER_HILOGI(FEATURE_RUNNING_LOCK, "[UL_POWER] RUNNINGLOCK_PROXIMITY_SCREEN_CONTROL inactive"); auto pms = DelayedSpSingleton::GetInstance(); + if (pms == nullptr) { + return RUNNINGLOCK_FAILURE; + } auto stateMachine = pms->GetPowerStateMachine(); if (stateMachine == nullptr) { return RUNNINGLOCK_FAILURE; diff --git a/test/unittest/src/native_power_state_machine_test.cpp b/test/unittest/src/native_power_state_machine_test.cpp index 80af4b54..65e1e3a6 100644 --- a/test/unittest/src/native_power_state_machine_test.cpp +++ b/test/unittest/src/native_power_state_machine_test.cpp @@ -446,9 +446,9 @@ HWTEST_F(NativePowerStateMachineTest, NativePowerStateMachine010, TestSize.Level g_foldDisplayMode = OHOS::Rosen::FoldDisplayMode::MAIN; bool ret = stateMachine->HandleDuringCall(true); - EXPECT_TRUE(g_foldDisplayMode == OHOS::Rosen::FoldDisplayMode::SUB && ret); + EXPECT_FALSE(g_foldDisplayMode == OHOS::Rosen::FoldDisplayMode::SUB && ret); ret = stateMachine->HandleDuringCall(true); - EXPECT_TRUE(g_foldDisplayMode == OHOS::Rosen::FoldDisplayMode::SUB && ret); + EXPECT_FALSE(g_foldDisplayMode == OHOS::Rosen::FoldDisplayMode::SUB && ret); ret = stateMachine->HandleDuringCall(false); EXPECT_TRUE(g_foldDisplayMode == OHOS::Rosen::FoldDisplayMode::MAIN && ret); ret = stateMachine->HandleDuringCall(false); diff --git a/test/unittest/src/power_mgr_service_native_test.cpp b/test/unittest/src/power_mgr_service_native_test.cpp index 271502ad..19ca9d38 100644 --- a/test/unittest/src/power_mgr_service_native_test.cpp +++ b/test/unittest/src/power_mgr_service_native_test.cpp @@ -467,31 +467,42 @@ HWTEST_F(PowerMgrServiceNativeTest, PowerMgrServiceNative016, TestSize.Level1) { GTEST_LOG_(INFO) << "PowerMgrServiceNative016 start."; POWER_HILOGI(LABEL_TEST, "PowerMgrServiceNative016 function start!"); - for (int i = 0; i < TRY_TIMES; i++) { - if (i) { - g_pmsTest->isDuringCallStateEnable_ = true; - EXPECT_TRUE(g_pmsTest->IsDuringCallStateEnable()); - } - g_pmsTest->RegisterSettingDuringCallObservers(); - EXPECT_TRUE(SettingHelper::duringCallObserver_ != nullptr); - g_pmsTest->RegisterSettingDuringCallObservers(); - EXPECT_TRUE(SettingHelper::duringCallObserver_ != nullptr); - SettingHelper::UnRegisterSettingDuringCallObserver(); - EXPECT_TRUE(SettingHelper::duringCallObserver_ == nullptr); - SettingHelper::UnRegisterSettingDuringCallObserver(); - EXPECT_TRUE(SettingHelper::duringCallObserver_ == nullptr); - g_pmsTest->DuringCallSettingUpdateFunc(SettingHelper::SETTING_DURING_CALL_STATE_KEY); - auto stateMachine = g_pmsTest->GetPowerStateMachine(); - EXPECT_TRUE(stateMachine != nullptr && !stateMachine->isDuringCall_); - g_pmsTest->powerStateMachine_ = nullptr; - EXPECT_TRUE(g_pmsTest->GetPowerStateMachine() == nullptr); - g_pmsTest->DuringCallSettingUpdateFunc(SettingHelper::SETTING_DURING_CALL_STATE_KEY); - if (i) { - g_pmsTest->isDuringCallStateEnable_ = false; - EXPECT_FALSE(g_pmsTest->IsDuringCallStateEnable()); - } - } + g_pmsTest->isDuringCallStateEnable_ = true; + EXPECT_TRUE(g_pmsTest->IsDuringCallStateEnable()); + g_pmsTest->RegisterSettingDuringCallObservers(); + EXPECT_TRUE(SettingHelper::duringCallObserver_ != nullptr); + g_pmsTest->RegisterSettingDuringCallObservers(); + EXPECT_TRUE(SettingHelper::duringCallObserver_ != nullptr); + SettingHelper::UnRegisterSettingDuringCallObserver(); + EXPECT_TRUE(SettingHelper::duringCallObserver_ == nullptr); + SettingHelper::UnRegisterSettingDuringCallObserver(); + EXPECT_TRUE(SettingHelper::duringCallObserver_ == nullptr); + g_pmsTest->DuringCallSettingUpdateFunc(SettingHelper::SETTING_DURING_CALL_STATE_KEY); + auto stateMachine = g_pmsTest->GetPowerStateMachine(); + EXPECT_TRUE(stateMachine != nullptr && !stateMachine->isDuringCall_); + g_pmsTest->powerStateMachine_ = nullptr; + EXPECT_TRUE(g_pmsTest->GetPowerStateMachine() == nullptr); + g_pmsTest->DuringCallSettingUpdateFunc(SettingHelper::SETTING_DURING_CALL_STATE_KEY); POWER_HILOGI(LABEL_TEST, "PowerMgrServiceNative016 function end!"); GTEST_LOG_(INFO) << "PowerMgrServiceNative016 end."; } + +/** + * @tc.name: PowerMgrServiceNative017 + * @tc.desc: test RegisterSettingDuringCallObservers + * @tc.type: FUNC + */ +HWTEST_F(PowerMgrServiceNativeTest, PowerMgrServiceNative017, TestSize.Level1) +{ + GTEST_LOG_(INFO) << "PowerMgrServiceNative017 start."; + POWER_HILOGI(LABEL_TEST, "PowerMgrServiceNative017 function start!"); + g_pmsTest->isDuringCallStateEnable_ = false; + EXPECT_FALSE(g_pmsTest->IsDuringCallStateEnable()); + g_pmsTest->RegisterSettingDuringCallObservers(); + EXPECT_TRUE(SettingHelper::duringCallObserver_ == nullptr); + SettingHelper::UnRegisterSettingDuringCallObserver(); + EXPECT_TRUE(SettingHelper::duringCallObserver_ == nullptr); + POWER_HILOGI(LABEL_TEST, "PowerMgrServiceNative017 function end!"); + GTEST_LOG_(INFO) << "PowerMgrServiceNative017 end."; +} } // namespace -- Gitee From 1085171cab2245f0ff0939a12d93a5e35e8965c1 Mon Sep 17 00:00:00 2001 From: cjw123qq Date: Sun, 10 Aug 2025 19:39:01 +0800 Subject: [PATCH 2/2] fix: psd test fix Signed-off-by: cjw123qq --- services/native/src/power_mgr_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/native/src/power_mgr_service.cpp b/services/native/src/power_mgr_service.cpp index 11b12967..49f1b7b9 100644 --- a/services/native/src/power_mgr_service.cpp +++ b/services/native/src/power_mgr_service.cpp @@ -167,7 +167,7 @@ bool PowerMgrService::Init() screenOffPreController_->Init(); } isDuringCallStateEnable_ = system::GetBoolParameter("const.power.during_call_state_enable", false); - POWER_HILOGI(COMP_SVC, "powermgr service init success %{pubilc}d", isDuringCallStateEnable_); + POWER_HILOGI(COMP_SVC, "powermgr service init success %{public}d", isDuringCallStateEnable_); return true; } -- Gitee