openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-08-27 13:47:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

modify window_impl_test ut failed

Browse Source 
Signed-off-by: leafly2021 <figo.yefei@huawei.com>
Change-Id: Ic60c68f319219d526a32c36d6051fa3b2ab5cbf9
This commit is contained in:
leafly2021
2022-05-09 09:05:28 +08:00
parent d2d33bf4bc
commit 3efe32d3fa
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wm/include/input_transfer_station.h
+1 -1
View File
@@ -32,7 +32,7 @@ WM_DECLARE_SINGLE_INSTANCE(InputTransferStation);
friend class InputEventListener;
public:
void AddInputWindow(const sptr<Window>& window);
void RemoveInputWindow(const sptr<Window>& window);
void RemoveInputWindow(uint32_t windowId);
void SetInputListener(uint32_t windowId, const std::shared_ptr<MMI::IInputEventConsumer>& listener);
private:
wm/src/input_transfer_station.cpp
+1 -2
View File
@@ -80,9 +80,8 @@ void InputTransferStation::AddInputWindow(const sptr<Window>& window)
}
}
void InputTransferStation::RemoveInputWindow(const sptr<Window>& window)
void InputTransferStation::RemoveInputWindow(uint32_t windowId)
{
uint32_t windowId = window->GetWindowId();
WLOGFI("Remove input window, windowId: %{public}u", windowId);
std::lock_guard<std::mutex> lock(mtx_);
auto iter = windowInputChannels_.find(windowId);
wm/src/window_impl.cpp
+1 -1
View File
@@ -715,7 +715,7 @@ WMError WindowImpl::Destroy(bool needNotifyServer)
}
WLOGFI("[Client] Window %{public}u Destroy", property_->GetWindowId());
InputTransferStation::GetInstance().RemoveInputWindow(this);
InputTransferStation::GetInstance().RemoveInputWindow(property_->GetWindowId());
WMError ret = WMError::WM_OK;
if (needNotifyServer) {
NotifyBeforeDestroy(GetWindowName());
wm/test/unittest/input_transfer_station_test.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ HWTEST_F(InputTransferStationTest, AddInputWindow, Function | SmallTest | Level2
*/
HWTEST_F(InputTransferStationTest, RemoveInputWindow, Function | SmallTest | Level2)
{
InputTransferStation::GetInstance().RemoveInputWindow(window_);
InputTransferStation::GetInstance().RemoveInputWindow(window_->GetWindowId());
}
/**
wm/test/unittest/window_impl_test.cpp
+19 -18
View File
@@ -662,18 +662,19 @@ HWTEST_F(WindowImplTest, GetSystemBarPropertyByType03, Function | SmallTest | Le
*/
HWTEST_F(WindowImplTest, Maximize02, Function | SmallTest | Level3)
{
auto option = new WindowOption();
option->SetWindowName("Maximize02");
auto window = new WindowImpl(option);
std::unique_ptr<Mocker> m = std::make_unique<Mocker>();
sptr<WindowOption> option = new WindowOption();
option->SetWindowName("Maximize02");
sptr<WindowImpl> window = new WindowImpl(option);
EXPECT_CALL(m->Mock(), CreateWindow(_, _, _, _, _)).Times(1).WillOnce(Return(WMError::WM_OK));
window->Create("");
EXPECT_CALL(m->Mock(), AddWindow(_)).Times(1).WillOnce(Return(WMError::WM_OK));
ASSERT_EQ(WMError::WM_OK, window->Create(""));
window->SetWindowType(WindowType::WINDOW_TYPE_APP_SUB_WINDOW);
window->SetWindowMode(WindowMode::WINDOW_MODE_FLOATING);
EXPECT_CALL(m->Mock(), AddWindow(_)).Times(1).WillOnce(Return(WMError::WM_OK));
window->Show();
window->Maximize();
ASSERT_EQ(WindowMode::WINDOW_MODE_FLOATING, window->GetMode());
EXPECT_CALL(m->Mock(), RemoveWindow(_)).Times(1).WillOnce(Return(WMError::WM_OK));
window->Hide();
EXPECT_CALL(m->Mock(), DestroyWindow(_)).Times(1).WillOnce(Return(WMError::WM_OK));
@@ -687,15 +688,15 @@ HWTEST_F(WindowImplTest, Maximize02, Function | SmallTest | Level3)
*/
HWTEST_F(WindowImplTest, Recover01, Function | SmallTest | Level3)
{
auto option = new WindowOption();
option->SetWindowName("Recover01");
auto window = new WindowImpl(option);
std::unique_ptr<Mocker> m = std::make_unique<Mocker>();
sptr<WindowOption> option = new WindowOption();
option->SetWindowName("Recover01");
sptr<WindowImpl> window = new WindowImpl(option);
EXPECT_CALL(m->Mock(), CreateWindow(_, _, _, _, _)).Times(1).WillOnce(Return(WMError::WM_OK));
window->Create("");
EXPECT_CALL(m->Mock(), AddWindow(_)).Times(1).WillOnce(Return(WMError::WM_OK));
window->SetWindowType(WindowType::WINDOW_TYPE_APP_MAIN_WINDOW);
window->SetWindowMode(WindowMode::WINDOW_MODE_FULLSCREEN);
EXPECT_CALL(m->Mock(), AddWindow(_)).Times(1).WillOnce(Return(WMError::WM_OK));
window->Show();
EXPECT_CALL(m->Mock(), UpdateProperty(_, _)).Times(1).WillOnce(Return(WMError::WM_OK));
window->Recover();
@@ -713,15 +714,15 @@ HWTEST_F(WindowImplTest, Recover01, Function | SmallTest | Level3)
*/
HWTEST_F(WindowImplTest, Recover02, Function | SmallTest | Level3)
{
auto option = new WindowOption();
option->SetWindowName("Recover02");
auto window = new WindowImpl(option);
std::unique_ptr<Mocker> m = std::make_unique<Mocker>();
sptr<WindowOption> option = new WindowOption();
option->SetWindowName("Recover02");
sptr<WindowImpl> window = new WindowImpl(option);
EXPECT_CALL(m->Mock(), CreateWindow(_, _, _, _, _)).Times(1).WillOnce(Return(WMError::WM_OK));
window->Create("");
EXPECT_CALL(m->Mock(), AddWindow(_)).Times(1).WillOnce(Return(WMError::WM_OK));
window->SetWindowType(WindowType::WINDOW_TYPE_APP_SUB_WINDOW);
window->SetWindowMode(WindowMode::WINDOW_MODE_FULLSCREEN);
EXPECT_CALL(m->Mock(), AddWindow(_)).Times(1).WillOnce(Return(WMError::WM_OK));
window->Show();
window->Recover();
ASSERT_EQ(WindowMode::WINDOW_MODE_FULLSCREEN, window->GetMode());
@@ -740,7 +741,7 @@ HWTEST_F(WindowImplTest, Minimize01, Function | SmallTest | Level3)
{
auto option = new WindowOption();
option->SetWindowName("Minimize01");
auto window = new WindowImpl(option);
sptr<WindowImpl> window = new WindowImpl(option);
std::unique_ptr<Mocker> m = std::make_unique<Mocker>();
EXPECT_CALL(m->Mock(), CreateWindow(_, _, _, _, _)).Times(1).WillOnce(Return(WMError::WM_OK));
window->Create("");
@@ -765,7 +766,7 @@ HWTEST_F(WindowImplTest, Minimize02, Function | SmallTest | Level3)
{
auto option = new WindowOption();
option->SetWindowName("Minimize02");
auto window = new WindowImpl(option);
sptr<WindowImpl> window = new WindowImpl(option);
std::unique_ptr<Mocker> m = std::make_unique<Mocker>();
EXPECT_CALL(m->Mock(), CreateWindow(_, _, _, _, _)).Times(1).WillOnce(Return(WMError::WM_OK));
window->Create("");
@@ -789,7 +790,7 @@ HWTEST_F(WindowImplTest, IsSupportWideGamut01, Function | SmallTest | Level3)
{
auto option = new WindowOption();
option->SetWindowName("IsSupportWideGamut01");
auto window = new WindowImpl(option);
sptr<WindowImpl> window = new WindowImpl(option);
std::unique_ptr<Mocker> m = std::make_unique<Mocker>();
EXPECT_CALL(m->Mock(), CreateWindow(_, _, _, _, _)).Times(1).WillOnce(Return(WMError::WM_OK));
window->Create("");
@@ -809,7 +810,7 @@ HWTEST_F(WindowImplTest, SetColorSpace01, Function | SmallTest | Level3)
{
auto option = new WindowOption();
option->SetWindowName("SetColorSpace01");
auto window = new WindowImpl(option);
sptr<WindowImpl> window = new WindowImpl(option);
std::unique_ptr<Mocker> m = std::make_unique<Mocker>();
EXPECT_CALL(m->Mock(), CreateWindow(_, _, _, _, _)).Times(1).WillOnce(Return(WMError::WM_OK));
window->Create("");
@@ -829,7 +830,7 @@ HWTEST_F(WindowImplTest, GetColorSpace01, Function | SmallTest | Level3)
{
auto option = new WindowOption();
option->SetWindowName("GetColorSpace01");
auto window = new WindowImpl(option);
sptr<WindowImpl> window = new WindowImpl(option);
std::unique_ptr<Mocker> m = std::make_unique<Mocker>();
EXPECT_CALL(m->Mock(), CreateWindow(_, _, _, _, _)).Times(1).WillOnce(Return(WMError::WM_OK));
window->Create("");