From 9e2d38846f5b7c5293a2a2cf4ce2ad81a7b4ebbe Mon Sep 17 00:00:00 2001 From: Mercurial <1366650684@qq.com> Date: Mon, 4 Aug 2025 16:17:06 +0800 Subject: [PATCH] DMS tdd fix Signed-off-by: Mercurial <1366650684@qq.com> --- window_scene/session/screen/src/screen_session.cpp | 2 +- .../dual_display_sensor_fold_state_manager_test.cpp | 3 +++ .../test/dms_unittest/screen_session_test.cpp | 12 ++++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/window_scene/session/screen/src/screen_session.cpp b/window_scene/session/screen/src/screen_session.cpp index 3c9195f5f3..2fbc7a8a50 100644 --- a/window_scene/session/screen/src/screen_session.cpp +++ b/window_scene/session/screen/src/screen_session.cpp @@ -2185,7 +2185,7 @@ void ScreenSession::SetForceCloseHdr(bool isForceCloseHdr) return; } if (lastCloseHdrStatus_ == isForceCloseHdr) { - TLOGD(WmsLogTag::DMS, "lastCloseHdrStatus_ and isForceCloseHdr are the same."); + TLOGE(WmsLogTag::DMS, "lastCloseHdrStatus_ and isForceCloseHdr are the same."); return; } lastCloseHdrStatus_ = isForceCloseHdr; diff --git a/window_scene/test/dms_unittest/dual_display_sensor_fold_state_manager_test.cpp b/window_scene/test/dms_unittest/dual_display_sensor_fold_state_manager_test.cpp index b28bf2c8be..3550f6c603 100644 --- a/window_scene/test/dms_unittest/dual_display_sensor_fold_state_manager_test.cpp +++ b/window_scene/test/dms_unittest/dual_display_sensor_fold_state_manager_test.cpp @@ -78,6 +78,9 @@ namespace { */ HWTEST_F(DualDisplaySensorFoldStateManagerTest, DualDisplaySensorFoldStateManager, TestSize.Level1) { + if (!FoldScreenStateInternel::IsDualDisplayFoldDevice()) { + GTEST_SKIP(); + } std::shared_ptr screenPowerTaskScheduler = nullptr; DualDisplaySensorFoldStateManager mgr = DualDisplaySensorFoldStateManager(screenPowerTaskScheduler); ASSERT_EQ(mgr.packageNames_.size(), 1); diff --git a/window_scene/test/dms_unittest/screen_session_test.cpp b/window_scene/test/dms_unittest/screen_session_test.cpp index fa5b82ac5d..6f26d804be 100644 --- a/window_scene/test/dms_unittest/screen_session_test.cpp +++ b/window_scene/test/dms_unittest/screen_session_test.cpp @@ -4027,11 +4027,13 @@ HWTEST_F(ScreenSessionTest, GetChildCount, TestSize.Level1) HWTEST_F(ScreenSessionTest, SetForceCloseHdr, TestSize.Level1) { GTEST_LOG_(INFO) << "ScreenSessionTest: SetForceCloseHdr start"; - sptr session = sptr::MakeSptr(); + LOG_SetCallback(MyLogCallback); + ScreenProperty newScreenProperty; + sptr session = sptr::MakeSptr(0,newScreenProperty,0); ASSERT_NE(session, nullptr); session->SetForceCloseHdr(true); session->SetForceCloseHdr(false); - EXPECT_TRUE(g_errLog.find("Start get screen status.") != std::string::npos); + EXPECT_FALSE(g_errLog.find("Start get screen status.") != std::string::npos); GTEST_LOG_(INFO) << "ScreenSessionTest: SetForceCloseHdr end"; } @@ -4043,11 +4045,13 @@ HWTEST_F(ScreenSessionTest, SetForceCloseHdr, TestSize.Level1) HWTEST_F(ScreenSessionTest, SetForceCloseHdr01, TestSize.Level1) { GTEST_LOG_(INFO) << "ScreenSessionTest: SetForceCloseHdr start"; - sptr session = sptr::MakeSptr(); + LOG_SetCallback(MyLogCallback); + ScreenProperty newScreenProperty; + sptr session = sptr::MakeSptr(0,newScreenProperty,0); ASSERT_NE(session, nullptr); session->SetForceCloseHdr(false); session->SetForceCloseHdr(false); - EXPECT_TRUE(g_errLog.find("Start get screen status.") != std::string::npos); + EXPECT_TRUE(g_errLog.find("lastCloseHdrStatus_ and isForceCloseHdr are the same.") != std::string::npos); GTEST_LOG_(INFO) << "ScreenSessionTest: SetForceCloseHdr end"; } -- Gitee