Commit dfe71a08 authored by Ian Vollick's avatar Ian Vollick Committed by Commit Bot

Fix failing junit tests

Two tests needed to be updated after crrev.com/c/1716952

TBR=mahmoudi,dewittj

Bug: 983734
Change-Id: I6bf9233601875f2f1dc973560eed6417a1ecb907
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1720109Reviewed-by: default avatarIan Vollick <vollick@chromium.org>
Commit-Queue: Ian Vollick <vollick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681150}
parent bb07a438
......@@ -66,6 +66,7 @@ public class KeyFunctionsIPHMediator implements CursorObserver {
@Override
public void onFallbackCursorModeToggled(boolean isOn) {
mIsFallbackCursorModeOn = isOn;
mModel.set(KeyFunctionsIPHProperties.IS_CURSOR_VISIBLE, mIsFallbackCursorModeOn);
}
private void show(@DisplayCause int displayCause) {
......
......@@ -92,31 +92,26 @@ public class KeyFunctionsIPHMediatorTest {
@Test
public void cursorVisibilityToggleTest() {
// Toggling cursor mode does not trigger the IPH, but should update the model.
mKeyFunctionsIPHMediator.onFallbackCursorModeToggled(true);
Assert.assertEquals(mModel.get(KeyFunctionsIPHProperties.IS_CURSOR_VISIBLE), true);
Assert.assertEquals(mModel.get(KeyFunctionsIPHProperties.IS_VISIBLE), true);
Assert.assertEquals(mModel.get(KeyFunctionsIPHProperties.IS_VISIBLE), false);
mKeyFunctionsIPHMediator.onFallbackCursorModeToggled(false);
Assert.assertEquals(mModel.get(KeyFunctionsIPHProperties.IS_CURSOR_VISIBLE), false);
Assert.assertEquals(mModel.get(KeyFunctionsIPHProperties.IS_VISIBLE), true);
ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
Assert.assertEquals(mModel.get(KeyFunctionsIPHProperties.IS_VISIBLE), false);
mKeyFunctionsIPHMediator.onFallbackCursorModeToggled(true);
Assert.assertEquals(mModel.get(KeyFunctionsIPHProperties.IS_CURSOR_VISIBLE), true);
Assert.assertEquals(mModel.get(KeyFunctionsIPHProperties.IS_VISIBLE), true);
}
@Test
public void otherIPHShowingTest() {
// Toggling cursor mode does not trigger the IPH.
when(mTracker.acquireDisplayLock()).thenReturn(null);
mKeyFunctionsIPHMediator.onFallbackCursorModeToggled(true);
Assert.assertEquals(mModel.get(KeyFunctionsIPHProperties.IS_VISIBLE), false);
when(mTracker.acquireDisplayLock()).thenReturn(mock(Tracker.DisplayLockHandle.class));
mKeyFunctionsIPHMediator.onFallbackCursorModeToggled(false);
Assert.assertEquals(mModel.get(KeyFunctionsIPHProperties.IS_VISIBLE), true);
Assert.assertEquals(mModel.get(KeyFunctionsIPHProperties.IS_VISIBLE), false);
}
@After
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment