diff --git a/services/aams/test/unittest/accessibility_mouse_key_test.cpp b/services/aams/test/unittest/accessibility_mouse_key_test.cpp index e6443a6ca35fcb597f8495a7e764a0cba41d6d1c..348d1186eff9613e5339c9dd7bc45a84cbf5987f 100644 --- a/services/aams/test/unittest/accessibility_mouse_key_test.cpp +++ b/services/aams/test/unittest/accessibility_mouse_key_test.cpp @@ -33,6 +33,7 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); + void OnKeyEventPresss(MMI::KeyEvent &event, const int32_t keycode); void SetUp() override; void TearDown() override; @@ -61,6 +62,18 @@ void AccessibilityMouseKeyUnitTest::TearDown() mouseKey_ = nullptr; } +void AccessibilityMouseKeyUnitTest::OnKeyEventPresss(MMI::KeyEvent &event, const int32_t keycode) +{ + // presss + event.SetKeyCode(keycode); + MMI::KeyEvent::KeyItem item; + item.SetKeyCode(keycode); + item.SetPressed(true); + event.AddKeyItem(item); + mouseKey_->OnKeyEvent(event); + event.RemoveReleasedKeyItems(item); +} + /** * @tc.number: AccessibilityMouseKey_Unittest_OnPointerEvent_001 * @tc.name: OnPointerEvent @@ -127,70 +140,16 @@ HWTEST_F(AccessibilityMouseKeyUnitTest, AccessibilityMouseKey_Unittest_OnKeyEven if (!event) { return; } - // presss 1 - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_1); event->SetKeyAction(MMI::KeyEvent::KEY_ACTION_DOWN); - MMI::KeyEvent::KeyItem item; - item.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_1); - item.SetPressed(true); - event->AddKeyItem(item); - mouseKey_->OnKeyEvent(*event); - // presss 2 - event->RemoveReleasedKeyItems(item); - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_2); - MMI::KeyEvent::KeyItem item1; - item1.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_2); - item1.SetPressed(true); - event->AddKeyItem(item1); - mouseKey_->OnKeyEvent(*event); - // presss 3 - event->RemoveReleasedKeyItems(item1); - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_3); - MMI::KeyEvent::KeyItem item2; - item2.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_3); - item2.SetPressed(true); - event->AddKeyItem(item2); - mouseKey_->OnKeyEvent(*event); - // presss 4 - event->RemoveReleasedKeyItems(item2); - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_4); - MMI::KeyEvent::KeyItem item3; - item3.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_4); - item3.SetPressed(true); - event->AddKeyItem(item3); - mouseKey_->OnKeyEvent(*event); - // presss 6 - event->RemoveReleasedKeyItems(item3); - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_6); - MMI::KeyEvent::KeyItem item4; - item4.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_6); - item4.SetPressed(true); - event->AddKeyItem(item4); - mouseKey_->OnKeyEvent(*event); - // presss 7 - event->RemoveReleasedKeyItems(item4); - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_7); - MMI::KeyEvent::KeyItem item5; - item5.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_7); - item5.SetPressed(true); - event->AddKeyItem(item5); - mouseKey_->OnKeyEvent(*event); - // presss 8 - event->RemoveReleasedKeyItems(item5); - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_8); - MMI::KeyEvent::KeyItem item6; - item6.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_8); - item6.SetPressed(true); - event->AddKeyItem(item6); - mouseKey_->OnKeyEvent(*event); - // presss 9 - event->RemoveReleasedKeyItems(item6); - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_9); - MMI::KeyEvent::KeyItem item7; - item7.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_9); - item7.SetPressed(true); - event->AddKeyItem(item7); - mouseKey_->OnKeyEvent(*event); + OnKeyEventPresss(*event, MMI::KeyEvent::KEYCODE_NUMPAD_1); + OnKeyEventPresss(*event, MMI::KeyEvent::KEYCODE_NUMPAD_2); + OnKeyEventPresss(*event, MMI::KeyEvent::KEYCODE_NUMPAD_3); + OnKeyEventPresss(*event, MMI::KeyEvent::KEYCODE_NUMPAD_4); + OnKeyEventPresss(*event, MMI::KeyEvent::KEYCODE_NUMPAD_6); + OnKeyEventPresss(*event, MMI::KeyEvent::KEYCODE_NUMPAD_7); + OnKeyEventPresss(*event, MMI::KeyEvent::KEYCODE_NUMPAD_8); + OnKeyEventPresss(*event, MMI::KeyEvent::KEYCODE_NUMPAD_9); + EXPECT_NE(event.get(), nullptr); GTEST_LOG_(INFO) << "AccessibilityMouseKey_Unittest_OnKeyEvent_001 end"; } diff --git a/services/aams/test/unittest/accessibility_short_key_test.cpp b/services/aams/test/unittest/accessibility_short_key_test.cpp index 03ef6f43c7bfa7d9698d78daa17f2171d564d35a..5a9f70dce6e759fafb14fde480e7dde14adb9687 100644 --- a/services/aams/test/unittest/accessibility_short_key_test.cpp +++ b/services/aams/test/unittest/accessibility_short_key_test.cpp @@ -34,6 +34,7 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); + bool OnKeyEventDown(); void SetUp() override; void TearDown() override; std::shared_ptr CreateKeyEvent(int32_t keyCode, int32_t keyAction); @@ -76,6 +77,20 @@ std::shared_ptr AccessibilityShortKeyUnitTest::CreateKeyEvent(int return event; } +bool AccessibilityShortKeyUnitTest::OnKeyEventDown() +{ + std::shared_ptr downEvent = CreateKeyEvent(MMI::KeyEvent::KEYCODE_POWER, + MMI::KeyEvent::KEY_ACTION_DOWN); + if (!downEvent) { + return false; + } + MMI::KeyEvent::KeyItem item; + item.SetPressed(true); + downEvent->AddKeyItem(item); + shortKey_->OnKeyEvent(*downEvent); + return true; +} + /** * @tc.number: AccessibilityShortKey_Unittest_OnKeyEvent_001 * @tc.name: OnKeyEvent @@ -171,15 +186,10 @@ HWTEST_F(AccessibilityShortKeyUnitTest, AccessibilityShortKey_Unittest_OnKeyEven return; } // power key(down) - std::shared_ptr downEvent = CreateKeyEvent(MMI::KeyEvent::KEYCODE_POWER, - MMI::KeyEvent::KEY_ACTION_DOWN); - if (!downEvent) { + if (!OnKeyEventDown()) { return; } - MMI::KeyEvent::KeyItem item; - item.SetPressed(true); - downEvent->AddKeyItem(item); - shortKey_->OnKeyEvent(*downEvent); + // power key(up) std::shared_ptr upEvent = CreateKeyEvent(MMI::KeyEvent::KEYCODE_POWER, MMI::KeyEvent::KEY_ACTION_UP); @@ -189,15 +199,10 @@ HWTEST_F(AccessibilityShortKeyUnitTest, AccessibilityShortKey_Unittest_OnKeyEven shortKey_->OnKeyEvent(*upEvent); // power key(down) - std::shared_ptr downEvent1 = CreateKeyEvent(MMI::KeyEvent::KEYCODE_POWER, - MMI::KeyEvent::KEY_ACTION_DOWN); - if (!downEvent1) { + if (!OnKeyEventDown()) { return; } - MMI::KeyEvent::KeyItem item1; - item1.SetPressed(true); - downEvent1->AddKeyItem(item1); - shortKey_->OnKeyEvent(*downEvent1); + // power key(up) std::shared_ptr upEvent1 = CreateKeyEvent(MMI::KeyEvent::KEYCODE_POWER, MMI::KeyEvent::KEY_ACTION_UP); @@ -207,15 +212,10 @@ HWTEST_F(AccessibilityShortKeyUnitTest, AccessibilityShortKey_Unittest_OnKeyEven shortKey_->OnKeyEvent(*upEvent1); // power key(down) - std::shared_ptr downEvent2 = CreateKeyEvent(MMI::KeyEvent::KEYCODE_POWER, - MMI::KeyEvent::KEY_ACTION_DOWN); - if (!downEvent2) { + if (!OnKeyEventDown()) { return; } - MMI::KeyEvent::KeyItem item2; - item2.SetPressed(true); - downEvent2->AddKeyItem(item2); - shortKey_->OnKeyEvent(*downEvent2); + // power key(up) std::shared_ptr upEvent2 = CreateKeyEvent(MMI::KeyEvent::KEYCODE_POWER, MMI::KeyEvent::KEY_ACTION_UP); diff --git a/services/aams/test/unittest/accessibility_touch_guider_test.cpp b/services/aams/test/unittest/accessibility_touch_guider_test.cpp index fcc7ea6facc174b6fe641fcf4a36252bb7a75d07..e5577821702d577d2b5001b4a13edad6890a6367 100755 --- a/services/aams/test/unittest/accessibility_touch_guider_test.cpp +++ b/services/aams/test/unittest/accessibility_touch_guider_test.cpp @@ -25,6 +25,8 @@ using namespace testing::ext; namespace OHOS { namespace Accessibility { namespace { + constexpr uint32_t GET_EVENT_TARGET_INDEX_2 = 2; + constexpr uint32_t GET_EVENT_TARGET_INDEX_3 = 3; constexpr uint32_t SLEEP_TIME_3 = 3; constexpr int64_t MS_TO_US = 1000; constexpr int32_t ACCOUNT_ID = 100; @@ -40,6 +42,8 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); + static void SetTouchGuiderPoint(MMI::PointerEvent::PointerItem &point, int id, int x, int y); + static void TouchGuiderExpect(EventType eventType, int32_t GestureTypeInt); bool TestEventType(); bool TestEventAction(); void SetUp() override; @@ -55,6 +59,23 @@ protected: int32_t pointId_ = -1; }; +void TouchGuiderTest::TouchGuiderExpect(EventType eventType, int32_t GestureTypeInt) +{ + eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(GET_EVENT_TARGET_INDEX_2); + EXPECT_EQ(eventType, EventType::TYPE_TOUCH_GUIDE_GESTURE_END); + eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(GET_EVENT_TARGET_INDEX_3); + EXPECT_EQ(eventType, EventType::TYPE_TOUCH_END); + auto uTgestureId = AccessibilityAbilityHelper::GetInstance().GetGestureId(); + EXPECT_EQ(uTgestureId, GestureTypeInt); +} + +void TouchGuiderTest::SetTouchGuiderPoint(MMI::PointerEvent::PointerItem &point, int id, int x, int y) +{ + point.SetPointerId(id); + point.SetDisplayX(x); + point.SetDisplayY(y); +} + bool TouchGuiderTest::TestEventType() { bool ret = AccessibilityCommonHelper::GetInstance().WaitForLoop(std::bind([]() -> bool { @@ -689,21 +710,13 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnPointerEvent_013, TestSize.Leve std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; - point.SetPointerId(1); - point.SetDisplayX(2500); - point.SetDisplayY(2500); + SetTouchGuiderPoint(point, 1, 2500, 2500); MMI::PointerEvent::PointerItem movepoint1 = {}; - movepoint1.SetPointerId(1); - movepoint1.SetDisplayX(3500); - movepoint1.SetDisplayY(2500); + SetTouchGuiderPoint(movepoint1, 1, 3500, 2500); MMI::PointerEvent::PointerItem movepoint2 = {}; - movepoint2.SetPointerId(1); - movepoint2.SetDisplayX(5000); - movepoint2.SetDisplayY(2500); + SetTouchGuiderPoint(movepoint2, 1, 5000, 2500); MMI::PointerEvent::PointerItem movepoint3 = {}; - movepoint3.SetPointerId(1); - movepoint3.SetDisplayX(4000); - movepoint3.SetDisplayY(0); + SetTouchGuiderPoint(movepoint3, 1, 4000, 0); points.emplace_back(point); std::shared_ptr event = @@ -743,12 +756,7 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnPointerEvent_013, TestSize.Leve event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 1, 0, 0); touchGuider_->OnPointerEvent(*event); - eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(2); - EXPECT_EQ(eventType, EventType::TYPE_TOUCH_GUIDE_GESTURE_END); - eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(3); - EXPECT_EQ(eventType, EventType::TYPE_TOUCH_END); - auto uTgestureId = AccessibilityAbilityHelper::GetInstance().GetGestureId(); - EXPECT_EQ(uTgestureId, static_cast(GestureType::GESTURE_SWIPE_RIGHT_THEN_UP)); + TouchGuiderExpect(eventType, static_cast(GestureType::GESTURE_SWIPE_RIGHT_THEN_UP)); GTEST_LOG_(INFO) << "TouchGuider_Unittest_OnPointerEvent_013 end"; } @@ -764,21 +772,13 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnPointerEvent_014, TestSize.Leve std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; - point.SetPointerId(1); - point.SetDisplayX(2500); - point.SetDisplayY(2500); + SetTouchGuiderPoint(point, 1, 2500, 2500); MMI::PointerEvent::PointerItem movepoint1 = {}; - movepoint1.SetPointerId(1); - movepoint1.SetDisplayX(1500); - movepoint1.SetDisplayY(2500); + SetTouchGuiderPoint(movepoint1, 1, 1500, 2500); MMI::PointerEvent::PointerItem movepoint2 = {}; - movepoint2.SetPointerId(1); - movepoint2.SetDisplayX(0); - movepoint2.SetDisplayY(2500); + SetTouchGuiderPoint(movepoint2, 1, 0, 2500); MMI::PointerEvent::PointerItem movepoint3 = {}; - movepoint3.SetPointerId(1); - movepoint3.SetDisplayX(1000); - movepoint3.SetDisplayY(0); + SetTouchGuiderPoint(movepoint3, 1, 1000, 0); points.emplace_back(point); std::shared_ptr event = @@ -818,12 +818,7 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnPointerEvent_014, TestSize.Leve event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 1, 0, 0); touchGuider_->OnPointerEvent(*event); - eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(2); - EXPECT_EQ(eventType, EventType::TYPE_TOUCH_GUIDE_GESTURE_END); - eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(3); - EXPECT_EQ(eventType, EventType::TYPE_TOUCH_END); - auto uTgestureId = AccessibilityAbilityHelper::GetInstance().GetGestureId(); - EXPECT_EQ(uTgestureId, static_cast(GestureType::GESTURE_SWIPE_LEFT_THEN_UP)); + TouchGuiderExpect(eventType, static_cast(GestureType::GESTURE_SWIPE_LEFT_THEN_UP)); GTEST_LOG_(INFO) << "TouchGuider_Unittest_OnPointerEvent_014 end"; } @@ -839,21 +834,13 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnPointerEvent_015, TestSize.Leve std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; - point.SetPointerId(1); - point.SetDisplayX(2500); - point.SetDisplayY(2500); + SetTouchGuiderPoint(point, 1, 2500, 2500); MMI::PointerEvent::PointerItem movepoint1 = {}; - movepoint1.SetPointerId(1); - movepoint1.SetDisplayX(2500); - movepoint1.SetDisplayY(3500); + SetTouchGuiderPoint(movepoint1, 1, 2500, 3500); MMI::PointerEvent::PointerItem movepoint2 = {}; - movepoint2.SetPointerId(1); - movepoint2.SetDisplayX(2500); - movepoint2.SetDisplayY(5000); + SetTouchGuiderPoint(movepoint2, 1, 2500, 5000); MMI::PointerEvent::PointerItem movepoint3 = {}; - movepoint3.SetPointerId(1); - movepoint3.SetDisplayX(0); - movepoint3.SetDisplayY(4000); + SetTouchGuiderPoint(movepoint3, 1, 0, 4000); points.emplace_back(point); std::shared_ptr event = @@ -893,12 +880,7 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnPointerEvent_015, TestSize.Leve event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 1, 0, 0); touchGuider_->OnPointerEvent(*event); - eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(2); - EXPECT_EQ(eventType, EventType::TYPE_TOUCH_GUIDE_GESTURE_END); - eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(3); - EXPECT_EQ(eventType, EventType::TYPE_TOUCH_END); - auto uTgestureId = AccessibilityAbilityHelper::GetInstance().GetGestureId(); - EXPECT_EQ(uTgestureId, static_cast(GestureType::GESTURE_SWIPE_DOWN_THEN_LEFT)); + TouchGuiderExpect(eventType, static_cast(GestureType::GESTURE_SWIPE_DOWN_THEN_LEFT)); GTEST_LOG_(INFO) << "TouchGuider_Unittest_OnPointerEvent_015 end"; } @@ -914,21 +896,13 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnPointerEvent_016, TestSize.Leve std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; - point.SetPointerId(1); - point.SetDisplayX(2500); - point.SetDisplayY(2500); + SetTouchGuiderPoint(point, 1, 2500, 2500); MMI::PointerEvent::PointerItem movepoint1 = {}; - movepoint1.SetPointerId(1); - movepoint1.SetDisplayX(2500); - movepoint1.SetDisplayY(3500); + SetTouchGuiderPoint(movepoint1, 1, 2500, 3500); MMI::PointerEvent::PointerItem movepoint2 = {}; - movepoint2.SetPointerId(1); - movepoint2.SetDisplayX(2500); - movepoint2.SetDisplayY(5000); + SetTouchGuiderPoint(movepoint2, 1, 2500, 5000); MMI::PointerEvent::PointerItem movepoint3 = {}; - movepoint3.SetPointerId(1); - movepoint3.SetDisplayX(5000); - movepoint3.SetDisplayY(4000); + SetTouchGuiderPoint(movepoint3, 1, 5000, 4000); points.emplace_back(point); std::shared_ptr event = @@ -968,12 +942,7 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnPointerEvent_016, TestSize.Leve event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 1, 0, 0); touchGuider_->OnPointerEvent(*event); - eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(2); - EXPECT_EQ(eventType, EventType::TYPE_TOUCH_GUIDE_GESTURE_END); - eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(3); - EXPECT_EQ(eventType, EventType::TYPE_TOUCH_END); - auto uTgestureId = AccessibilityAbilityHelper::GetInstance().GetGestureId(); - EXPECT_EQ(uTgestureId, static_cast(GestureType::GESTURE_SWIPE_DOWN_THEN_RIGHT)); + TouchGuiderExpect(eventType, static_cast(GestureType::GESTURE_SWIPE_DOWN_THEN_RIGHT)); GTEST_LOG_(INFO) << "TouchGuider_Unittest_OnPointerEvent_016 end"; } diff --git a/services/aams/test/unittest/accessibility_window_manager_test.cpp b/services/aams/test/unittest/accessibility_window_manager_test.cpp index 3012a6e3c7b73ac915cc1700d20bf639441078eb..f013549be06fc6060417e887fea8e097d1e2d9ee 100644 --- a/services/aams/test/unittest/accessibility_window_manager_test.cpp +++ b/services/aams/test/unittest/accessibility_window_manager_test.cpp @@ -49,6 +49,10 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); + static void AddActiveWindow(AccessibilityWindowManager &windowInfoManager, + sptr rosenWinInfoFirst); + static void AddNormalWindow(AccessibilityWindowManager &windowInfoManager, + sptr rosenWinInfoSecond); void SetUp() override; void TearDown() override; }; @@ -91,6 +95,46 @@ sptr GetRosenWindowInfo(Rosen::WindowType window return rosen_winInfo; } +void AccessibilityWindowManagerTest::AddActiveWindow(AccessibilityWindowManager &windowInfoManager, + sptr rosenWinInfoFirst) +{ + rosenWinInfoFirst->type_ = Rosen::WindowType::WINDOW_TYPE_APP_MAIN_WINDOW; + rosenWinInfoFirst->wid_ = 1; + rosenWinInfoFirst->focused_ = false; + Rosen::Rect rect; + rect.posX_ = 1; + rect.posY_ = 1; + rect.width_ = 1; + rect.height_ = 1; + rosenWinInfoFirst->windowRect_ = rect; + rosenWinInfoFirst->mode_ = Rosen::WindowMode::WINDOW_MODE_PIP; + rosenWinInfoFirst->isDecorEnable_ = false; + rosenWinInfoFirst->displayId_ = 0; + windowInfoManager.a11yWindows_.insert(std::make_pair(rosenWinInfoFirst->wid_, + windowInfoManager.CreateAccessibilityWindowInfo(rosenWinInfoFirst))); + EXPECT_EQ(windowInfoManager.a11yWindows_.size(), 1); +} + +void AccessibilityWindowManagerTest::AddNormalWindow(AccessibilityWindowManager &windowInfoManager, + sptr rosenWinInfoSecond) +{ + rosenWinInfoSecond->type_ = Rosen::WindowType::APP_WINDOW_BASE; + rosenWinInfoSecond->wid_ = WINDOW_ID; + rosenWinInfoSecond->focused_ = false; + Rosen::Rect rect; + rect.posX_ = 1; + rect.posY_ = 1; + rect.width_ = 1; + rect.height_ = 1; + rosenWinInfoSecond->windowRect_ = rect; + rosenWinInfoSecond->mode_ = Rosen::WindowMode::WINDOW_MODE_PIP; + rosenWinInfoSecond->isDecorEnable_ = false; + rosenWinInfoSecond->displayId_ = 0; + windowInfoManager.a11yWindows_.insert(std::make_pair(rosenWinInfoSecond->wid_, + windowInfoManager.CreateAccessibilityWindowInfo(rosenWinInfoSecond))); + EXPECT_EQ(windowInfoManager.a11yWindows_.size(), WINDOWS_SIZE); +} + /** * @tc.number: AccessibilityWindowManager_Unittest_ConvertToRealWindowId001 * @tc.name: ConvertToRealWindowId @@ -380,34 +424,11 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_OnW // Add a window sptr rosenWinInfoFirst = new Rosen::AccessibilityWindowInfo(); - rosenWinInfoFirst->type_ = Rosen::WindowType::WINDOW_TYPE_APP_MAIN_WINDOW; - rosenWinInfoFirst->wid_ = 1; - rosenWinInfoFirst->focused_ = false; - Rosen::Rect rect; - rect.posX_ = 1; - rect.posY_ = 1; - rect.width_ = 1; - rect.height_ = 1; - rosenWinInfoFirst->windowRect_ = rect; - rosenWinInfoFirst->mode_ = Rosen::WindowMode::WINDOW_MODE_PIP; - rosenWinInfoFirst->isDecorEnable_ = false; - rosenWinInfoFirst->displayId_ = 0; - windowInfoManager.a11yWindows_.insert(std::make_pair(rosenWinInfoFirst->wid_, - windowInfoManager.CreateAccessibilityWindowInfo(rosenWinInfoFirst))); - EXPECT_EQ(windowInfoManager.a11yWindows_.size(), 1); + AddActiveWindow(windowInfoManager, rosenWinInfoFirst); // Add another window sptr rosenWinInfoSecond = new Rosen::AccessibilityWindowInfo(); - rosenWinInfoSecond->type_ = Rosen::WindowType::APP_WINDOW_BASE; - rosenWinInfoSecond->wid_ = WINDOW_ID; - rosenWinInfoSecond->focused_ = false; - rosenWinInfoSecond->windowRect_ = rect; - rosenWinInfoSecond->mode_ = Rosen::WindowMode::WINDOW_MODE_PIP; - rosenWinInfoSecond->isDecorEnable_ = false; - rosenWinInfoSecond->displayId_ = 0; - windowInfoManager.a11yWindows_.insert(std::make_pair(rosenWinInfoSecond->wid_, - windowInfoManager.CreateAccessibilityWindowInfo(rosenWinInfoSecond))); - EXPECT_EQ(windowInfoManager.a11yWindows_.size(), WINDOWS_SIZE); + AddNormalWindow(windowInfoManager, rosenWinInfoSecond); // Remove the first window std::vector> infos; @@ -448,36 +469,13 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_OnW // Add an active window sptr rosenWinInfoFirst = new Rosen::AccessibilityWindowInfo(); - rosenWinInfoFirst->type_ = Rosen::WindowType::WINDOW_TYPE_APP_MAIN_WINDOW; - rosenWinInfoFirst->wid_ = 1; - rosenWinInfoFirst->focused_ = false; - Rosen::Rect rect; - rect.posX_ = 1; - rect.posY_ = 1; - rect.width_ = 1; - rect.height_ = 1; - rosenWinInfoFirst->windowRect_ = rect; - rosenWinInfoFirst->mode_ = Rosen::WindowMode::WINDOW_MODE_PIP; - rosenWinInfoFirst->isDecorEnable_ = false; - rosenWinInfoFirst->displayId_ = 0; - windowInfoManager.a11yWindows_.insert(std::make_pair(rosenWinInfoFirst->wid_, - windowInfoManager.CreateAccessibilityWindowInfo(rosenWinInfoFirst))); - EXPECT_EQ(windowInfoManager.a11yWindows_.size(), 1); + AddActiveWindow(windowInfoManager, rosenWinInfoFirst); windowInfoManager.SetActiveWindow(rosenWinInfoFirst->wid_); EXPECT_EQ(windowInfoManager.activeWindowId_, rosenWinInfoFirst->wid_); // Add another normal window sptr rosenWinInfoSecond = new Rosen::AccessibilityWindowInfo(); - rosenWinInfoSecond->type_ = Rosen::WindowType::APP_WINDOW_BASE; - rosenWinInfoSecond->wid_ = WINDOW_ID; - rosenWinInfoSecond->focused_ = false; - rosenWinInfoSecond->windowRect_ = rect; - rosenWinInfoSecond->mode_ = Rosen::WindowMode::WINDOW_MODE_PIP; - rosenWinInfoSecond->isDecorEnable_ = false; - rosenWinInfoSecond->displayId_ = 0; - windowInfoManager.a11yWindows_.insert(std::make_pair(rosenWinInfoSecond->wid_, - windowInfoManager.CreateAccessibilityWindowInfo(rosenWinInfoSecond))); - EXPECT_EQ(windowInfoManager.a11yWindows_.size(), WINDOWS_SIZE); + AddNormalWindow(windowInfoManager, rosenWinInfoSecond); // Remove the active window std::vector> infos; diff --git a/services/test/moduletest/aamstest/aams_accessibility_touch_guider_test/aams_accessibility_touch_guider_test.cpp b/services/test/moduletest/aamstest/aams_accessibility_touch_guider_test/aams_accessibility_touch_guider_test.cpp index cd7dd055ff1a65ae23456c7dca098e2a328d2a17..0537695434fddeb5114289b7f885060533c90a9b 100755 --- a/services/test/moduletest/aamstest/aams_accessibility_touch_guider_test/aams_accessibility_touch_guider_test.cpp +++ b/services/test/moduletest/aamstest/aams_accessibility_touch_guider_test/aams_accessibility_touch_guider_test.cpp @@ -37,6 +37,7 @@ using namespace testing::ext; namespace OHOS { namespace Accessibility { namespace { + constexpr uint32_t POINT_ID_2 = 2; const int32_t SLEEP_TIME_3 = 3; } // namespace @@ -48,6 +49,16 @@ public: {} static void SetUpTestCase(); static void TearDownTestCase(); + static void TouchGuiderPointSet(MMI::PointerEvent::PointerItem &point, int id, int x, int y); + bool OnPointerEventOnePointsTest1(std::vector &points, + MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, + MMI::PointerEvent::PointerItem point3, MMI::PointerEvent::PointerItem point4); + bool OnPointerEventOnePointsTest3(std::vector &points, + MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, + MMI::PointerEvent::PointerItem point3, MMI::PointerEvent::PointerItem point4); + bool OnPointerEventOnePointsTest7(std::vector &points, + MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, + MMI::PointerEvent::PointerItem point3); void SetUp(); void TearDown(); @@ -64,6 +75,112 @@ protected: void AddAccessibilityWindowConnection(); }; +bool AamsTouchGuideTest::OnPointerEventOnePointsTest1(std::vector &points, + MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3, + MMI::PointerEvent::PointerItem point4) +{ + points.emplace_back(point1); + std::shared_ptr event = + CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, points, 0, 0, 1); + auto inputEventConsumer = MMI::MockInputManager::GetInputEventConsumer(); + if (!inputEventConsumer) { + return false; + } + inputEventConsumer->OnInputEvent(event); + + points.emplace_back(point2); + event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, points, 0, 0, POINT_ID_2); + inputEventConsumer->OnInputEvent(event); + + event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); + inputEventConsumer->OnInputEvent(event); + + points.clear(); + points.emplace_back(point3); + points.emplace_back(point4); + event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, POINT_ID_2); + inputEventConsumer->OnInputEvent(event); + + points.clear(); + points.emplace_back(point3); + event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 0, 0, 1); + inputEventConsumer->OnInputEvent(event); + + points.clear(); + points.emplace_back(point4); + event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 0, 0, POINT_ID_2); + inputEventConsumer->OnInputEvent(event); + return true; +} + +bool AamsTouchGuideTest::OnPointerEventOnePointsTest3(std::vector &points, + MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3, + MMI::PointerEvent::PointerItem point4) +{ + points.emplace_back(point1); + std::shared_ptr event = + CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, points, 0, 0, 1); + auto inputEventConsumer = MMI::MockInputManager::GetInputEventConsumer(); + if (!inputEventConsumer) { + // GTEST_LOG_(INFO) << "AamsTouchGuideTest OnPointerEvent003 inputEventConsumer is null"; + return false; + } + inputEventConsumer->OnInputEvent(event); + + points.clear(); + points.emplace_back(point2); + event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); + inputEventConsumer->OnInputEvent(event); + + points.clear(); + points.emplace_back(point3); + event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); + inputEventConsumer->OnInputEvent(event); + + points.clear(); + points.emplace_back(point4); + event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); + inputEventConsumer->OnInputEvent(event); + + event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 0, 0, 1); + inputEventConsumer->OnInputEvent(event); + return true; +} + +bool AamsTouchGuideTest::OnPointerEventOnePointsTest7(std::vector &points, + MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3) +{ + points.emplace_back(point1); + std::shared_ptr event = + CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, points, 0, 0, 1); + auto inputEventConsumer = MMI::MockInputManager::GetInputEventConsumer(); + if (!inputEventConsumer) { + return false; + } + inputEventConsumer->OnInputEvent(event); + + points.clear(); + points.emplace_back(point2); + event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); + inputEventConsumer->OnInputEvent(event); + + points.clear(); + points.emplace_back(point3); + event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); + inputEventConsumer->OnInputEvent(event); + + event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 0, 0, 1); + inputEventConsumer->OnInputEvent(event); + return true; +} + +void AamsTouchGuideTest::TouchGuiderPointSet(MMI::PointerEvent::PointerItem &point, int id, int x, int y) +{ + point.SetPointerId(id); + point.SetDisplayX(x); + point.SetDisplayY(y); +} + void AamsTouchGuideTest::WritefileAll(const char* fname, const char* data) { FILE* fp; @@ -201,54 +318,19 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnPointerEvent001, Te MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - point1.SetDisplayX(500); - point1.SetDisplayY(500); - point1.SetPointerId(1); + TouchGuiderPointSet(point1, 1, 500, 500); MMI::PointerEvent::PointerItem point2 = {}; - point2.SetDisplayX(1000); - point2.SetDisplayY(500); - point2.SetPointerId(2); + TouchGuiderPointSet(point2, 2, 1000, 500); MMI::PointerEvent::PointerItem point3 = {}; - point3.SetDisplayX(2000); - point3.SetDisplayY(500); - point3.SetPointerId(1); + TouchGuiderPointSet(point3, 1, 2000, 500); MMI::PointerEvent::PointerItem point4 = {}; - point4.SetDisplayX(2500); - point4.SetDisplayY(500); - point4.SetPointerId(2); + TouchGuiderPointSet(point4, 1, 2500, 500); - points.emplace_back(point1); - std::shared_ptr event = - CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, points, 0, 0, 1); - auto inputEventConsumer = MMI::MockInputManager::GetInputEventConsumer(); - if (!inputEventConsumer) { + bool flag = OnPointerEventOnePointsTest1(points, point1, point2, point3, point4); + if (!flag) { GTEST_LOG_(INFO) << "AamsTouchGuideTest OnPointerEvent001 inputEventConsumer is null"; - return; } - inputEventConsumer->OnInputEvent(event); - - points.emplace_back(point2); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, points, 0, 0, 2); - inputEventConsumer->OnInputEvent(event); - - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - - points.clear(); - points.emplace_back(point3); - points.emplace_back(point4); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 2); - inputEventConsumer->OnInputEvent(event); - points.clear(); - points.emplace_back(point3); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - - points.clear(); - points.emplace_back(point4); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 0, 0, 2); - inputEventConsumer->OnInputEvent(event); bool ret = AccessibilityCommonHelper::GetInstance().WaitForLoop(std::bind([]() -> bool { if (AccessibilityHelper::GetInstance().GetEventTypeOfTargetIndex(1) == EventType::TYPE_TOUCH_END) { @@ -335,49 +417,16 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnPointerEvent003, Te MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - point1.SetDisplayX(2500); - point1.SetDisplayY(2500); - point1.SetPointerId(1); + TouchGuiderPointSet(point1, 1, 2500, 2500); MMI::PointerEvent::PointerItem point2 = {}; - point2.SetDisplayX(1500); - point2.SetDisplayY(2500); - point2.SetPointerId(1); + TouchGuiderPointSet(point2, 1, 1500, 2500); MMI::PointerEvent::PointerItem point3 = {}; - point3.SetDisplayX(0); - point3.SetDisplayY(2500); - point3.SetPointerId(1); + TouchGuiderPointSet(point3, 1, 0, 2500); MMI::PointerEvent::PointerItem point4 = {}; - point4.SetDisplayX(2500); - point4.SetDisplayY(2250); - point4.SetPointerId(1); + TouchGuiderPointSet(point4, 1, 2500, 2250); - points.emplace_back(point1); - std::shared_ptr event = - CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, points, 0, 0, 1); - auto inputEventConsumer = MMI::MockInputManager::GetInputEventConsumer(); - if (!inputEventConsumer) { - GTEST_LOG_(INFO) << "AamsTouchGuideTest OnPointerEvent003 inputEventConsumer is null"; - return; - } - inputEventConsumer->OnInputEvent(event); - - points.clear(); - points.emplace_back(point2); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - - points.clear(); - points.emplace_back(point3); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - - points.clear(); - points.emplace_back(point4); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); + OnPointerEventOnePointsTest3(points, point1, point2, point3, point4); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); // Determine event type bool ret = AccessibilityCommonHelper::GetInstance().WaitForLoop(std::bind([]() -> bool { if (AccessibilityHelper::GetInstance().GetEventTypeOfTargetIndex(3) == @@ -424,49 +473,19 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnPointerEvent004, Te MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - point1.SetDisplayX(2500); - point1.SetDisplayY(2500); - point1.SetPointerId(1); + TouchGuiderPointSet(point1, 1, 2500, 2500); MMI::PointerEvent::PointerItem point2 = {}; - point2.SetDisplayX(2500); - point2.SetDisplayY(3500); - point2.SetPointerId(1); + TouchGuiderPointSet(point2, 1, 2500, 3500); MMI::PointerEvent::PointerItem point3 = {}; - point3.SetDisplayX(2500); - point3.SetDisplayY(5000); - point3.SetPointerId(1); + TouchGuiderPointSet(point3, 1, 2500, 5000); MMI::PointerEvent::PointerItem point4 = {}; - point4.SetDisplayX(2250); - point4.SetDisplayY(2500); - point4.SetPointerId(1); + TouchGuiderPointSet(point4, 1, 2250, 5000); - points.emplace_back(point1); - std::shared_ptr event = - CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, points, 0, 0, 1); - auto inputEventConsumer = MMI::MockInputManager::GetInputEventConsumer(); - if (!inputEventConsumer) { - GTEST_LOG_(INFO) << "AamsTouchGuideTest OnPointerEvent004 inputEventConsumer is null"; - return; + bool flag = OnPointerEventOnePointsTest3(points, point1, point2, point3, point4); + if (!flag) { + GTEST_LOG_(INFO) << "AamsTouchGuideTest OnPointerEvent003 inputEventConsumer is null"; } - inputEventConsumer->OnInputEvent(event); - points.clear(); - points.emplace_back(point2); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - - points.clear(); - points.emplace_back(point3); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - - points.clear(); - points.emplace_back(point4); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); // Determine event type bool ret = AccessibilityCommonHelper::GetInstance().WaitForLoop(std::bind([]() -> bool { if (AccessibilityHelper::GetInstance().GetEventTypeOfTargetIndex(3) == @@ -513,49 +532,19 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnPointerEvent005, Te MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - point1.SetDisplayX(2500); - point1.SetDisplayY(2500); - point1.SetPointerId(1); + TouchGuiderPointSet(point1, 1, 2500, 2500); MMI::PointerEvent::PointerItem point2 = {}; - point2.SetDisplayX(3500); - point2.SetDisplayY(2500); - point2.SetPointerId(1); + TouchGuiderPointSet(point2, 1, 3500, 2500); MMI::PointerEvent::PointerItem point3 = {}; - point3.SetDisplayX(5000); - point3.SetDisplayY(2500); - point3.SetPointerId(1); + TouchGuiderPointSet(point3, 1, 5000, 2500); MMI::PointerEvent::PointerItem point4 = {}; - point4.SetDisplayX(2500); - point4.SetDisplayY(2250); - point4.SetPointerId(1); + TouchGuiderPointSet(point4, 1, 2500, 2250); - points.emplace_back(point1); - std::shared_ptr event = - CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, points, 0, 0, 1); - auto inputEventConsumer = MMI::MockInputManager::GetInputEventConsumer(); - if (!inputEventConsumer) { + bool flag = OnPointerEventOnePointsTest3(points, point1, point2, point3, point4); + if (!flag) { GTEST_LOG_(INFO) << "AamsTouchGuideTest OnPointerEvent005 inputEventConsumer is null"; - return; } - inputEventConsumer->OnInputEvent(event); - points.clear(); - points.emplace_back(point2); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - - points.clear(); - points.emplace_back(point3); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - - points.clear(); - points.emplace_back(point4); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); // Determine event type bool ret = AccessibilityCommonHelper::GetInstance().WaitForLoop(std::bind([]() -> bool { if (AccessibilityHelper::GetInstance().GetEventTypeOfTargetIndex(3) == @@ -602,49 +591,19 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnPointerEvent006, Te MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - point1.SetDisplayX(2500); - point1.SetDisplayY(2500); - point1.SetPointerId(1); + TouchGuiderPointSet(point1, 1, 2500, 2500); MMI::PointerEvent::PointerItem point2 = {}; - point2.SetDisplayX(2500); - point2.SetDisplayY(1500); - point2.SetPointerId(1); + TouchGuiderPointSet(point2, 1, 2500, 2500); MMI::PointerEvent::PointerItem point3 = {}; - point3.SetDisplayX(2500); - point3.SetDisplayY(0); - point3.SetPointerId(1); + TouchGuiderPointSet(point3, 1, 2500, 0); MMI::PointerEvent::PointerItem point4 = {}; - point4.SetDisplayX(2250); - point4.SetDisplayY(2500); - point4.SetPointerId(1); + TouchGuiderPointSet(point4, 1, 2250, 2500); - points.emplace_back(point1); - std::shared_ptr event = - CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, points, 0, 0, 1); - auto inputEventConsumer = MMI::MockInputManager::GetInputEventConsumer(); - if (!inputEventConsumer) { + bool flag = OnPointerEventOnePointsTest3(points, point1, point2, point3, point4); + if (!flag) { GTEST_LOG_(INFO) << "AamsTouchGuideTest OnPointerEvent006 inputEventConsumer is null"; - return; } - inputEventConsumer->OnInputEvent(event); - - points.clear(); - points.emplace_back(point2); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - - points.clear(); - points.emplace_back(point3); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - - points.clear(); - points.emplace_back(point4); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); // Determine event type bool ret = AccessibilityCommonHelper::GetInstance().WaitForLoop(std::bind([]() -> bool { if (AccessibilityHelper::GetInstance().GetEventTypeOfTargetIndex(3) == @@ -691,40 +650,17 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnPointerEvent007, Te MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - point1.SetDisplayX(2500); - point1.SetDisplayY(2500); - point1.SetPointerId(1); + TouchGuiderPointSet(point1, 1, 2500, 2500); MMI::PointerEvent::PointerItem point2 = {}; - point2.SetDisplayX(2500); - point2.SetDisplayY(1500); - point2.SetPointerId(1); + TouchGuiderPointSet(point2, 1, 2500, 1500); MMI::PointerEvent::PointerItem point3 = {}; - point3.SetDisplayX(2500); - point3.SetDisplayY(0); - point3.SetPointerId(1); + TouchGuiderPointSet(point3, 1, 2500, 0); - points.emplace_back(point1); - std::shared_ptr event = - CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, points, 0, 0, 1); - auto inputEventConsumer = MMI::MockInputManager::GetInputEventConsumer(); - if (!inputEventConsumer) { + bool flag = OnPointerEventOnePointsTest7(points, point1, point2, point3); + if (!flag) { GTEST_LOG_(INFO) << "AamsTouchGuideTest OnPointerEvent007 inputEventConsumer is null"; - return; } - inputEventConsumer->OnInputEvent(event); - - points.clear(); - points.emplace_back(point2); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - points.clear(); - points.emplace_back(point3); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_MOVE, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); - - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_UP, points, 0, 0, 1); - inputEventConsumer->OnInputEvent(event); // Determine event type bool ret = AccessibilityCommonHelper::GetInstance().WaitForLoop(std::bind([]() -> bool { if (AccessibilityHelper::GetInstance().GetEventTypeOfTargetIndex(3) ==