From 10e1805320a6032216272c3b353a2604cb35aad6 Mon Sep 17 00:00:00 2001 From: zhanglitao Date: Thu, 4 Sep 2025 16:40:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A7modifier=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanglitao --- .../unittest/move_drag_controller_test.cpp | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/window_scene/test/unittest/move_drag_controller_test.cpp b/window_scene/test/unittest/move_drag_controller_test.cpp index 613989cd18..c0018cc2f1 100644 --- a/window_scene/test/unittest/move_drag_controller_test.cpp +++ b/window_scene/test/unittest/move_drag_controller_test.cpp @@ -288,38 +288,38 @@ HWTEST_F(MoveDragControllerTest, UpdateGravityWhenDrag, TestSize.Level0) moveDragController->UpdateGravityWhenDrag(pointerEvent, surfaceNode); moveDragController->type_ = AreaType::RIGHT; moveDragController->UpdateGravityWhenDrag(pointerEvent, surfaceNode); - auto gravityIter = surfaceNode->propertyModifiers_.find(RSModifierType::FRAME_GRAVITY); - EXPECT_EQ(gravityIter, surfaceNode->propertyModifiers_.end()); + auto modifier = surfaceNode->GetModifierByType(ModifierNG::RSModifierType::CLIP_TO_FRAME); + EXPECT_NE(modifier, nullptr); pointerEvent->SetPointerAction(MMI::PointerEvent::POINTER_ACTION_BUTTON_DOWN); moveDragController->UpdateGravityWhenDrag(pointerEvent, surfaceNode); - gravityIter = surfaceNode->propertyModifiers_.find(RSModifierType::FRAME_GRAVITY); - EXPECT_EQ(gravityIter, surfaceNode->propertyModifiers_.end()); + modifier = surfaceNode->GetModifierByType(ModifierNG::RSModifierType::CLIP_TO_FRAME); + EXPECT_NE(modifier, nullptr); pointerEvent->SetPointerAction(MMI::PointerEvent::POINTER_ACTION_DOWN); moveDragController->UpdateGravityWhenDrag(pointerEvent, surfaceNode); - gravityIter = surfaceNode->propertyModifiers_.find(RSModifierType::FRAME_GRAVITY); - EXPECT_EQ(gravityIter, surfaceNode->propertyModifiers_.end()); + modifier = surfaceNode->GetModifierByType(ModifierNG::RSModifierType::CLIP_TO_FRAME); + EXPECT_NE(modifier, nullptr); pointerEvent->SetPointerAction(MMI::PointerEvent::POINTER_ACTION_UP); moveDragController->UpdateGravityWhenDrag(pointerEvent, surfaceNode); - gravityIter = surfaceNode->propertyModifiers_.find(RSModifierType::FRAME_GRAVITY); - EXPECT_EQ(gravityIter, surfaceNode->propertyModifiers_.end()); + modifier = surfaceNode->GetModifierByType(ModifierNG::RSModifierType::CLIP_TO_FRAME); + EXPECT_NE(modifier, nullptr); pointerEvent->SetPointerAction(MMI::PointerEvent::POINTER_ACTION_BUTTON_UP); moveDragController->UpdateGravityWhenDrag(pointerEvent, surfaceNode); - gravityIter = surfaceNode->propertyModifiers_.find(RSModifierType::FRAME_GRAVITY); - EXPECT_EQ(gravityIter, surfaceNode->propertyModifiers_.end()); + modifier = surfaceNode->GetModifierByType(ModifierNG::RSModifierType::CLIP_TO_FRAME); + EXPECT_NE(modifier, nullptr); pointerEvent->SetPointerAction(MMI::PointerEvent::POINTER_ACTION_CANCEL); moveDragController->UpdateGravityWhenDrag(pointerEvent, surfaceNode); - gravityIter = surfaceNode->propertyModifiers_.find(RSModifierType::FRAME_GRAVITY); - EXPECT_EQ(gravityIter, surfaceNode->propertyModifiers_.end()); + modifier = surfaceNode->GetModifierByType(ModifierNG::RSModifierType::CLIP_TO_FRAME); + EXPECT_NE(modifier, nullptr); pointerEvent->SetPointerAction(MMI::PointerEvent::POINTER_ACTION_UNKNOWN); moveDragController->UpdateGravityWhenDrag(pointerEvent, surfaceNode); - gravityIter = surfaceNode->propertyModifiers_.find(RSModifierType::FRAME_GRAVITY); - EXPECT_EQ(gravityIter, surfaceNode->propertyModifiers_.end()); + modifier = surfaceNode->GetModifierByType(ModifierNG::RSModifierType::CLIP_TO_FRAME); + EXPECT_NE(modifier, nullptr); } } @@ -1797,21 +1797,21 @@ HWTEST_F(MoveDragControllerTest, UpdateSubWindowGravityWhenFollow01, TestSize.Le followController->type_ = AreaType::UNDEFINED; moveDragController->UpdateSubWindowGravityWhenFollow(nullptr, nullptr); - auto gravityIter = surfaceNode->propertyModifiers_.find(RSModifierType::FRAME_GRAVITY); - ASSERT_EQ(gravityIter, surfaceNode->propertyModifiers_.end()); + auto modifier = surfaceNode->GetModifierByType(ModifierNG::RSModifierType::CLIP_TO_FRAME); + EXPECT_NE(modifier, nullptr); moveDragController->UpdateSubWindowGravityWhenFollow(nullptr, surfaceNode); - gravityIter = surfaceNode->propertyModifiers_.find(RSModifierType::FRAME_GRAVITY); - ASSERT_EQ(gravityIter, surfaceNode->propertyModifiers_.end()); + modifier = surfaceNode->GetModifierByType(ModifierNG::RSModifierType::CLIP_TO_FRAME); + EXPECT_NE(modifier, nullptr); moveDragController->UpdateSubWindowGravityWhenFollow(followController, surfaceNode); - gravityIter = surfaceNode->propertyModifiers_.find(RSModifierType::FRAME_GRAVITY); - ASSERT_EQ(gravityIter, surfaceNode->propertyModifiers_.end()); + modifier = surfaceNode->GetModifierByType(ModifierNG::RSModifierType::CLIP_TO_FRAME); + EXPECT_NE(modifier, nullptr); followController->type_ = AreaType::TOP; moveDragController->UpdateSubWindowGravityWhenFollow(followController, surfaceNode); - gravityIter = surfaceNode->propertyModifiers_.find(RSModifierType::FRAME_GRAVITY); - ASSERT_EQ(gravityIter, surfaceNode->propertyModifiers_.end()); + modifier = surfaceNode->GetModifierByType(ModifierNG::RSModifierType::CLIP_TO_FRAME); + EXPECT_NE(modifier, nullptr); } } // namespace } // namespace Rosen -- Gitee