From 15f89b20fa0c844de2a07e82097e5b623cf82cbe Mon Sep 17 00:00:00 2001 From: Yyongkang Date: Sat, 13 Sep 2025 10:04:34 +0800 Subject: [PATCH] =?UTF-8?q?TDD=E6=96=AD=E8=A8=80=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Yyongkang --- .../test/unittest/multi_user/session_manager_lite_test.cpp | 6 +++--- .../test/unittest/multi_user/session_manager_test.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/window_scene/test/unittest/multi_user/session_manager_lite_test.cpp b/window_scene/test/unittest/multi_user/session_manager_lite_test.cpp index a7e910c7a7..07a29f1ed5 100644 --- a/window_scene/test/unittest/multi_user/session_manager_lite_test.cpp +++ b/window_scene/test/unittest/multi_user/session_manager_lite_test.cpp @@ -111,11 +111,10 @@ HWTEST_F(SessionManagerLiteTest, OnWMSConnectionChangedCallback, Function | Smal { ASSERT_NE(nullptr, sml_); bool funcInvoked = false; - sml_->wmsConnectionChangedFunc_ = nullptr; - sml_->OnWMSConnectionChangedCallback(101, DEFAULT_SCREEN_ID, true, false); - sml_->wmsConnectionChangedFunc_ = [&](int32_t userId, int32_t screenId, bool isConnected) { funcInvoked = true; }; sml_->OnWMSConnectionChangedCallback(101, DEFAULT_SCREEN_ID, true, true); + sml_->OnWMSConnectionChangedCallback(101, DEFAULT_SCREEN_ID, true, false); + sml_->wmsConnectionChangedFunc_ = nullptr; ASSERT_EQ(funcInvoked, true); } @@ -177,6 +176,7 @@ HWTEST_F(SessionManagerLiteTest, OnUserSwitch, Function | SmallTest | Level2) auto sessionManagerService = sml_->GetSessionManagerServiceProxy(); sml_->OnUserSwitch(sessionManagerService); ASSERT_EQ(funInvoked, true); + sml_->userSwitchCallbackFunc_ = nullptr; } /** diff --git a/window_scene/test/unittest/multi_user/session_manager_test.cpp b/window_scene/test/unittest/multi_user/session_manager_test.cpp index 73cd460b16..2e7a8ef63b 100644 --- a/window_scene/test/unittest/multi_user/session_manager_test.cpp +++ b/window_scene/test/unittest/multi_user/session_manager_test.cpp @@ -82,12 +82,12 @@ HWTEST_F(SessionManagerTest, ClearSessionManagerProxy, Function | SmallTest | Le HWTEST_F(SessionManagerTest, OnWMSConnectionChangedCallback, Function | SmallTest | Level2) { auto sm = SessionManager::GetInstance(-1); + ASSERT_NE(nullptr, sm); bool funcInvoked = false; - sm->wmsConnectionChangedFunc_ = nullptr; - sm->OnWMSConnectionChangedCallback(101, DEFAULT_SCREEN_ID, true, false); - sm->wmsConnectionChangedFunc_ = [&](int32_t userId, int32_t screenId, bool isConnected) { funcInvoked = true; }; sm->OnWMSConnectionChangedCallback(101, DEFAULT_SCREEN_ID, true, true); + sm->OnWMSConnectionChangedCallback(101, DEFAULT_SCREEN_ID, true, false); + sm->wmsConnectionChangedFunc_ = nullptr; ASSERT_EQ(funcInvoked, true); } @@ -163,6 +163,7 @@ HWTEST_F(SessionManagerTest, OnUserSwitch, Function | SmallTest | Level2) auto sessionManagerService = SessionManagerLite::GetInstance().GetSessionManagerServiceProxy(); sm->OnUserSwitch(sessionManagerService); ASSERT_EQ(funInvoked, true); + sml_->userSwitchCallbackFunc_ = nullptr; } /** -- Gitee