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

Commit 9afd7086 authored by Nikita Dubrovsky's avatar Nikita Dubrovsky Committed by Android (Google) Code Review
Browse files

Merge "Fix and re-enable TextViewActivityMouseTest"

parents e9e1f4a7 4dca994b

core/tests/coretests/src/android/widget/TextViewActivityMouseTest.java

+1 −9
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.widget; 
import static android.widget.espresso.ContextMenuUtils.assertContextMenuContainsItemDisabled;

import static android.widget.espresso.ContextMenuUtils.assertContextMenuContainsItemEnabled;

import static android.widget.espresso.ContextMenuUtils.assertContextMenuIsNotDisplayed;

import static android.widget.espresso.DragHandleUtils.assertNoSelectionHandles;

import static android.widget.espresso.DragHandleUtils.onHandleView;

import static android.widget.espresso.TextViewActions.mouseClick;

import static android.widget.espresso.TextViewActions.mouseClickOnTextAtIndex;
@@ -64,7 +63,6 @@ import org.junit.runner.RunWith; 
 */

@RunWith(AndroidJUnit4.class)

@MediumTest

@Suppress // Consistently failing. b/29591177

public class TextViewActivityMouseTest {



    @Rule
@@ -86,11 +84,8 @@ public class TextViewActivityMouseTest { 
        onView(withId(R.id.textview)).perform(mouseClick());

        onView(withId(R.id.textview)).perform(replaceText(helloWorld));



        assertNoSelectionHandles();



        onView(withId(R.id.textview)).perform(

                mouseDragOnText(helloWorld.indexOf("llo"), helloWorld.indexOf("ld!")));



        onView(withId(R.id.textview)).check(hasSelection("llo wor"));



        onHandleView(com.android.internal.R.id.selection_start_handle)
@@ -100,8 +95,6 @@ public class TextViewActivityMouseTest { 


        onView(withId(R.id.textview)).perform(mouseClickOnTextAtIndex(helloWorld.indexOf("w")));

        onView(withId(R.id.textview)).check(hasSelection(""));



        assertNoSelectionHandles();

    }



    @Test
@@ -196,11 +189,11 @@ public class TextViewActivityMouseTest { 


        onView(withId(R.id.textview)).check(matches(withText("abc ghi.def")));

        onView(withId(R.id.textview)).check(hasSelection(""));

        assertNoSelectionHandles();

        onView(withId(R.id.textview)).check(hasInsertionPointerAtIndex("abc ghi.def".length()));

    }



    @Test

    @Suppress // Consistently failing. b/29591177

    public void testDragAndDrop_longClick() {

        final String text = "abc def ghi.";

        onView(withId(R.id.textview)).perform(mouseClick());
@@ -213,7 +206,6 @@ public class TextViewActivityMouseTest { 


        onView(withId(R.id.textview)).check(matches(withText("abc ghi.def")));

        onView(withId(R.id.textview)).check(hasSelection(""));

        assertNoSelectionHandles();

        onView(withId(R.id.textview)).check(hasInsertionPointerAtIndex("abc ghi.def".length()));

    }

core/tests/coretests/src/android/widget/espresso/MouseUiController.java

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ public final class MouseUiController implements UiController { 
        event.setSource(InputDevice.SOURCE_MOUSE);

        if (event.getActionMasked() != MotionEvent.ACTION_UP) {

            event.setButtonState(mButton);

        } else {

            event.setButtonState(0);

        }

        return mUiController.injectMotionEvent(event);

    }