commit 84ed05f1db7927e492773055445cc180cf590f1c
author Mady Mellor <madym@google.com> Mon Jul 06 13:12:17 2015 -0700
committer Mady Mellor <madym@google.com> Wed Jul 08 16:06:29 2015 -0700
tree b86ef86060fbabacda1bfb03033218e52ecf0dc7
parent b3dc8db4544a3798d491c72074738ad7fede5946

CTS - Ensure that onContextClick returns the correct view

Bug: 21661739
Change-Id: I09638d352b54c4cd05a75bac34648d48449ed306

tests/tests/view/src/android/view/cts/ViewTest.java

diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java
index e95236d..2c5b30a 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -1340,6 +1340,7 @@
 
         assertTrue(view.performContextClick());
         assertTrue(listener.hasOnContextClick());
+        assertSame(view, listener.getLastViewContextClicked());
     }
 
     public void testSetOnContextClickListener() {
@@ -3987,6 +3988,7 @@
 
     private static final class OnContextClickListenerImpl implements OnContextClickListener {
         private boolean mHasContextClick = false;
+        private View mLastViewContextClicked;
 
         public boolean hasOnContextClick() {
             return mHasContextClick;
@@ -3994,12 +3996,18 @@
 
         public void reset() {
             mHasContextClick = false;
+            mLastViewContextClicked = null;
         }
 
         public boolean onContextClick(View v) {
             mHasContextClick = true;
+            mLastViewContextClicked = v;
             return true;
         }
+
+        public View getLastViewContextClicked() {
+            return mLastViewContextClicked;
+        }
     }
 
     private static final class OnFocusChangeListenerImpl implements OnFocusChangeListener {