diff options
author | Maurice Lam <yukl@google.com> | 2018-06-04 13:23:44 -0700 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2018-06-04 13:23:44 -0700 |
commit | fb543194cb300e1266b4037f643980f0ce1df23e (patch) | |
tree | c6a7971045e8f898762f098060ed67e36b93426d /library | |
parent | a1df48d7dcba9a30aaacce833b9891b660ce4246 (diff) | |
download | setupwizard-fb543194cb300e1266b4037f643980f0ce1df23e.tar.gz |
Remove testing of dispatchHoverEvent
dispatchHoverEvent in ExploreByTouchHelper is a final method and so
cannot be mocked / verified
Test: ./gradlew connectedAndroidTest
Bug: 79541791
Change-Id: I2d4bd71b492397ba5f3921bd6d89707fba843a8d
Diffstat (limited to 'library')
2 files changed, 3 insertions, 7 deletions
diff --git a/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java b/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java index 2a378e8..a0ea379 100644 --- a/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java +++ b/library/gingerbread/src/com/android/setupwizardlib/util/LinkAccessibilityHelper.java @@ -137,7 +137,7 @@ public class LinkAccessibilityHelper extends AccessibilityDelegateCompat { * * @see ExploreByTouchHelper#dispatchHoverEvent(MotionEvent) */ - public final boolean dispatchHoverEvent(MotionEvent event) { + public boolean dispatchHoverEvent(MotionEvent event) { return mDelegate instanceof ExploreByTouchHelper && ((ExploreByTouchHelper) mDelegate).dispatchHoverEvent(event); } diff --git a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/util/LinkAccessibilityHelperTest.java b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/util/LinkAccessibilityHelperTest.java index 7b4ad4d..da07b40 100644 --- a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/util/LinkAccessibilityHelperTest.java +++ b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/util/LinkAccessibilityHelperTest.java @@ -31,13 +31,13 @@ import android.support.test.runner.AndroidJUnit4; import android.text.SpannableStringBuilder; import android.util.DisplayMetrics; import android.util.TypedValue; -import android.view.MotionEvent; import android.view.View; import android.view.accessibility.AccessibilityEvent; import android.widget.FrameLayout; import android.widget.TextView; import androidx.core.text.BidiFormatter; +import androidx.core.view.AccessibilityDelegateCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat; import androidx.customview.widget.ExploreByTouchHelper; @@ -242,7 +242,7 @@ public class LinkAccessibilityHelperTest { @Test public void testMethodDelegation() { initTextView(); - ExploreByTouchHelper delegate = mock(TestPreOLinkAccessibilityHelper.class); + AccessibilityDelegateCompat delegate = mock(AccessibilityDelegateCompat.class); LinkAccessibilityHelper helper = new LinkAccessibilityHelper(delegate); AccessibilityEvent accessibilityEvent = @@ -272,10 +272,6 @@ public class LinkAccessibilityHelperTest { same(mTextView), same(accessibilityEvent)); - MotionEvent motionEvent = MotionEvent.obtain(0, 0, 0, 0, 0, 0); - helper.dispatchHoverEvent(motionEvent); - verify(delegate).dispatchHoverEvent(eq(motionEvent)); - helper.getAccessibilityNodeProvider(mTextView); verify(delegate).getAccessibilityNodeProvider(same(mTextView)); |