From e36df8dc76ed809d7600a31fe0926db64ac8beb0 Mon Sep 17 00:00:00 2001 From: zhongqihong Date: Fri, 12 Sep 2025 15:55:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?tdd=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhongqihong --- .../multi_user/session_manager_lite_test.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 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..034bba60e5 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 @@ -109,14 +109,16 @@ HWTEST_F(SessionManagerLiteTest, ClearSessionManagerProxy, Function | SmallTest */ HWTEST_F(SessionManagerLiteTest, OnWMSConnectionChangedCallback, Function | SmallTest | Level2) { - ASSERT_NE(nullptr, sml_); + auto sml = SessionManagerLite::GetInstance(-1); + ASSERT_NE(nullptr, sml); bool funcInvoked = false; - sml_->wmsConnectionChangedFunc_ = nullptr; - sml_->OnWMSConnectionChangedCallback(101, DEFAULT_SCREEN_ID, true, 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->wmsConnectionChangedFunc_ = [&](int32_t userId, int32_t screenId, bool isConnected) { funcInvoked = true; }; + sml->OnWMSConnectionChangedCallback(101, DEFAULT_SCREEN_ID, true, true); ASSERT_EQ(funcInvoked, true); + sml->wmsConnectionChangedFunc_ = nullptr; } /** @@ -177,6 +179,7 @@ HWTEST_F(SessionManagerLiteTest, OnUserSwitch, Function | SmallTest | Level2) auto sessionManagerService = sml_->GetSessionManagerServiceProxy(); sml_->OnUserSwitch(sessionManagerService); ASSERT_EQ(funInvoked, true); + sml_->userSwitchCallbackFunc_ = nullptr; } /** -- Gitee From f867825be845f5760b4f66b205337cd12fef27c3 Mon Sep 17 00:00:00 2001 From: zhongqihong Date: Fri, 12 Sep 2025 16:58:53 +0800 Subject: [PATCH 2/3] add Signed-off-by: zhongqihong --- window_scene/test/unittest/multi_user/session_manager_test.cpp | 2 ++ 1 file changed, 2 insertions(+) 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..70b84c9f42 100644 --- a/window_scene/test/unittest/multi_user/session_manager_test.cpp +++ b/window_scene/test/unittest/multi_user/session_manager_test.cpp @@ -89,6 +89,7 @@ HWTEST_F(SessionManagerTest, OnWMSConnectionChangedCallback, Function | SmallTes sm->wmsConnectionChangedFunc_ = [&](int32_t userId, int32_t screenId, bool isConnected) { funcInvoked = true; }; sm->OnWMSConnectionChangedCallback(101, DEFAULT_SCREEN_ID, true, true); ASSERT_EQ(funcInvoked, true); + sm->wmsConnectionChangedFunc_ = nullptr; } /** @@ -163,6 +164,7 @@ HWTEST_F(SessionManagerTest, OnUserSwitch, Function | SmallTest | Level2) auto sessionManagerService = SessionManagerLite::GetInstance().GetSessionManagerServiceProxy(); sm->OnUserSwitch(sessionManagerService); ASSERT_EQ(funInvoked, true); + sm->userSwitchCallbackFunc_ = nullptr; } /** -- Gitee From 759da0191f9535481af3726a3c5f61369860fad6 Mon Sep 17 00:00:00 2001 From: zhongqihong Date: Fri, 12 Sep 2025 17:33:49 +0800 Subject: [PATCH 3/3] add Signed-off-by: zhongqihong --- .../multi_user/session_manager_lite_test.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 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 034bba60e5..127134199b 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 @@ -169,17 +169,18 @@ HWTEST_F(SessionManagerLiteTest, OnWMSConnectionChanged2, Function | SmallTest | */ HWTEST_F(SessionManagerLiteTest, OnUserSwitch, Function | SmallTest | Level2) { - ASSERT_NE(nullptr, sml_); - sml_->OnUserSwitch(nullptr); - ASSERT_EQ(nullptr, sml_->sessionManagerServiceProxy_); + auto sml = SessionManagerLite::GetInstance(-1); + ASSERT_NE(nullptr, sml); + sml->OnUserSwitch(nullptr); + ASSERT_EQ(nullptr, sml->sessionManagerServiceProxy_); - sml_->recoverListenerRegistered_ = true; + sml->recoverListenerRegistered_ = true; bool funInvoked = false; - sml_->userSwitchCallbackFunc_ = [&]() { funInvoked = true; }; - auto sessionManagerService = sml_->GetSessionManagerServiceProxy(); - sml_->OnUserSwitch(sessionManagerService); + sml->userSwitchCallbackFunc_ = [&]() { funInvoked = true; }; + auto sessionManagerService = sml->GetSessionManagerServiceProxy(); + sml->OnUserSwitch(sessionManagerService); ASSERT_EQ(funInvoked, true); - sml_->userSwitchCallbackFunc_ = nullptr; + sml->userSwitchCallbackFunc_ = nullptr; } /** -- Gitee