From 8bf15c3752981253ffca9558ce3b366e07e00da7 Mon Sep 17 00:00:00 2001 From: l00804143 Date: Sat, 15 Jul 2023 15:59:40 +0800 Subject: [PATCH 01/37] =?UTF-8?q?=E8=B6=85=E5=A4=A7=E5=87=BD=E6=95=B0=20Si?= =?UTF-8?q?gned-off-by:=20l00804143=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unittest/accessibility_mouse_key_test.cpp | 139 +++---- .../unittest/accessibility_short_key_test.cpp | 53 +-- .../accessibility_touch_guider_test.cpp | 109 ++---- .../accessibility_window_manager_test.cpp | 76 ++-- .../aams_accessibility_touch_guider_test.cpp | 362 +++++++----------- 5 files changed, 325 insertions(+), 414 deletions(-) diff --git a/services/aams/test/unittest/accessibility_mouse_key_test.cpp b/services/aams/test/unittest/accessibility_mouse_key_test.cpp index e6443a6c..4f5c9c6b 100644 --- a/services/aams/test/unittest/accessibility_mouse_key_test.cpp +++ b/services/aams/test/unittest/accessibility_mouse_key_test.cpp @@ -33,6 +33,8 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); + static void OnKeyEventPresssOneToFour(MMI::KeyEvent &event); + static void OnKeyEventPresssSixToNine(MMI::KeyEvent &event); void SetUp() override; void TearDown() override; @@ -61,6 +63,76 @@ void AccessibilityMouseKeyUnitTest::TearDown() mouseKey_ = nullptr; } +void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent &event){ + // 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); +} + +void AccessibilityMouseKeyUnitTest::OnKeyEventPresssSixToNine(MMI::KeyEvent &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); +} + /** * @tc.number: AccessibilityMouseKey_Unittest_OnPointerEvent_001 * @tc.name: OnPointerEvent @@ -127,70 +199,9 @@ 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); + OnKeyEventPresssOneToFour(*event); + OnKeyEventPresssSixToNine(*event); + 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 03ef6f43..1b6a9fe4 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(); + static 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 @@ -170,16 +185,14 @@ HWTEST_F(AccessibilityShortKeyUnitTest, AccessibilityShortKey_Unittest_OnKeyEven if (!shortKey_) { return; } + bool flag = true; + // power key(down) - std::shared_ptr downEvent = CreateKeyEvent(MMI::KeyEvent::KEYCODE_POWER, - MMI::KeyEvent::KEY_ACTION_DOWN); - if (!downEvent) { - return; + flag = OnKeyEventDown(); + if (!flag){ + 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 +202,11 @@ 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) { - return; + flag = OnKeyEventDown(); + if (!flag){ + 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 +216,11 @@ 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) { - return; + flag = OnKeyEventDown(); + if (!flag){ + 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 fcc7ea6f..17b88b1e 100755 --- a/services/aams/test/unittest/accessibility_touch_guider_test.cpp +++ b/services/aams/test/unittest/accessibility_touch_guider_test.cpp @@ -40,6 +40,8 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); + static void TouchGuiderPointSet(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 +57,21 @@ protected: int32_t pointId_ = -1; }; +void TouchGuiderExpect(EventType eventType, int32_t GestureTypeInt){ + 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, GestureTypeInt); +} + +void TouchGuiderTest::TouchGuiderPointSet(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 +706,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); + TouchGuiderPointSet(point, 1, 2500, 2500); MMI::PointerEvent::PointerItem movepoint1 = {}; - movepoint1.SetPointerId(1); - movepoint1.SetDisplayX(3500); - movepoint1.SetDisplayY(2500); + TouchGuiderPointSet(movepoint1, 1, 3500, 2500); MMI::PointerEvent::PointerItem movepoint2 = {}; - movepoint2.SetPointerId(1); - movepoint2.SetDisplayX(5000); - movepoint2.SetDisplayY(2500); + TouchGuiderPointSet(movepoint2, 1, 5000, 2500); MMI::PointerEvent::PointerItem movepoint3 = {}; - movepoint3.SetPointerId(1); - movepoint3.SetDisplayX(4000); - movepoint3.SetDisplayY(0); + TouchGuiderPointSet(movepoint3, 1, 4000, 0); points.emplace_back(point); std::shared_ptr event = @@ -743,12 +752,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 +768,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); + TouchGuiderPointSet(point, 1, 2500, 2500); MMI::PointerEvent::PointerItem movepoint1 = {}; - movepoint1.SetPointerId(1); - movepoint1.SetDisplayX(1500); - movepoint1.SetDisplayY(2500); + TouchGuiderPointSet(movepoint1, 1, 1500, 2500); MMI::PointerEvent::PointerItem movepoint2 = {}; - movepoint2.SetPointerId(1); - movepoint2.SetDisplayX(0); - movepoint2.SetDisplayY(2500); + TouchGuiderPointSet(movepoint2, 1, 0, 2500); MMI::PointerEvent::PointerItem movepoint3 = {}; - movepoint3.SetPointerId(1); - movepoint3.SetDisplayX(1000); - movepoint3.SetDisplayY(0); + TouchGuiderPointSet(movepoint3, 1, 1000, 0); points.emplace_back(point); std::shared_ptr event = @@ -818,12 +814,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 +830,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); + TouchGuiderPointSet(point, 1, 2500, 2500); MMI::PointerEvent::PointerItem movepoint1 = {}; - movepoint1.SetPointerId(1); - movepoint1.SetDisplayX(2500); - movepoint1.SetDisplayY(3500); + TouchGuiderPointSet(movepoint1, 1, 2500, 3500); MMI::PointerEvent::PointerItem movepoint2 = {}; - movepoint2.SetPointerId(1); - movepoint2.SetDisplayX(2500); - movepoint2.SetDisplayY(5000); + TouchGuiderPointSet(movepoint2, 1, 2500, 5000); MMI::PointerEvent::PointerItem movepoint3 = {}; - movepoint3.SetPointerId(1); - movepoint3.SetDisplayX(0); - movepoint3.SetDisplayY(4000); + TouchGuiderPointSet(movepoint3, 1, 0, 4000); points.emplace_back(point); std::shared_ptr event = @@ -893,12 +876,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 +892,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); + TouchGuiderPointSet(point, 1, 2500, 2500); MMI::PointerEvent::PointerItem movepoint1 = {}; - movepoint1.SetPointerId(1); - movepoint1.SetDisplayX(2500); - movepoint1.SetDisplayY(3500); + TouchGuiderPointSet(movepoint1, 1, 2500, 3500); MMI::PointerEvent::PointerItem movepoint2 = {}; - movepoint2.SetPointerId(1); - movepoint2.SetDisplayX(2500); - movepoint2.SetDisplayY(5000); + TouchGuiderPointSet(movepoint2, 1, 2500, 5000); MMI::PointerEvent::PointerItem movepoint3 = {}; - movepoint3.SetPointerId(1); - movepoint3.SetDisplayX(5000); - movepoint3.SetDisplayY(4000); + TouchGuiderPointSet(movepoint3, 1, 5000, 4000); points.emplace_back(point); std::shared_ptr event = @@ -968,12 +938,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 3012a6e3..76acef8c 100644 --- a/services/aams/test/unittest/accessibility_window_manager_test.cpp +++ b/services/aams/test/unittest/accessibility_window_manager_test.cpp @@ -49,6 +49,8 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); + static void AddActiveWindow(AccessibilityWindowManager& windowInfoManager); + static void AddNormalWindow(AccessibilityWindowManager& windowInfoManager); void SetUp() override; void TearDown() override; }; @@ -91,6 +93,39 @@ sptr GetRosenWindowInfo(Rosen::WindowType window return rosen_winInfo; } +void AccessibilityWindowManagerTest::AddActiveWindow(AccessibilityWindowManager& windowInfoManager){ + 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); +} + +void AccessibilityWindowManagerTest::AddNormalWindow(AccessibilityWindowManager& windowInfoManager){ + 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); +} + /** * @tc.number: AccessibilityWindowManager_Unittest_ConvertToRealWindowId001 * @tc.name: ConvertToRealWindowId @@ -397,17 +432,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_OnW EXPECT_EQ(windowInfoManager.a11yWindows_.size(), 1); // 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); // Remove the first window std::vector> infos; @@ -447,37 +472,12 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_OnW EXPECT_EQ(windowInfoManager.activeWindowId_, INVALID_WINDOW_ID); // 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); 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); // 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 cd7dd055..9d7c8f49 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 @@ -48,6 +48,15 @@ public: {} static void SetUpTestCase(); static void TearDownTestCase(); + static void TouchGuiderPointSet(MMI::PointerEvent::PointerItem point, int id, int x, int y); + static bool OnPointerEventOnePointsTest1(std::vector &points, + MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3, + MMI::PointerEvent::PointerItem point4); + static bool OnPointerEventOnePointsTest3(std::vector &points, + MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3, + MMI::PointerEvent::PointerItem point4); + static bool AamsTouchGuideTest::OnPointerEventOnePointsTest7(std::vector &points, + MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3); void SetUp(); void TearDown(); @@ -64,6 +73,108 @@ 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, 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); + 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 +312,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(point, 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 +411,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); + OnPointerEventOnePointsTest3(points, point1, point2, point3, point4); - 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) == @@ -424,49 +467,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 +526,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 +585,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 +644,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) == -- Gitee From fdb1f6bcab1cc5e71905859a6546a56e5944db81 Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 08:22:50 +0000 Subject: [PATCH 02/37] update services/aams/test/unittest/accessibility_touch_guider_test.cpp. Signed-off-by: luocheng --- .../aams/test/unittest/accessibility_touch_guider_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/aams/test/unittest/accessibility_touch_guider_test.cpp b/services/aams/test/unittest/accessibility_touch_guider_test.cpp index 17b88b1e..ebdd1dca 100755 --- a/services/aams/test/unittest/accessibility_touch_guider_test.cpp +++ b/services/aams/test/unittest/accessibility_touch_guider_test.cpp @@ -40,7 +40,7 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); - static void TouchGuiderPointSet(MMI::PointerEvent::PointerItem point, int id, int x, int y); + static void TouchGuiderPointSet(MMI::PointerEvent::PointerItem &point, int id, int x, int y); static void TouchGuiderExpect(EventType eventType, int32_t GestureTypeInt); bool TestEventType(); bool TestEventAction(); @@ -66,7 +66,7 @@ void TouchGuiderExpect(EventType eventType, int32_t GestureTypeInt){ EXPECT_EQ(uTgestureId, GestureTypeInt); } -void TouchGuiderTest::TouchGuiderPointSet(MMI::PointerEvent::PointerItem point, int id, int x, int y){ +void TouchGuiderTest::TouchGuiderPointSet(MMI::PointerEvent::PointerItem &point, int id, int x, int y){ point.SetPointerId(id); point.SetDisplayX(x); point.SetDisplayY(y); -- Gitee From 6ece09c02438b7039ef2aabc62995ee654c2a45f Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 08:23:55 +0000 Subject: [PATCH 03/37] update Signed-off-by: luocheng --- .../aams_accessibility_touch_guider_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9d7c8f49..b219f740 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 @@ -48,7 +48,7 @@ public: {} static void SetUpTestCase(); static void TearDownTestCase(); - static void TouchGuiderPointSet(MMI::PointerEvent::PointerItem point, int id, int x, int y); + static void TouchGuiderPointSet(MMI::PointerEvent::PointerItem &point, int id, int x, int y); static bool OnPointerEventOnePointsTest1(std::vector &points, MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3, MMI::PointerEvent::PointerItem point4); @@ -169,7 +169,7 @@ bool AamsTouchGuideTest::OnPointerEventOnePointsTest7(std::vector Date: Sat, 15 Jul 2023 08:26:01 +0000 Subject: [PATCH 04/37] update services/aams/test/unittest/accessibility_window_manager_test.cpp. Signed-off-by: luocheng --- .../test/unittest/accessibility_window_manager_test.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/aams/test/unittest/accessibility_window_manager_test.cpp b/services/aams/test/unittest/accessibility_window_manager_test.cpp index 76acef8c..50c8dd3b 100644 --- a/services/aams/test/unittest/accessibility_window_manager_test.cpp +++ b/services/aams/test/unittest/accessibility_window_manager_test.cpp @@ -49,8 +49,8 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); - static void AddActiveWindow(AccessibilityWindowManager& windowInfoManager); - static void AddNormalWindow(AccessibilityWindowManager& windowInfoManager); + static void AddActiveWindow(AccessibilityWindowManager &windowInfoManager); + static void AddNormalWindow(AccessibilityWindowManager &windowInfoManager); void SetUp() override; void TearDown() override; }; @@ -93,7 +93,7 @@ sptr GetRosenWindowInfo(Rosen::WindowType window return rosen_winInfo; } -void AccessibilityWindowManagerTest::AddActiveWindow(AccessibilityWindowManager& windowInfoManager){ +void AccessibilityWindowManagerTest::AddActiveWindow(AccessibilityWindowManager &windowInfoManager){ sptr rosenWinInfoFirst = new Rosen::AccessibilityWindowInfo(); rosenWinInfoFirst->type_ = Rosen::WindowType::WINDOW_TYPE_APP_MAIN_WINDOW; rosenWinInfoFirst->wid_ = 1; @@ -112,7 +112,7 @@ void AccessibilityWindowManagerTest::AddActiveWindow(AccessibilityWindowManager& EXPECT_EQ(windowInfoManager.a11yWindows_.size(), 1); } -void AccessibilityWindowManagerTest::AddNormalWindow(AccessibilityWindowManager& windowInfoManager){ +void AccessibilityWindowManagerTest::AddNormalWindow(AccessibilityWindowManager &windowInfoManager){ sptr rosenWinInfoSecond = new Rosen::AccessibilityWindowInfo(); rosenWinInfoSecond->type_ = Rosen::WindowType::APP_WINDOW_BASE; rosenWinInfoSecond->wid_ = WINDOW_ID; -- Gitee From 2ae9623d4b36db758a678fd4e9211dcbf025730b Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 08:36:16 +0000 Subject: [PATCH 05/37] update services/aams/test/unittest/accessibility_mouse_key_test.cpp. Signed-off-by: luocheng --- .../test/unittest/accessibility_mouse_key_test.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/services/aams/test/unittest/accessibility_mouse_key_test.cpp b/services/aams/test/unittest/accessibility_mouse_key_test.cpp index 4f5c9c6b..d6f62abf 100644 --- a/services/aams/test/unittest/accessibility_mouse_key_test.cpp +++ b/services/aams/test/unittest/accessibility_mouse_key_test.cpp @@ -33,8 +33,8 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); - static void OnKeyEventPresssOneToFour(MMI::KeyEvent &event); - static void OnKeyEventPresssSixToNine(MMI::KeyEvent &event); + static void OnKeyEventPresssOneToFour(MMI::KeyEvent *event); + static void OnKeyEventPresssSixToNine(MMI::KeyEvent *event); void SetUp() override; void TearDown() override; @@ -63,7 +63,7 @@ void AccessibilityMouseKeyUnitTest::TearDown() mouseKey_ = nullptr; } -void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent &event){ +void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent *event){ // presss 1 event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_1); event->SetKeyAction(MMI::KeyEvent::KEY_ACTION_DOWN); @@ -98,7 +98,7 @@ void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent &eve mouseKey_->OnKeyEvent(*event); } -void AccessibilityMouseKeyUnitTest::OnKeyEventPresssSixToNine(MMI::KeyEvent &event){ +void AccessibilityMouseKeyUnitTest::OnKeyEventPresssSixToNine(MMI::KeyEvent *event){ // presss 6 event->RemoveReleasedKeyItems(item3); event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_6); @@ -199,8 +199,8 @@ HWTEST_F(AccessibilityMouseKeyUnitTest, AccessibilityMouseKey_Unittest_OnKeyEven if (!event) { return; } - OnKeyEventPresssOneToFour(*event); - OnKeyEventPresssSixToNine(*event); + OnKeyEventPresssOneToFour(event); + OnKeyEventPresssSixToNine(event); EXPECT_NE(event.get(), nullptr); GTEST_LOG_(INFO) << "AccessibilityMouseKey_Unittest_OnKeyEvent_001 end"; -- Gitee From 0a82c8892c5547f5990142a79a5612e36ac4afa8 Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 08:44:45 +0000 Subject: [PATCH 06/37] update services/aams/test/unittest/accessibility_mouse_key_test.cpp. Signed-off-by: luocheng --- .../unittest/accessibility_mouse_key_test.cpp | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/services/aams/test/unittest/accessibility_mouse_key_test.cpp b/services/aams/test/unittest/accessibility_mouse_key_test.cpp index d6f62abf..036c2959 100644 --- a/services/aams/test/unittest/accessibility_mouse_key_test.cpp +++ b/services/aams/test/unittest/accessibility_mouse_key_test.cpp @@ -33,8 +33,8 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); - static void OnKeyEventPresssOneToFour(MMI::KeyEvent *event); - static void OnKeyEventPresssSixToNine(MMI::KeyEvent *event); + static void OnKeyEventPresssOneToFour(MMI::KeyEvent &event); + static void OnKeyEventPresssSixToNine(MMI::KeyEvent &event); void SetUp() override; void TearDown() override; @@ -63,73 +63,73 @@ void AccessibilityMouseKeyUnitTest::TearDown() mouseKey_ = nullptr; } -void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent *event){ +void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent &event){ // presss 1 - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_1); - event->SetKeyAction(MMI::KeyEvent::KEY_ACTION_DOWN); + 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); + event.AddKeyItem(item); mouseKey_->OnKeyEvent(*event); // presss 2 - event->RemoveReleasedKeyItems(item); - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_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); + event.AddKeyItem(item1); mouseKey_->OnKeyEvent(*event); // presss 3 - event->RemoveReleasedKeyItems(item1); - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_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); + event.AddKeyItem(item2); mouseKey_->OnKeyEvent(*event); // presss 4 - event->RemoveReleasedKeyItems(item2); - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_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); + event.AddKeyItem(item3); mouseKey_->OnKeyEvent(*event); } -void AccessibilityMouseKeyUnitTest::OnKeyEventPresssSixToNine(MMI::KeyEvent *event){ +void AccessibilityMouseKeyUnitTest::OnKeyEventPresssSixToNine(MMI::KeyEvent &event){ // presss 6 - event->RemoveReleasedKeyItems(item3); - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_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); + event.AddKeyItem(item4); mouseKey_->OnKeyEvent(*event); // presss 7 - event->RemoveReleasedKeyItems(item4); - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_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); + event.AddKeyItem(item5); mouseKey_->OnKeyEvent(*event); // presss 8 - event->RemoveReleasedKeyItems(item5); - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_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); + event.AddKeyItem(item6); mouseKey_->OnKeyEvent(*event); // presss 9 - event->RemoveReleasedKeyItems(item6); - event->SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_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); + event.AddKeyItem(item7); mouseKey_->OnKeyEvent(*event); } @@ -199,8 +199,8 @@ HWTEST_F(AccessibilityMouseKeyUnitTest, AccessibilityMouseKey_Unittest_OnKeyEven if (!event) { return; } - OnKeyEventPresssOneToFour(event); - OnKeyEventPresssSixToNine(event); + OnKeyEventPresssOneToFour(*event); + OnKeyEventPresssSixToNine(*event); EXPECT_NE(event.get(), nullptr); GTEST_LOG_(INFO) << "AccessibilityMouseKey_Unittest_OnKeyEvent_001 end"; -- Gitee From 539aba337dc79a66e21a334876443cf8bba32486 Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 09:36:05 +0000 Subject: [PATCH 07/37] update Signed-off-by: luocheng --- .../aams_accessibility_touch_guider_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b219f740..14b70350 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 @@ -55,7 +55,7 @@ public: static bool OnPointerEventOnePointsTest3(std::vector &points, MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3, MMI::PointerEvent::PointerItem point4); - static bool AamsTouchGuideTest::OnPointerEventOnePointsTest7(std::vector &points, + static bool OnPointerEventOnePointsTest7(std::vector &points, MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3); void SetUp(); void TearDown(); -- Gitee From b47cfc0bce9c3b233098e0d3406c04ceb65fd410 Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 09:57:48 +0000 Subject: [PATCH 08/37] update services/aams/test/unittest/accessibility_mouse_key_test.cpp. Signed-off-by: luocheng --- services/aams/test/unittest/accessibility_mouse_key_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/aams/test/unittest/accessibility_mouse_key_test.cpp b/services/aams/test/unittest/accessibility_mouse_key_test.cpp index 036c2959..475d843c 100644 --- a/services/aams/test/unittest/accessibility_mouse_key_test.cpp +++ b/services/aams/test/unittest/accessibility_mouse_key_test.cpp @@ -33,8 +33,8 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); - static void OnKeyEventPresssOneToFour(MMI::KeyEvent &event); - static void OnKeyEventPresssSixToNine(MMI::KeyEvent &event); + void OnKeyEventPresssOneToFour(MMI::KeyEvent &event); + void OnKeyEventPresssSixToNine(MMI::KeyEvent &event); void SetUp() override; void TearDown() override; -- Gitee From b1677a6d53d13c0810067961e0bf16f0ae25f2c1 Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 09:58:42 +0000 Subject: [PATCH 09/37] update Signed-off-by: luocheng --- .../aams_accessibility_touch_guider_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 14b70350..dc60f80c 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 @@ -49,13 +49,13 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); static void TouchGuiderPointSet(MMI::PointerEvent::PointerItem &point, int id, int x, int y); - static bool OnPointerEventOnePointsTest1(std::vector &points, + bool OnPointerEventOnePointsTest1(std::vector &points, MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3, MMI::PointerEvent::PointerItem point4); - static bool OnPointerEventOnePointsTest3(std::vector &points, + bool OnPointerEventOnePointsTest3(std::vector &points, MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3, MMI::PointerEvent::PointerItem point4); - static bool OnPointerEventOnePointsTest7(std::vector &points, + bool OnPointerEventOnePointsTest7(std::vector &points, MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3); void SetUp(); void TearDown(); -- Gitee From cdcce2826b11d20f5bc7f795dc0a7df30e6745d0 Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 10:49:42 +0000 Subject: [PATCH 10/37] update Signed-off-by: luocheng --- .../aams_accessibility_touch_guider_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 dc60f80c..d76c97af 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 @@ -312,7 +312,7 @@ HWTEST_F(AamsTouchGuideTest, AamsTouchGuideTest_Moduletest_OnPointerEvent001, Te MMI::MockInputManager::ClearTouchActions(); std::vector points = {}; MMI::PointerEvent::PointerItem point1 = {}; - TouchGuiderPointSet(point, 1, 500, 500); + TouchGuiderPointSet(point1, 1, 500, 500); MMI::PointerEvent::PointerItem point2 = {}; TouchGuiderPointSet(point2, 2, 1000, 500); MMI::PointerEvent::PointerItem point3 = {}; -- Gitee From 2feeeeb2ba93e77269f5d03c596c913b34ccb9df Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 10:51:44 +0000 Subject: [PATCH 11/37] update services/aams/test/unittest/accessibility_mouse_key_test.cpp. Signed-off-by: luocheng --- .../unittest/accessibility_mouse_key_test.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/services/aams/test/unittest/accessibility_mouse_key_test.cpp b/services/aams/test/unittest/accessibility_mouse_key_test.cpp index 475d843c..f76108d8 100644 --- a/services/aams/test/unittest/accessibility_mouse_key_test.cpp +++ b/services/aams/test/unittest/accessibility_mouse_key_test.cpp @@ -71,7 +71,7 @@ void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent &eve item.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_1); item.SetPressed(true); event.AddKeyItem(item); - mouseKey_->OnKeyEvent(*event); + mouseKey_->OnKeyEvent(event); // presss 2 event.RemoveReleasedKeyItems(item); event.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_2); @@ -79,7 +79,7 @@ void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent &eve item1.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_2); item1.SetPressed(true); event.AddKeyItem(item1); - mouseKey_->OnKeyEvent(*event); + mouseKey_->OnKeyEvent(event); // presss 3 event.RemoveReleasedKeyItems(item1); event.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_3); @@ -87,7 +87,7 @@ void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent &eve item2.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_3); item2.SetPressed(true); event.AddKeyItem(item2); - mouseKey_->OnKeyEvent(*event); + mouseKey_->OnKeyEvent(event); // presss 4 event.RemoveReleasedKeyItems(item2); event.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_4); @@ -95,7 +95,7 @@ void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent &eve item3.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_4); item3.SetPressed(true); event.AddKeyItem(item3); - mouseKey_->OnKeyEvent(*event); + mouseKey_->OnKeyEvent(event); } void AccessibilityMouseKeyUnitTest::OnKeyEventPresssSixToNine(MMI::KeyEvent &event){ @@ -106,7 +106,7 @@ void AccessibilityMouseKeyUnitTest::OnKeyEventPresssSixToNine(MMI::KeyEvent &eve item4.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_6); item4.SetPressed(true); event.AddKeyItem(item4); - mouseKey_->OnKeyEvent(*event); + mouseKey_->OnKeyEvent(event); // presss 7 event.RemoveReleasedKeyItems(item4); event.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_7); @@ -114,7 +114,7 @@ void AccessibilityMouseKeyUnitTest::OnKeyEventPresssSixToNine(MMI::KeyEvent &eve item5.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_7); item5.SetPressed(true); event.AddKeyItem(item5); - mouseKey_->OnKeyEvent(*event); + mouseKey_->OnKeyEvent(event); // presss 8 event.RemoveReleasedKeyItems(item5); event.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_8); @@ -122,7 +122,7 @@ void AccessibilityMouseKeyUnitTest::OnKeyEventPresssSixToNine(MMI::KeyEvent &eve item6.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_8); item6.SetPressed(true); event.AddKeyItem(item6); - mouseKey_->OnKeyEvent(*event); + mouseKey_->OnKeyEvent(event); // presss 9 event.RemoveReleasedKeyItems(item6); event.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_9); @@ -130,7 +130,7 @@ void AccessibilityMouseKeyUnitTest::OnKeyEventPresssSixToNine(MMI::KeyEvent &eve item7.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_9); item7.SetPressed(true); event.AddKeyItem(item7); - mouseKey_->OnKeyEvent(*event); + mouseKey_->OnKeyEvent(event); } /** -- Gitee From b51db0baa23329ff9a2dccab324dece4b2759d6d Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 10:59:04 +0000 Subject: [PATCH 12/37] update services/aams/test/unittest/accessibility_mouse_key_test.cpp. Signed-off-by: luocheng --- .../aams/test/unittest/accessibility_mouse_key_test.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/aams/test/unittest/accessibility_mouse_key_test.cpp b/services/aams/test/unittest/accessibility_mouse_key_test.cpp index f76108d8..beccbf6c 100644 --- a/services/aams/test/unittest/accessibility_mouse_key_test.cpp +++ b/services/aams/test/unittest/accessibility_mouse_key_test.cpp @@ -63,7 +63,8 @@ void AccessibilityMouseKeyUnitTest::TearDown() mouseKey_ = nullptr; } -void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent &event){ +void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent &event) +{ // presss 1 event.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_1); event.SetKeyAction(MMI::KeyEvent::KEY_ACTION_DOWN); @@ -98,7 +99,8 @@ void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent &eve mouseKey_->OnKeyEvent(event); } -void AccessibilityMouseKeyUnitTest::OnKeyEventPresssSixToNine(MMI::KeyEvent &event){ +void AccessibilityMouseKeyUnitTest::OnKeyEventPresssSixToNine(MMI::KeyEvent &event) +{ // presss 6 event.RemoveReleasedKeyItems(item3); event.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_6); -- Gitee From 539f9c913be8651a13db9514cab838d1690a97e2 Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 11:04:10 +0000 Subject: [PATCH 13/37] update services/aams/test/unittest/accessibility_short_key_test.cpp. Signed-off-by: luocheng --- services/aams/test/unittest/accessibility_short_key_test.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/aams/test/unittest/accessibility_short_key_test.cpp b/services/aams/test/unittest/accessibility_short_key_test.cpp index 1b6a9fe4..911c842e 100644 --- a/services/aams/test/unittest/accessibility_short_key_test.cpp +++ b/services/aams/test/unittest/accessibility_short_key_test.cpp @@ -77,7 +77,8 @@ std::shared_ptr AccessibilityShortKeyUnitTest::CreateKeyEvent(int return event; } -bool AccessibilityShortKeyUnitTest::OnKeyEventDown(){ +bool AccessibilityShortKeyUnitTest::OnKeyEventDown() +{ std::shared_ptr downEvent = CreateKeyEvent(MMI::KeyEvent::KEYCODE_POWER, MMI::KeyEvent::KEY_ACTION_DOWN); if (!downEvent) { -- Gitee From 8217e59ba615dd06c462f4215cbdf0adfc4e69af Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 11:04:49 +0000 Subject: [PATCH 14/37] update services/aams/test/unittest/accessibility_touch_guider_test.cpp. Signed-off-by: luocheng --- .../aams/test/unittest/accessibility_touch_guider_test.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/aams/test/unittest/accessibility_touch_guider_test.cpp b/services/aams/test/unittest/accessibility_touch_guider_test.cpp index ebdd1dca..d1ea34d3 100755 --- a/services/aams/test/unittest/accessibility_touch_guider_test.cpp +++ b/services/aams/test/unittest/accessibility_touch_guider_test.cpp @@ -57,7 +57,8 @@ protected: int32_t pointId_ = -1; }; -void TouchGuiderExpect(EventType eventType, int32_t GestureTypeInt){ +void TouchGuiderExpect(EventType eventType, int32_t GestureTypeInt) +{ eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(2); EXPECT_EQ(eventType, EventType::TYPE_TOUCH_GUIDE_GESTURE_END); eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(3); @@ -66,7 +67,8 @@ void TouchGuiderExpect(EventType eventType, int32_t GestureTypeInt){ EXPECT_EQ(uTgestureId, GestureTypeInt); } -void TouchGuiderTest::TouchGuiderPointSet(MMI::PointerEvent::PointerItem &point, int id, int x, int y){ +void TouchGuiderTest::TouchGuiderPointSet(MMI::PointerEvent::PointerItem &point, int id, int x, int y) +{ point.SetPointerId(id); point.SetDisplayX(x); point.SetDisplayY(y); -- Gitee From a3ee7330a2d5d3450a9607f6bcd83543508af6d9 Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 11:06:15 +0000 Subject: [PATCH 15/37] update services/aams/test/unittest/accessibility_short_key_test.cpp. Signed-off-by: luocheng --- services/aams/test/unittest/accessibility_short_key_test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/aams/test/unittest/accessibility_short_key_test.cpp b/services/aams/test/unittest/accessibility_short_key_test.cpp index 911c842e..315af568 100644 --- a/services/aams/test/unittest/accessibility_short_key_test.cpp +++ b/services/aams/test/unittest/accessibility_short_key_test.cpp @@ -89,7 +89,6 @@ bool AccessibilityShortKeyUnitTest::OnKeyEventDown() downEvent->AddKeyItem(item); shortKey_->OnKeyEvent(*downEvent); return true; - } /** -- Gitee From 5e52043932164e7decb9e967c70bf848c2db14f4 Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 11:08:19 +0000 Subject: [PATCH 16/37] update services/aams/test/unittest/accessibility_short_key_test.cpp. Signed-off-by: luocheng --- .../aams/test/unittest/accessibility_short_key_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/aams/test/unittest/accessibility_short_key_test.cpp b/services/aams/test/unittest/accessibility_short_key_test.cpp index 315af568..e6ba3b3f 100644 --- a/services/aams/test/unittest/accessibility_short_key_test.cpp +++ b/services/aams/test/unittest/accessibility_short_key_test.cpp @@ -189,7 +189,7 @@ HWTEST_F(AccessibilityShortKeyUnitTest, AccessibilityShortKey_Unittest_OnKeyEven // power key(down) flag = OnKeyEventDown(); - if (!flag){ + if (!flag) { return ; } @@ -203,7 +203,7 @@ HWTEST_F(AccessibilityShortKeyUnitTest, AccessibilityShortKey_Unittest_OnKeyEven // power key(down) flag = OnKeyEventDown(); - if (!flag){ + if (!flag) { return ; } @@ -217,7 +217,7 @@ HWTEST_F(AccessibilityShortKeyUnitTest, AccessibilityShortKey_Unittest_OnKeyEven // power key(down) flag = OnKeyEventDown(); - if (!flag){ + if (!flag) { return ; } -- Gitee From 327a2490c901a91f46d6171eff47f8869dd82530 Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 11:09:46 +0000 Subject: [PATCH 17/37] update services/aams/test/unittest/accessibility_window_manager_test.cpp. Signed-off-by: luocheng --- .../test/unittest/accessibility_window_manager_test.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/aams/test/unittest/accessibility_window_manager_test.cpp b/services/aams/test/unittest/accessibility_window_manager_test.cpp index 50c8dd3b..f627ac3a 100644 --- a/services/aams/test/unittest/accessibility_window_manager_test.cpp +++ b/services/aams/test/unittest/accessibility_window_manager_test.cpp @@ -93,7 +93,8 @@ sptr GetRosenWindowInfo(Rosen::WindowType window return rosen_winInfo; } -void AccessibilityWindowManagerTest::AddActiveWindow(AccessibilityWindowManager &windowInfoManager){ +void AccessibilityWindowManagerTest::AddActiveWindow(AccessibilityWindowManager &windowInfoManager) +{ sptr rosenWinInfoFirst = new Rosen::AccessibilityWindowInfo(); rosenWinInfoFirst->type_ = Rosen::WindowType::WINDOW_TYPE_APP_MAIN_WINDOW; rosenWinInfoFirst->wid_ = 1; @@ -112,7 +113,8 @@ void AccessibilityWindowManagerTest::AddActiveWindow(AccessibilityWindowManager EXPECT_EQ(windowInfoManager.a11yWindows_.size(), 1); } -void AccessibilityWindowManagerTest::AddNormalWindow(AccessibilityWindowManager &windowInfoManager){ +void AccessibilityWindowManagerTest::AddNormalWindow(AccessibilityWindowManager &windowInfoManager) +{ sptr rosenWinInfoSecond = new Rosen::AccessibilityWindowInfo(); rosenWinInfoSecond->type_ = Rosen::WindowType::APP_WINDOW_BASE; rosenWinInfoSecond->wid_ = WINDOW_ID; -- Gitee From 032bb9056b9df7a281082a6d55042f39738c519b Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 11:12:47 +0000 Subject: [PATCH 18/37] update Signed-off-by: luocheng --- .../aams_accessibility_touch_guider_test.cpp | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) 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 d76c97af..81e1c32d 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 @@ -50,13 +50,14 @@ public: 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); + 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); + 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); + MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, + MMI::PointerEvent::PointerItem point3); void SetUp(); void TearDown(); @@ -75,7 +76,8 @@ protected: bool AamsTouchGuideTest::OnPointerEventOnePointsTest1(std::vector &points, MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3, - MMI::PointerEvent::PointerItem point4){ + MMI::PointerEvent::PointerItem point4) +{ points.emplace_back(point1); std::shared_ptr event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, points, 0, 0, 1); @@ -112,7 +114,8 @@ bool AamsTouchGuideTest::OnPointerEventOnePointsTest1(std::vector &points, MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3, - MMI::PointerEvent::PointerItem point4){ + MMI::PointerEvent::PointerItem point4) +{ points.emplace_back(point1); std::shared_ptr event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, points, 0, 0, 1); @@ -144,7 +147,8 @@ bool AamsTouchGuideTest::OnPointerEventOnePointsTest3(std::vector &points, - MMI::PointerEvent::PointerItem point1, MMI::PointerEvent::PointerItem point2, MMI::PointerEvent::PointerItem point3){ + 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); -- Gitee From 5d6ddf98585b334f8af2fdd59848e90cfcacebe8 Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 11:23:13 +0000 Subject: [PATCH 19/37] update services/aams/test/unittest/accessibility_touch_guider_test.cpp. Signed-off-by: luocheng --- .../aams/test/unittest/accessibility_touch_guider_test.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/aams/test/unittest/accessibility_touch_guider_test.cpp b/services/aams/test/unittest/accessibility_touch_guider_test.cpp index d1ea34d3..73d46599 100755 --- a/services/aams/test/unittest/accessibility_touch_guider_test.cpp +++ b/services/aams/test/unittest/accessibility_touch_guider_test.cpp @@ -25,6 +25,9 @@ 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 uint32_t SLEEP_TIME_3 = 3; constexpr int64_t MS_TO_US = 1000; constexpr int32_t ACCOUNT_ID = 100; @@ -59,9 +62,9 @@ protected: void TouchGuiderExpect(EventType eventType, int32_t GestureTypeInt) { - eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(2); + eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(GET_EVENT_TARGET_INDEX_2); EXPECT_EQ(eventType, EventType::TYPE_TOUCH_GUIDE_GESTURE_END); - eventType = AccessibilityAbilityHelper::GetInstance().GetEventTypeOfTargetIndex(3); + 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); -- Gitee From 74cb553408498c7de4423fc3dc751536eb163438 Mon Sep 17 00:00:00 2001 From: luocheng Date: Sat, 15 Jul 2023 11:25:22 +0000 Subject: [PATCH 20/37] update Signed-off-by: luocheng --- .../aams_accessibility_touch_guider_test.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 81e1c32d..a4d22808 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; const int32_t SLEEP_TIME_3 = 3; } // namespace @@ -88,7 +89,7 @@ bool AamsTouchGuideTest::OnPointerEventOnePointsTest1(std::vectorOnInputEvent(event); points.emplace_back(point2); - event = CreateTouchEvent(MMI::PointerEvent::POINTER_ACTION_DOWN, points, 0, 0, 2); + 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); @@ -97,7 +98,7 @@ bool AamsTouchGuideTest::OnPointerEventOnePointsTest1(std::vectorOnInputEvent(event); points.clear(); @@ -107,7 +108,7 @@ bool AamsTouchGuideTest::OnPointerEventOnePointsTest1(std::vectorOnInputEvent(event); return true; } -- Gitee From e484c0507e95aa3c76989df3d829f1ac2e7e760e Mon Sep 17 00:00:00 2001 From: luocheng Date: Sun, 16 Jul 2023 15:39:03 +0000 Subject: [PATCH 21/37] update Signed-off-by: luocheng --- .../aams_accessibility_touch_guider_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a4d22808..029cb07a 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,7 +37,7 @@ using namespace testing::ext; namespace OHOS { namespace Accessibility { namespace { - constexpr uint32_t POINT_ID = 2; + constexpr uint32_t POINT_ID_2 = 2; const int32_t SLEEP_TIME_3 = 3; } // namespace -- Gitee From 8967e07abf782bddf55b32e2ffe7d7ce71bfef8b Mon Sep 17 00:00:00 2001 From: luocheng Date: Sun, 16 Jul 2023 15:40:28 +0000 Subject: [PATCH 22/37] update services/aams/test/unittest/accessibility_touch_guider_test.cpp. Signed-off-by: luocheng --- services/aams/test/unittest/accessibility_touch_guider_test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/aams/test/unittest/accessibility_touch_guider_test.cpp b/services/aams/test/unittest/accessibility_touch_guider_test.cpp index 73d46599..3f70dbbf 100755 --- a/services/aams/test/unittest/accessibility_touch_guider_test.cpp +++ b/services/aams/test/unittest/accessibility_touch_guider_test.cpp @@ -28,7 +28,6 @@ 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 uint32_t SLEEP_TIME_3 = 3; constexpr int64_t MS_TO_US = 1000; constexpr int32_t ACCOUNT_ID = 100; constexpr int32_t WINDOW_ID = 2; -- Gitee From 69bc94d1c13338ae045d60a3a13ee24c9381b358 Mon Sep 17 00:00:00 2001 From: luocheng Date: Sun, 16 Jul 2023 15:41:38 +0000 Subject: [PATCH 23/37] update services/aams/test/unittest/accessibility_mouse_key_test.cpp. Signed-off-by: luocheng --- services/aams/test/unittest/accessibility_mouse_key_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/aams/test/unittest/accessibility_mouse_key_test.cpp b/services/aams/test/unittest/accessibility_mouse_key_test.cpp index beccbf6c..7a671d31 100644 --- a/services/aams/test/unittest/accessibility_mouse_key_test.cpp +++ b/services/aams/test/unittest/accessibility_mouse_key_test.cpp @@ -97,12 +97,12 @@ void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent &eve item3.SetPressed(true); event.AddKeyItem(item3); mouseKey_->OnKeyEvent(event); + event.RemoveReleasedKeyItems(item3); } void AccessibilityMouseKeyUnitTest::OnKeyEventPresssSixToNine(MMI::KeyEvent &event) { // presss 6 - event.RemoveReleasedKeyItems(item3); event.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_6); MMI::KeyEvent::KeyItem item4; item4.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_6); -- Gitee From 15fe835290aa3f6410beb5ccc7933aee3c4908a1 Mon Sep 17 00:00:00 2001 From: luocheng Date: Mon, 17 Jul 2023 01:21:47 +0000 Subject: [PATCH 24/37] update services/aams/test/unittest/accessibility_touch_guider_test.cpp. Signed-off-by: luocheng --- services/aams/test/unittest/accessibility_touch_guider_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/aams/test/unittest/accessibility_touch_guider_test.cpp b/services/aams/test/unittest/accessibility_touch_guider_test.cpp index 3f70dbbf..45c243eb 100755 --- a/services/aams/test/unittest/accessibility_touch_guider_test.cpp +++ b/services/aams/test/unittest/accessibility_touch_guider_test.cpp @@ -59,7 +59,7 @@ protected: int32_t pointId_ = -1; }; -void TouchGuiderExpect(EventType eventType, int32_t GestureTypeInt) +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); -- Gitee From 0db73001ae45c6bccc5879997ca015abad9c6ffe Mon Sep 17 00:00:00 2001 From: luocheng Date: Mon, 17 Jul 2023 12:34:28 +0000 Subject: [PATCH 25/37] update services/aams/test/unittest/accessibility_window_manager_test.cpp. Signed-off-by: luocheng --- .../accessibility_window_manager_test.cpp | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/services/aams/test/unittest/accessibility_window_manager_test.cpp b/services/aams/test/unittest/accessibility_window_manager_test.cpp index f627ac3a..45ff83ed 100644 --- a/services/aams/test/unittest/accessibility_window_manager_test.cpp +++ b/services/aams/test/unittest/accessibility_window_manager_test.cpp @@ -49,8 +49,10 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); - static void AddActiveWindow(AccessibilityWindowManager &windowInfoManager); - static void AddNormalWindow(AccessibilityWindowManager &windowInfoManager); + static void AddActiveWindow(AccessibilityWindowManager &windowInfoManager, + sptr rosenWinInfoFirst); + static void AddNormalWindow(AccessibilityWindowManager &windowInfoManager, + sptr rosenWinInfoSecond); void SetUp() override; void TearDown() override; }; @@ -93,7 +95,8 @@ sptr GetRosenWindowInfo(Rosen::WindowType window return rosen_winInfo; } -void AccessibilityWindowManagerTest::AddActiveWindow(AccessibilityWindowManager &windowInfoManager) +void AccessibilityWindowManagerTest::AddActiveWindow(AccessibilityWindowManager &windowInfoManager, + sptr rosenWinInfoFirst) { sptr rosenWinInfoFirst = new Rosen::AccessibilityWindowInfo(); rosenWinInfoFirst->type_ = Rosen::WindowType::WINDOW_TYPE_APP_MAIN_WINDOW; @@ -113,7 +116,8 @@ void AccessibilityWindowManagerTest::AddActiveWindow(AccessibilityWindowManager EXPECT_EQ(windowInfoManager.a11yWindows_.size(), 1); } -void AccessibilityWindowManagerTest::AddNormalWindow(AccessibilityWindowManager &windowInfoManager) +void AccessibilityWindowManagerTest::AddNormalWindow(AccessibilityWindowManager &windowInfoManager, + sptr rosenWinInfoFirst) { sptr rosenWinInfoSecond = new Rosen::AccessibilityWindowInfo(); rosenWinInfoSecond->type_ = Rosen::WindowType::APP_WINDOW_BASE; @@ -417,24 +421,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 - AddNormalWindow(windowInfoManager); + sptr rosenWinInfoSecond = new Rosen::AccessibilityWindowInfo(); + AddNormalWindow(windowInfoManager, rosenWinInfoSecond); // Remove the first window std::vector> infos; @@ -474,12 +465,14 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_OnW EXPECT_EQ(windowInfoManager.activeWindowId_, INVALID_WINDOW_ID); // Add an active window - AddActiveWindow(windowInfoManager); + sptr rosenWinInfoFirst = new Rosen::AccessibilityWindowInfo(); + AddActiveWindow(windowInfoManager, rosenWinInfoFirst); windowInfoManager.SetActiveWindow(rosenWinInfoFirst->wid_); EXPECT_EQ(windowInfoManager.activeWindowId_, rosenWinInfoFirst->wid_); // Add another normal window - AddNormalWindow(windowInfoManager); + sptr rosenWinInfoSecond = new Rosen::AccessibilityWindowInfo(); + AddNormalWindow(windowInfoManager, rosenWinInfoSecond); // Remove the active window std::vector> infos; -- Gitee From 4e36dea7ebb61440d36c475a6b0d3a1897a28c7c Mon Sep 17 00:00:00 2001 From: luocheng Date: Mon, 17 Jul 2023 14:02:05 +0000 Subject: [PATCH 26/37] update services/aams/test/unittest/accessibility_touch_guider_test.cpp. Signed-off-by: luocheng --- services/aams/test/unittest/accessibility_touch_guider_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/aams/test/unittest/accessibility_touch_guider_test.cpp b/services/aams/test/unittest/accessibility_touch_guider_test.cpp index 45c243eb..ab52693a 100755 --- a/services/aams/test/unittest/accessibility_touch_guider_test.cpp +++ b/services/aams/test/unittest/accessibility_touch_guider_test.cpp @@ -63,7 +63,7 @@ void TouchGuiderTest::TouchGuiderExpect(EventType eventType, int32_t GestureType { 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 ); + 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); -- Gitee From 2c266a8f51ad2fbecf4521036823b56804b2e055 Mon Sep 17 00:00:00 2001 From: luocheng Date: Mon, 17 Jul 2023 14:03:46 +0000 Subject: [PATCH 27/37] update services/aams/test/unittest/accessibility_window_manager_test.cpp. Signed-off-by: luocheng --- .../aams/test/unittest/accessibility_window_manager_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/aams/test/unittest/accessibility_window_manager_test.cpp b/services/aams/test/unittest/accessibility_window_manager_test.cpp index 45ff83ed..926d90ca 100644 --- a/services/aams/test/unittest/accessibility_window_manager_test.cpp +++ b/services/aams/test/unittest/accessibility_window_manager_test.cpp @@ -421,7 +421,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_OnW // Add a window sptr rosenWinInfoFirst = new Rosen::AccessibilityWindowInfo(); - AddActiveWindow(windowInfoManager, rosenWinInfoFirst); + AddActiveWindow(windowInfoManager, rosenWinInfoFirst); // Add another window sptr rosenWinInfoSecond = new Rosen::AccessibilityWindowInfo(); @@ -466,7 +466,7 @@ HWTEST_F(AccessibilityWindowManagerTest, AccessibilityWindowManager_Unittest_OnW // Add an active window sptr rosenWinInfoFirst = new Rosen::AccessibilityWindowInfo(); - AddActiveWindow(windowInfoManager, rosenWinInfoFirst); + AddActiveWindow(windowInfoManager, rosenWinInfoFirst); windowInfoManager.SetActiveWindow(rosenWinInfoFirst->wid_); EXPECT_EQ(windowInfoManager.activeWindowId_, rosenWinInfoFirst->wid_); -- Gitee From a5bafc771f7030037772cd553491e292cd369162 Mon Sep 17 00:00:00 2001 From: luocheng Date: Mon, 17 Jul 2023 14:04:55 +0000 Subject: [PATCH 28/37] update services/aams/test/unittest/accessibility_window_manager_test.cpp. Signed-off-by: luocheng --- .../aams/test/unittest/accessibility_window_manager_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/aams/test/unittest/accessibility_window_manager_test.cpp b/services/aams/test/unittest/accessibility_window_manager_test.cpp index 926d90ca..d954b76c 100644 --- a/services/aams/test/unittest/accessibility_window_manager_test.cpp +++ b/services/aams/test/unittest/accessibility_window_manager_test.cpp @@ -117,7 +117,7 @@ void AccessibilityWindowManagerTest::AddActiveWindow(AccessibilityWindowManager } void AccessibilityWindowManagerTest::AddNormalWindow(AccessibilityWindowManager &windowInfoManager, - sptr rosenWinInfoFirst) + sptr rosenWinInfoFirst) { sptr rosenWinInfoSecond = new Rosen::AccessibilityWindowInfo(); rosenWinInfoSecond->type_ = Rosen::WindowType::APP_WINDOW_BASE; -- Gitee From 72f4d14f7a5bc81060cd5e0dbffcf6e4bf02dc17 Mon Sep 17 00:00:00 2001 From: luocheng Date: Mon, 17 Jul 2023 14:05:45 +0000 Subject: [PATCH 29/37] update Signed-off-by: luocheng --- .../aams_accessibility_touch_guider_test.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 029cb07a..05376954 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 @@ -174,7 +174,8 @@ bool AamsTouchGuideTest::OnPointerEventOnePointsTest7(std::vector Date: Mon, 17 Jul 2023 14:14:37 +0000 Subject: [PATCH 30/37] update services/aams/test/unittest/accessibility_window_manager_test.cpp. Signed-off-by: luocheng --- .../test/unittest/accessibility_window_manager_test.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/aams/test/unittest/accessibility_window_manager_test.cpp b/services/aams/test/unittest/accessibility_window_manager_test.cpp index d954b76c..3868078f 100644 --- a/services/aams/test/unittest/accessibility_window_manager_test.cpp +++ b/services/aams/test/unittest/accessibility_window_manager_test.cpp @@ -98,7 +98,6 @@ sptr GetRosenWindowInfo(Rosen::WindowType window void AccessibilityWindowManagerTest::AddActiveWindow(AccessibilityWindowManager &windowInfoManager, sptr rosenWinInfoFirst) { - sptr rosenWinInfoFirst = new Rosen::AccessibilityWindowInfo(); rosenWinInfoFirst->type_ = Rosen::WindowType::WINDOW_TYPE_APP_MAIN_WINDOW; rosenWinInfoFirst->wid_ = 1; rosenWinInfoFirst->focused_ = false; @@ -123,6 +122,11 @@ void AccessibilityWindowManagerTest::AddNormalWindow(AccessibilityWindowManager 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; -- Gitee From 54d56a292379fe5e94c3cd1cffbd8767e0e1ed5c Mon Sep 17 00:00:00 2001 From: luocheng Date: Tue, 18 Jul 2023 01:13:12 +0000 Subject: [PATCH 31/37] update services/aams/test/unittest/accessibility_short_key_test.cpp. Signed-off-by: luocheng --- services/aams/test/unittest/accessibility_short_key_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/aams/test/unittest/accessibility_short_key_test.cpp b/services/aams/test/unittest/accessibility_short_key_test.cpp index e6ba3b3f..0307eb16 100644 --- a/services/aams/test/unittest/accessibility_short_key_test.cpp +++ b/services/aams/test/unittest/accessibility_short_key_test.cpp @@ -34,7 +34,7 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); - static bool OnKeyEventDown(); + bool OnKeyEventDown(); void SetUp() override; void TearDown() override; std::shared_ptr CreateKeyEvent(int32_t keyCode, int32_t keyAction); -- Gitee From 563c62271afaba98939e0d646d38d3c431fefebe Mon Sep 17 00:00:00 2001 From: luocheng Date: Tue, 18 Jul 2023 09:11:33 +0000 Subject: [PATCH 32/37] update services/aams/test/unittest/accessibility_window_manager_test.cpp. Signed-off-by: luocheng --- .../aams/test/unittest/accessibility_window_manager_test.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/aams/test/unittest/accessibility_window_manager_test.cpp b/services/aams/test/unittest/accessibility_window_manager_test.cpp index 3868078f..f013549b 100644 --- a/services/aams/test/unittest/accessibility_window_manager_test.cpp +++ b/services/aams/test/unittest/accessibility_window_manager_test.cpp @@ -116,9 +116,8 @@ void AccessibilityWindowManagerTest::AddActiveWindow(AccessibilityWindowManager } void AccessibilityWindowManagerTest::AddNormalWindow(AccessibilityWindowManager &windowInfoManager, - sptr rosenWinInfoFirst) + sptr rosenWinInfoSecond) { - sptr rosenWinInfoSecond = new Rosen::AccessibilityWindowInfo(); rosenWinInfoSecond->type_ = Rosen::WindowType::APP_WINDOW_BASE; rosenWinInfoSecond->wid_ = WINDOW_ID; rosenWinInfoSecond->focused_ = false; -- Gitee From b311feada0d11bdcb18e4f257ce5f3a8c0c6a0b2 Mon Sep 17 00:00:00 2001 From: luocheng Date: Tue, 18 Jul 2023 09:32:22 +0000 Subject: [PATCH 33/37] update services/aams/test/unittest/accessibility_mouse_key_test.cpp. Signed-off-by: luocheng --- .../unittest/accessibility_mouse_key_test.cpp | 81 ++++--------------- 1 file changed, 15 insertions(+), 66 deletions(-) diff --git a/services/aams/test/unittest/accessibility_mouse_key_test.cpp b/services/aams/test/unittest/accessibility_mouse_key_test.cpp index 7a671d31..d71981de 100644 --- a/services/aams/test/unittest/accessibility_mouse_key_test.cpp +++ b/services/aams/test/unittest/accessibility_mouse_key_test.cpp @@ -33,8 +33,7 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); - void OnKeyEventPresssOneToFour(MMI::KeyEvent &event); - void OnKeyEventPresssSixToNine(MMI::KeyEvent &event); + void OnKeyEventPresss(MMI::KeyEvent &event, const int32_t keycode); void SetUp() override; void TearDown() override; @@ -63,76 +62,16 @@ void AccessibilityMouseKeyUnitTest::TearDown() mouseKey_ = nullptr; } -void AccessibilityMouseKeyUnitTest::OnKeyEventPresssOneToFour(MMI::KeyEvent &event) +void AccessibilityMouseKeyUnitTest::OnKeyEventPresss(MMI::KeyEvent &event, const int32_t keycode) { - // presss 1 - event.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_1); - event.SetKeyAction(MMI::KeyEvent::KEY_ACTION_DOWN); + // presss + event.SetKeyCode(keycode); MMI::KeyEvent::KeyItem item; - item.SetKeyCode(MMI::KeyEvent::KEYCODE_NUMPAD_1); + item.SetKeyCode(keycode); 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); - event.RemoveReleasedKeyItems(item3); -} - -void AccessibilityMouseKeyUnitTest::OnKeyEventPresssSixToNine(MMI::KeyEvent &event) -{ - // presss 6 - 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); } /** @@ -201,6 +140,16 @@ HWTEST_F(AccessibilityMouseKeyUnitTest, AccessibilityMouseKey_Unittest_OnKeyEven if (!event) { return; } + event.SetKeyAction(MMI::KeyEvent::KEY_ACTION_DOWN); + 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); + OnKeyEventPresssOneToFour(*event); OnKeyEventPresssSixToNine(*event); -- Gitee From 4c3a518e10dc1c7c0e2a914df2be2e14178b7523 Mon Sep 17 00:00:00 2001 From: luocheng Date: Tue, 18 Jul 2023 09:36:16 +0000 Subject: [PATCH 34/37] update services/aams/test/unittest/accessibility_short_key_test.cpp. Signed-off-by: luocheng --- .../unittest/accessibility_short_key_test.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/services/aams/test/unittest/accessibility_short_key_test.cpp b/services/aams/test/unittest/accessibility_short_key_test.cpp index 0307eb16..5a9f70dc 100644 --- a/services/aams/test/unittest/accessibility_short_key_test.cpp +++ b/services/aams/test/unittest/accessibility_short_key_test.cpp @@ -185,12 +185,9 @@ HWTEST_F(AccessibilityShortKeyUnitTest, AccessibilityShortKey_Unittest_OnKeyEven if (!shortKey_) { return; } - bool flag = true; - // power key(down) - flag = OnKeyEventDown(); - if (!flag) { - return ; + if (!OnKeyEventDown()) { + return; } // power key(up) @@ -202,9 +199,8 @@ HWTEST_F(AccessibilityShortKeyUnitTest, AccessibilityShortKey_Unittest_OnKeyEven shortKey_->OnKeyEvent(*upEvent); // power key(down) - flag = OnKeyEventDown(); - if (!flag) { - return ; + if (!OnKeyEventDown()) { + return; } // power key(up) @@ -216,9 +212,8 @@ HWTEST_F(AccessibilityShortKeyUnitTest, AccessibilityShortKey_Unittest_OnKeyEven shortKey_->OnKeyEvent(*upEvent1); // power key(down) - flag = OnKeyEventDown(); - if (!flag) { - return ; + if (!OnKeyEventDown()) { + return; } // power key(up) -- Gitee From 37061b9323e5f7536b730baecaac20ee5b6e16be Mon Sep 17 00:00:00 2001 From: luocheng Date: Tue, 18 Jul 2023 09:37:47 +0000 Subject: [PATCH 35/37] update services/aams/test/unittest/accessibility_touch_guider_test.cpp. Signed-off-by: luocheng --- .../accessibility_touch_guider_test.cpp | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/services/aams/test/unittest/accessibility_touch_guider_test.cpp b/services/aams/test/unittest/accessibility_touch_guider_test.cpp index ab52693a..e5577821 100755 --- a/services/aams/test/unittest/accessibility_touch_guider_test.cpp +++ b/services/aams/test/unittest/accessibility_touch_guider_test.cpp @@ -42,7 +42,7 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); - static void TouchGuiderPointSet(MMI::PointerEvent::PointerItem &point, int id, int x, int y); + 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(); @@ -69,7 +69,7 @@ void TouchGuiderTest::TouchGuiderExpect(EventType eventType, int32_t GestureType EXPECT_EQ(uTgestureId, GestureTypeInt); } -void TouchGuiderTest::TouchGuiderPointSet(MMI::PointerEvent::PointerItem &point, int id, int x, int y) +void TouchGuiderTest::SetTouchGuiderPoint(MMI::PointerEvent::PointerItem &point, int id, int x, int y) { point.SetPointerId(id); point.SetDisplayX(x); @@ -710,13 +710,13 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnPointerEvent_013, TestSize.Leve std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; - TouchGuiderPointSet(point, 1, 2500, 2500); + SetTouchGuiderPoint(point, 1, 2500, 2500); MMI::PointerEvent::PointerItem movepoint1 = {}; - TouchGuiderPointSet(movepoint1, 1, 3500, 2500); + SetTouchGuiderPoint(movepoint1, 1, 3500, 2500); MMI::PointerEvent::PointerItem movepoint2 = {}; - TouchGuiderPointSet(movepoint2, 1, 5000, 2500); + SetTouchGuiderPoint(movepoint2, 1, 5000, 2500); MMI::PointerEvent::PointerItem movepoint3 = {}; - TouchGuiderPointSet(movepoint3, 1, 4000, 0); + SetTouchGuiderPoint(movepoint3, 1, 4000, 0); points.emplace_back(point); std::shared_ptr event = @@ -772,13 +772,13 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnPointerEvent_014, TestSize.Leve std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; - TouchGuiderPointSet(point, 1, 2500, 2500); + SetTouchGuiderPoint(point, 1, 2500, 2500); MMI::PointerEvent::PointerItem movepoint1 = {}; - TouchGuiderPointSet(movepoint1, 1, 1500, 2500); + SetTouchGuiderPoint(movepoint1, 1, 1500, 2500); MMI::PointerEvent::PointerItem movepoint2 = {}; - TouchGuiderPointSet(movepoint2, 1, 0, 2500); + SetTouchGuiderPoint(movepoint2, 1, 0, 2500); MMI::PointerEvent::PointerItem movepoint3 = {}; - TouchGuiderPointSet(movepoint3, 1, 1000, 0); + SetTouchGuiderPoint(movepoint3, 1, 1000, 0); points.emplace_back(point); std::shared_ptr event = @@ -834,13 +834,13 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnPointerEvent_015, TestSize.Leve std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; - TouchGuiderPointSet(point, 1, 2500, 2500); + SetTouchGuiderPoint(point, 1, 2500, 2500); MMI::PointerEvent::PointerItem movepoint1 = {}; - TouchGuiderPointSet(movepoint1, 1, 2500, 3500); + SetTouchGuiderPoint(movepoint1, 1, 2500, 3500); MMI::PointerEvent::PointerItem movepoint2 = {}; - TouchGuiderPointSet(movepoint2, 1, 2500, 5000); + SetTouchGuiderPoint(movepoint2, 1, 2500, 5000); MMI::PointerEvent::PointerItem movepoint3 = {}; - TouchGuiderPointSet(movepoint3, 1, 0, 4000); + SetTouchGuiderPoint(movepoint3, 1, 0, 4000); points.emplace_back(point); std::shared_ptr event = @@ -896,13 +896,13 @@ HWTEST_F(TouchGuiderTest, TouchGuider_Unittest_OnPointerEvent_016, TestSize.Leve std::vector points = {}; MMI::PointerEvent::PointerItem point = {}; - TouchGuiderPointSet(point, 1, 2500, 2500); + SetTouchGuiderPoint(point, 1, 2500, 2500); MMI::PointerEvent::PointerItem movepoint1 = {}; - TouchGuiderPointSet(movepoint1, 1, 2500, 3500); + SetTouchGuiderPoint(movepoint1, 1, 2500, 3500); MMI::PointerEvent::PointerItem movepoint2 = {}; - TouchGuiderPointSet(movepoint2, 1, 2500, 5000); + SetTouchGuiderPoint(movepoint2, 1, 2500, 5000); MMI::PointerEvent::PointerItem movepoint3 = {}; - TouchGuiderPointSet(movepoint3, 1, 5000, 4000); + SetTouchGuiderPoint(movepoint3, 1, 5000, 4000); points.emplace_back(point); std::shared_ptr event = -- Gitee From 361211f76a5e7a24ec23b00a2f8aacd817fb1f4e Mon Sep 17 00:00:00 2001 From: luocheng Date: Tue, 18 Jul 2023 10:50:51 +0000 Subject: [PATCH 36/37] update services/aams/test/unittest/accessibility_mouse_key_test.cpp. Signed-off-by: luocheng --- services/aams/test/unittest/accessibility_mouse_key_test.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/services/aams/test/unittest/accessibility_mouse_key_test.cpp b/services/aams/test/unittest/accessibility_mouse_key_test.cpp index d71981de..feb3e08b 100644 --- a/services/aams/test/unittest/accessibility_mouse_key_test.cpp +++ b/services/aams/test/unittest/accessibility_mouse_key_test.cpp @@ -150,9 +150,6 @@ HWTEST_F(AccessibilityMouseKeyUnitTest, AccessibilityMouseKey_Unittest_OnKeyEven OnKeyEventPresss(*event, MMI::KeyEvent::KEYCODE_NUMPAD_8); OnKeyEventPresss(*event, MMI::KeyEvent::KEYCODE_NUMPAD_9); - OnKeyEventPresssOneToFour(*event); - OnKeyEventPresssSixToNine(*event); - EXPECT_NE(event.get(), nullptr); GTEST_LOG_(INFO) << "AccessibilityMouseKey_Unittest_OnKeyEvent_001 end"; } -- Gitee From 5601ca3672faad93a6753bc0b230bb92ce75478c Mon Sep 17 00:00:00 2001 From: luocheng Date: Tue, 18 Jul 2023 11:24:43 +0000 Subject: [PATCH 37/37] update services/aams/test/unittest/accessibility_mouse_key_test.cpp. Signed-off-by: luocheng --- services/aams/test/unittest/accessibility_mouse_key_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/aams/test/unittest/accessibility_mouse_key_test.cpp b/services/aams/test/unittest/accessibility_mouse_key_test.cpp index feb3e08b..348d1186 100644 --- a/services/aams/test/unittest/accessibility_mouse_key_test.cpp +++ b/services/aams/test/unittest/accessibility_mouse_key_test.cpp @@ -140,7 +140,7 @@ HWTEST_F(AccessibilityMouseKeyUnitTest, AccessibilityMouseKey_Unittest_OnKeyEven if (!event) { return; } - event.SetKeyAction(MMI::KeyEvent::KEY_ACTION_DOWN); + event->SetKeyAction(MMI::KeyEvent::KEY_ACTION_DOWN); OnKeyEventPresss(*event, MMI::KeyEvent::KEYCODE_NUMPAD_1); OnKeyEventPresss(*event, MMI::KeyEvent::KEYCODE_NUMPAD_2); OnKeyEventPresss(*event, MMI::KeyEvent::KEYCODE_NUMPAD_3); -- Gitee