From 35dd69386e03d8f3fd00063416693d642ecff89d Mon Sep 17 00:00:00 2001 From: wlj Date: Tue, 28 Jun 2022 14:25:57 +0800 Subject: [PATCH] fix split test Signed-off-by: wlj Change-Id: Ibb7407a419fdcf7b84a2fa17e2cd779ea2464250 --- resources/config/rk3568/window_manager_config.xml | 2 +- wm/test/systemtest/window_split_test.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/config/rk3568/window_manager_config.xml b/resources/config/rk3568/window_manager_config.xml index 70ca77e2cc..db2b08f905 100644 --- a/resources/config/rk3568/window_manager_config.xml +++ b/resources/config/rk3568/window_manager_config.xml @@ -25,7 +25,7 @@ - 0.1 0.9 + 0.1 0.9 0.5 0.33 0.67 \ No newline at end of file diff --git a/wm/test/systemtest/window_split_test.cpp b/wm/test/systemtest/window_split_test.cpp index 56f569a3b3..4bb0413fea 100644 --- a/wm/test/systemtest/window_split_test.cpp +++ b/wm/test/systemtest/window_split_test.cpp @@ -281,9 +281,6 @@ HWTEST_F(WindowSplitTest, SplitScreen06, Function | MediumTest | Level3) ASSERT_EQ(WMError::WM_OK, priWindow->Show()); sleep(SPLIT_TEST_SLEEP_S); - ASSERT_EQ(WindowMode::WINDOW_MODE_SPLIT_PRIMARY, priWindow->GetMode()); - ASSERT_EQ(WindowMode::WINDOW_MODE_SPLIT_SECONDARY, fullWindow->GetMode()); - utils::TestWindowInfo dividerInfo; dividerInfo.name = "divider0"; dividerInfo.type = WindowType::WINDOW_TYPE_DOCK_SLICE; @@ -304,7 +301,11 @@ HWTEST_F(WindowSplitTest, SplitScreen06, Function | MediumTest | Level3) divider->ConsumePointerEvent(pointerEvent); sleep(SPLIT_TEST_SLEEP_S); - posY += 10; + if (rect.width_ < rect.height_) { + posX += 10; + } else { + posY += 10; + } pointerEvent = utils::CreatePointerEvent(posX, posY, pointerId, MMI::PointerEvent::POINTER_ACTION_MOVE); divider->ConsumePointerEvent(pointerEvent); sleep(SPLIT_TEST_SLEEP_S);