Merge "Adding Tests for media seekbar interaction type" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
b94bb6c821
@@ -19,6 +19,7 @@ package com.android.systemui.classifier;
|
|||||||
import static com.android.systemui.classifier.Classifier.BOUNCER_UNLOCK;
|
import static com.android.systemui.classifier.Classifier.BOUNCER_UNLOCK;
|
||||||
import static com.android.systemui.classifier.Classifier.BRIGHTNESS_SLIDER;
|
import static com.android.systemui.classifier.Classifier.BRIGHTNESS_SLIDER;
|
||||||
import static com.android.systemui.classifier.Classifier.LEFT_AFFORDANCE;
|
import static com.android.systemui.classifier.Classifier.LEFT_AFFORDANCE;
|
||||||
|
import static com.android.systemui.classifier.Classifier.MEDIA_SEEKBAR;
|
||||||
import static com.android.systemui.classifier.Classifier.NOTIFICATION_DISMISS;
|
import static com.android.systemui.classifier.Classifier.NOTIFICATION_DISMISS;
|
||||||
import static com.android.systemui.classifier.Classifier.NOTIFICATION_DRAG_DOWN;
|
import static com.android.systemui.classifier.Classifier.NOTIFICATION_DRAG_DOWN;
|
||||||
import static com.android.systemui.classifier.Classifier.PULSE_EXPAND;
|
import static com.android.systemui.classifier.Classifier.PULSE_EXPAND;
|
||||||
@@ -406,4 +407,46 @@ public class TypeClassifierTest extends ClassifierTest {
|
|||||||
when(mDataProvider.isRight()).thenReturn(true);
|
when(mDataProvider.isRight()).thenReturn(true);
|
||||||
assertThat(mClassifier.classifyGesture(QS_SWIPE_NESTED, 0.5, 0).isFalse()).isTrue();
|
assertThat(mClassifier.classifyGesture(QS_SWIPE_NESTED, 0.5, 0).isFalse()).isTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testPass_MediaSeekbar() {
|
||||||
|
when(mDataProvider.isVertical()).thenReturn(false);
|
||||||
|
|
||||||
|
when(mDataProvider.isUp()).thenReturn(false); // up and right should cause no effect.
|
||||||
|
when(mDataProvider.isRight()).thenReturn(false);
|
||||||
|
assertThat(mClassifier.classifyGesture(MEDIA_SEEKBAR, 0.5, 0).isFalse()).isFalse();
|
||||||
|
|
||||||
|
when(mDataProvider.isUp()).thenReturn(true);
|
||||||
|
when(mDataProvider.isRight()).thenReturn(false);
|
||||||
|
assertThat(mClassifier.classifyGesture(MEDIA_SEEKBAR, 0.5, 0).isFalse()).isFalse();
|
||||||
|
|
||||||
|
when(mDataProvider.isUp()).thenReturn(false);
|
||||||
|
when(mDataProvider.isRight()).thenReturn(true);
|
||||||
|
assertThat(mClassifier.classifyGesture(MEDIA_SEEKBAR, 0.5, 0).isFalse()).isFalse();
|
||||||
|
|
||||||
|
when(mDataProvider.isUp()).thenReturn(true);
|
||||||
|
when(mDataProvider.isRight()).thenReturn(true);
|
||||||
|
assertThat(mClassifier.classifyGesture(MEDIA_SEEKBAR, 0.5, 0).isFalse()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFalse_MediaSeekbar() {
|
||||||
|
when(mDataProvider.isVertical()).thenReturn(true);
|
||||||
|
|
||||||
|
when(mDataProvider.isUp()).thenReturn(false); // up and right should cause no effect.
|
||||||
|
when(mDataProvider.isRight()).thenReturn(false);
|
||||||
|
assertThat(mClassifier.classifyGesture(MEDIA_SEEKBAR, 0.5, 0).isFalse()).isTrue();
|
||||||
|
|
||||||
|
when(mDataProvider.isUp()).thenReturn(true);
|
||||||
|
when(mDataProvider.isRight()).thenReturn(false);
|
||||||
|
assertThat(mClassifier.classifyGesture(MEDIA_SEEKBAR, 0.5, 0).isFalse()).isTrue();
|
||||||
|
|
||||||
|
when(mDataProvider.isUp()).thenReturn(false);
|
||||||
|
when(mDataProvider.isRight()).thenReturn(true);
|
||||||
|
assertThat(mClassifier.classifyGesture(MEDIA_SEEKBAR, 0.5, 0).isFalse()).isTrue();
|
||||||
|
|
||||||
|
when(mDataProvider.isUp()).thenReturn(true);
|
||||||
|
when(mDataProvider.isRight()).thenReturn(true);
|
||||||
|
assertThat(mClassifier.classifyGesture(MEDIA_SEEKBAR, 0.5, 0).isFalse()).isTrue();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user