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 a7e910c7a7591a9e388b0edb41ba2e031e2017f6..127134199b8171dfcac453eaddaea4ddff31fe68 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; } /** @@ -167,16 +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; } /** 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 73cd460b161832620d78f5d717ba1e2c81f726f6..70b84c9f4265871c1e8f085e24c70f5406f79a2c 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; } /**