From 859ea5a93b8af12720fe45d79027fce4982edc5f Mon Sep 17 00:00:00 2001 From: yecong2332 Date: Fri, 22 Aug 2025 23:05:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E5=A5=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yecong2332 --- .../test/unittest/scene_session_test.cpp | 12 ++++----- .../test/unittest/session_stub_test.cpp | 2 +- .../window_pattern_starting_window_test.cpp | 27 +++++++++++-------- .../window_scene_session_impl_test5.cpp | 2 +- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/window_scene/test/unittest/scene_session_test.cpp b/window_scene/test/unittest/scene_session_test.cpp index b030f899e8..ed7cf76dfe 100644 --- a/window_scene/test/unittest/scene_session_test.cpp +++ b/window_scene/test/unittest/scene_session_test.cpp @@ -821,22 +821,22 @@ HWTEST_F(SceneSessionTest, ColorMode01, TestSize.Level0) std::string colorMode = "dark"; bool hasDarkRes = true; auto ret = sceneSession->OnUpdateColorMode(colorMode, hasDarkRes); - EXPECT_NE(WMError::WM_OK, ret); + EXPECT_EQ(WMError::WM_OK, ret); std::string resMode = sceneSession->GetAbilityColorMode(); - EXPECT_NE("dark", resMode); + EXPECT_EQ("dark", resMode); hasDarkRes = false; ret = sceneSession->OnUpdateColorMode(colorMode, hasDarkRes); - EXPECT_NE(WMError::WM_OK, ret); + EXPECT_EQ(WMError::WM_OK, ret); resMode = sceneSession->GetAbilityColorMode(); - EXPECT_NE("auto", resMode); + EXPECT_EQ("auto", resMode); colorMode = "light"; ret = sceneSession->OnUpdateColorMode(colorMode, hasDarkRes); - EXPECT_NE(WMError::WM_OK, ret); + EXPECT_EQ(WMError::WM_OK, ret); resMode = sceneSession->GetAbilityColorMode(); - EXPECT_NE("light", resMode); + EXPECT_EQ("light", resMode); } /** diff --git a/window_scene/test/unittest/session_stub_test.cpp b/window_scene/test/unittest/session_stub_test.cpp index cf565667cb..dc4b3ed4f9 100644 --- a/window_scene/test/unittest/session_stub_test.cpp +++ b/window_scene/test/unittest/session_stub_test.cpp @@ -1221,7 +1221,7 @@ HWTEST_F(SessionStubTest, HandleUpdateColorMode, Function | SmallTest | Level2) data.WriteInterfaceToken(SessionStub::GetDescriptor()); uint32_t code = static_cast(SessionInterfaceCode::TRANS_ID_UPDATE_COLOR_MODE); - EXPECT_EQ(0, sessionStub->ProcessRemoteRequest(code, data, reply, option)); + EXPECT_EQ(5, sessionStub->ProcessRemoteRequest(code, data, reply, option)); } /** diff --git a/window_scene/test/unittest/window_pattern/window_pattern_starting_window_test.cpp b/window_scene/test/unittest/window_pattern/window_pattern_starting_window_test.cpp index 0b7a77dcba..fdd863414e 100644 --- a/window_scene/test/unittest/window_pattern/window_pattern_starting_window_test.cpp +++ b/window_scene/test/unittest/window_pattern/window_pattern_starting_window_test.cpp @@ -137,7 +137,8 @@ HWTEST_F(WindowPatternStartingWindowTest, GetStartupPage02, TestSize.Level1) StartingWindowInfo cachedInfo; cachedInfo.iconPathEarlyVersion_ = "pathFromCache"; ssm_->startingWindowMap_.clear(); - auto key = sessionInfo.moduleName_ + sessionInfo.abilityName_; + bool isDark = false; + auto key = sessionInfo.moduleName_ + sessionInfo.abilityName_ + std::to_string(isDark); std::map startingWindowInfoMap{ { key, cachedInfo } }; ssm_->startingWindowMap_.insert({ sessionInfo.bundleName_, startingWindowInfoMap }); StartingWindowInfo outInfo; @@ -293,14 +294,16 @@ HWTEST_F(WindowPatternStartingWindowTest, CacheStartingWindowInfo01, TestSize.Le /** * @tc.steps: step2. Cache info and check result. */ - ssm_->CacheStartingWindowInfo(abilityInfo.bundleName, abilityInfo.moduleName, abilityInfo.name, startingWindowInfo); + bool isDark = false; + ssm_->CacheStartingWindowInfo( + abilityInfo.bundleName, abilityInfo.moduleName, abilityInfo.name, startingWindowInfo, isDark); auto iter = ssm_->startingWindowMap_.find(abilityInfo.bundleName); ASSERT_NE(iter, ssm_->startingWindowMap_.end()); auto& infoMap = iter->second; - auto infoIter = infoMap.find(abilityInfo.moduleName + abilityInfo.name); + auto infoIter = infoMap.find(abilityInfo.moduleName + abilityInfo.name + std::to_string(isDark)); ASSERT_NE(infoIter, infoMap.end()); - ASSERT_EQ(infoIter->second.backgroundColorEarlyVersion_, 0xff000000); - ASSERT_EQ(infoIter->second.iconPathEarlyVersion_, "cachedPath"); + EXPECT_EQ(infoIter->second.backgroundColorEarlyVersion_, 0xff000000); + EXPECT_EQ(infoIter->second.iconPathEarlyVersion_, "cachedPath"); } /** @@ -337,14 +340,16 @@ HWTEST_F(WindowPatternStartingWindowTest, CacheStartingWindowInfo02, TestSize.Le /** * @tc.steps: step3. Execute and check result. */ - ssm_->CacheStartingWindowInfo(abilityInfo.bundleName, abilityInfo.moduleName, abilityInfo.name, startingWindowInfo); + bool isDark = false; + ssm_->CacheStartingWindowInfo( + abilityInfo.bundleName, abilityInfo.moduleName, abilityInfo.name, startingWindowInfo, isDark); auto iter = ssm_->startingWindowMap_.find(abilityInfo.bundleName); ASSERT_NE(iter, ssm_->startingWindowMap_.end()); auto& infoMap = iter->second; - auto infoIter = infoMap.find(abilityInfo.moduleName + abilityInfo.name); + auto infoIter = infoMap.find(abilityInfo.moduleName + abilityInfo.name + std::to_string(isDark)); ASSERT_NE(infoIter, infoMap.end()); - ASSERT_NE(infoIter->second.backgroundColorEarlyVersion_, 0xff000000); - ASSERT_NE(infoIter->second.iconPathEarlyVersion_, "cachedPath"); + EXPECT_EQ(infoIter->second.backgroundColorEarlyVersion_, 0xff000000); + EXPECT_EQ(infoIter->second.iconPathEarlyVersion_, "cachedPath"); } /** @@ -670,8 +675,8 @@ HWTEST_F(WindowPatternStartingWindowTest, GetStartWindowColorFollowApp, TestSize auto res = ssm_->GetStartWindowColorFollowApp(sessionInfo); EXPECT_EQ(res, false); std::string key = sessionInfo.bundleName_ + '_' + sessionInfo.moduleName_ + '_' + sessionInfo.abilityName_; - startingWindowFollowAppSet_.insert(key); - auto res = ssm_->GetStartWindowColorFollowApp(sessionInfo); + ssm_->startingWindowFollowAppSet_.insert(key); + res = ssm_->GetStartWindowColorFollowApp(sessionInfo); ssm_->startingWindowFollowAppSet_.clear(); EXPECT_EQ(res, true); } diff --git a/wm/test/unittest/window_scene_session_impl_test5.cpp b/wm/test/unittest/window_scene_session_impl_test5.cpp index 613e221af5..67f01bcbcb 100644 --- a/wm/test/unittest/window_scene_session_impl_test5.cpp +++ b/wm/test/unittest/window_scene_session_impl_test5.cpp @@ -556,7 +556,7 @@ HWTEST_F(WindowSceneSessionImplTest5, UpdateColorMode, TestSize.Level1) EXPECT_EQ(WMError::WM_OK, ret); ret = window->UpdateColorMode(configuration); - EXPECT_EQ(WMError::WM_OK, ret); + EXPECT_EQ(WMError::WM_DO_NOTHING, ret); } /** -- Gitee