Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 047b57f9 authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

MotionEventTest: Use helpers to generate coords and properties 

Bug: 332191876
Test: atest MotionEventTest
Change-Id: Ie9e07f3b5996c63db5cfe0ba2a4bfb61d208dccf
parent c7b314bd

core/tests/coretests/src/android/view/MotionEventTest.java

+18 −24
Original line number Diff line number Diff line
@@ -47,21 +47,25 @@ import java.util.Set; 
public class MotionEventTest {

    private static final int ID_SOURCE_MASK = 0x3 << 30;



    private PointerCoords pointerCoords(float x, float y) {

        final var coords = new PointerCoords();

        coords.x = x;

        coords.y = y;

        return coords;

    }



    private PointerProperties fingerProperties(int id) {

        final var props = new PointerProperties();

        props.id = id;

        props.toolType = TOOL_TYPE_FINGER;

        return props;

    }



    @Test

    public void testObtainWithDisplayId() {

        final int pointerCount = 1;

        PointerProperties[] properties = new PointerProperties[pointerCount];

        final PointerCoords[] coords = new PointerCoords[pointerCount];

        for (int i = 0; i < pointerCount; i++) {

            final PointerCoords c = new PointerCoords();

            c.x = i * 10;

            c.y = i * 20;

            coords[i] = c;

            final PointerProperties p = new PointerProperties();

            p.id = i;

            p.toolType = TOOL_TYPE_FINGER;

            properties[i] = p;

        }

        final var properties = new PointerProperties[]{fingerProperties(0)};

        final var coords = new PointerCoords[]{pointerCoords(10, 20)};



        int displayId = 2;

        MotionEvent motionEvent = MotionEvent.obtain(0, 0, ACTION_DOWN,
@@ -125,18 +129,8 @@ public class MotionEventTest { 
    @Test

    public void testCalculatesCursorPositionForMultiTouchMouseEvents() {

        final int pointerCount = 2;

        final PointerProperties[] properties = new PointerProperties[pointerCount];

        final PointerCoords[] coords = new PointerCoords[pointerCount];



        for (int i = 0; i < pointerCount; ++i) {

            properties[i] = new PointerProperties();

            properties[i].id = i;

            properties[i].toolType = MotionEvent.TOOL_TYPE_FINGER;



            coords[i] = new PointerCoords();

            coords[i].x = 20 + i * 20;

            coords[i].y = 60 - i * 20;

        }

        final var properties = new PointerProperties[]{fingerProperties(0), fingerProperties(1)};

        final var coords = new PointerCoords[]{pointerCoords(20, 60), pointerCoords(40, 40)};



        final MotionEvent event = MotionEvent.obtain(0 /* downTime */,

                0 /* eventTime */, ACTION_POINTER_DOWN, pointerCount, properties, coords,