diff --git a/window_scene/screen_session_manager/include/screen_session_manager_client.h b/window_scene/screen_session_manager/include/screen_session_manager_client.h index d2c89c0b9bbf2969ddb1d61ba8e74888afd90828..34f6f73d1de133e74762e1f05c4c560f67b6cc40 100644 --- a/window_scene/screen_session_manager/include/screen_session_manager_client.h +++ b/window_scene/screen_session_manager/include/screen_session_manager_client.h @@ -72,7 +72,7 @@ protected: private: void ConnectToServer(); - bool CheckIfNeedCennectScreen(ScreenId screenId, ScreenId rsId, const std::string& name); + bool CheckIfNeedConnectScreen(ScreenId screenId, ScreenId rsId, const std::string& name); void OnScreenConnectionChanged(ScreenId screenId, ScreenEvent screenEvent, ScreenId rsId, const std::string& name) override; void OnPropertyChanged(ScreenId screenId, diff --git a/window_scene/screen_session_manager/src/screen_session_manager_client.cpp b/window_scene/screen_session_manager/src/screen_session_manager_client.cpp index 0559578cbed938b7c4e1340492d07d8b869c203b..7dc206be5b63e698467d2a657531db32a082776c 100644 --- a/window_scene/screen_session_manager/src/screen_session_manager_client.cpp +++ b/window_scene/screen_session_manager/src/screen_session_manager_client.cpp @@ -71,7 +71,7 @@ void ScreenSessionManagerClient::RegisterScreenConnectionListener(IScreenConnect ConnectToServer(); } -bool ScreenSessionManagerClient::CheckIfNeedCennectScreen(ScreenId screenId, ScreenId rsId, const std::string& name) +bool ScreenSessionManagerClient::CheckIfNeedConnectScreen(ScreenId screenId, ScreenId rsId, const std::string& name) { if (rsId == SCREEN_ID_INVALID) { WLOGFE("rsId is invalid"); @@ -95,7 +95,7 @@ void ScreenSessionManagerClient::OnScreenConnectionChanged(ScreenId screenId, Sc WLOGFI("screenId: %{public}" PRIu64 " screenEvent: %{public}d rsId: %{public}" PRIu64 " name: %{public}s", screenId, static_cast(screenEvent), rsId, name.c_str()); if (screenEvent == ScreenEvent::CONNECTED) { - if (!CheckIfNeedCennectScreen(screenId, rsId, name)) { + if (!CheckIfNeedConnectScreen(screenId, rsId, name)) { WLOGFE("There is no need to connect the screen"); return; } diff --git a/window_scene/test/unittest/screen_session_manager_client_test.cpp b/window_scene/test/unittest/screen_session_manager_client_test.cpp index 909fb1bbcac8d582affe98027e2e42e8a36c740a..e083e511638420ebe4a3340dde7ccb409a330760 100644 --- a/window_scene/test/unittest/screen_session_manager_client_test.cpp +++ b/window_scene/test/unittest/screen_session_manager_client_test.cpp @@ -116,11 +116,11 @@ HWTEST_F(ScreenSessionManagerClientTest, OnScreenConnectionChanged02, Function | } /** - * @tc.name: CheckIfNeedCennectScreen01 - * @tc.desc: CheckIfNeedCennectScreen test + * @tc.name: CheckIfNeedConnectScreen01 + * @tc.desc: CheckIfNeedConnectScreen test * @tc.type: FUNC */ -HWTEST_F(ScreenSessionManagerClientTest, CheckIfNeedCennectScreen01, Function | SmallTest | Level2) +HWTEST_F(ScreenSessionManagerClientTest, CheckIfNeedConnectScreen01, Function | SmallTest | Level2) { EXPECT_NE(screenSessionManagerClient_->screenSessionManager_, nullptr); @@ -128,16 +128,16 @@ HWTEST_F(ScreenSessionManagerClientTest, CheckIfNeedCennectScreen01, Function | ScreenId rsId = 0; std::string name = "HiCar"; screenSessionManagerClient_->screenSessionManager_->GetScreenProperty(screenId).SetScreenType(ScreenType::VIRTUAL); - bool result = screenSessionManagerClient_->CheckIfNeedCennectScreen(screenId, rsId, name); + bool result = screenSessionManagerClient_->CheckIfNeedConnectScreen(screenId, rsId, name); EXPECT_EQ(result, true); } /** - * @tc.name: CheckIfNeedCennectScreen02 - * @tc.desc: CheckIfNeedCennectScreen test + * @tc.name: CheckIfNeedConnectScreen02 + * @tc.desc: CheckIfNeedConnectScreen test * @tc.type: FUNC */ -HWTEST_F(ScreenSessionManagerClientTest, CheckIfNeedCennectScreen02, Function | SmallTest | Level2) +HWTEST_F(ScreenSessionManagerClientTest, CheckIfNeedConnectScreen02, Function | SmallTest | Level2) { EXPECT_NE(screenSessionManagerClient_->screenSessionManager_, nullptr); @@ -145,16 +145,16 @@ HWTEST_F(ScreenSessionManagerClientTest, CheckIfNeedCennectScreen02, Function | ScreenId rsId = SCREEN_ID_INVALID; std::string name; screenSessionManagerClient_->screenSessionManager_->GetScreenProperty(screenId).SetScreenType(ScreenType::VIRTUAL); - bool result = screenSessionManagerClient_->CheckIfNeedCennectScreen(screenId, rsId, name); + bool result = screenSessionManagerClient_->CheckIfNeedConnectScreen(screenId, rsId, name); EXPECT_EQ(result, false); } /** - * @tc.name: CheckIfNeedCennectScreen03 - * @tc.desc: CheckIfNeedCennectScreen test + * @tc.name: CheckIfNeedConnectScreen03 + * @tc.desc: CheckIfNeedConnectScreen test * @tc.type: FUNC */ -HWTEST_F(ScreenSessionManagerClientTest, CheckIfNeedCennectScreen03, Function | SmallTest | Level2) +HWTEST_F(ScreenSessionManagerClientTest, CheckIfNeedConnectScreen03, Function | SmallTest | Level2) { EXPECT_NE(screenSessionManagerClient_->screenSessionManager_, nullptr); @@ -162,7 +162,7 @@ HWTEST_F(ScreenSessionManagerClientTest, CheckIfNeedCennectScreen03, Function | ScreenId rsId = 0; std::string name; screenSessionManagerClient_->screenSessionManager_->GetScreenProperty(screenId).SetScreenType(ScreenType::REAL); - bool result = screenSessionManagerClient_->CheckIfNeedCennectScreen(screenId, rsId, name); + bool result = screenSessionManagerClient_->CheckIfNeedConnectScreen(screenId, rsId, name); EXPECT_EQ(result, true); }