summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2017-09-07 19:09:37 +0000
committer android-build-merger <android-build-merger@google.com> 2017-09-07 19:09:37 +0000
commitd82bed1c745e8834382ad7ee94e2e87d2acfc217 (patch)
tree7a2486cc09edf941696b0bfe14da0f0fdab6d39c
parentcaf9c2a2e01c96374063b483c271071b49bfd63e (diff)
parentbd50122a2d75e2c98efd3a3040ab60686b517351 (diff)
Merge "Fix crash in presubmit tests" into oc-mr1-dev
am: bd50122a2d Change-Id: I019805d68c3bb17be8eda7c0c22ac80c28ff57fc
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java
index 0500a546856d..d823981133f3 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java
@@ -21,6 +21,7 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_QS_VALUE;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.TYPE_ACTION;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Matchers.argThat;
@@ -94,6 +95,7 @@ public class QSTileImplTest extends SysuiTestCase {
public void testPopulate() {
LogMaker maker = mock(LogMaker.class);
when(maker.setSubtype(anyInt())).thenReturn(maker);
+ when(maker.addTaggedData(anyInt(), any())).thenReturn(maker);
mTile.getState().value = true;
mTile.populate(maker);
verify(maker).addTaggedData(eq(FIELD_QS_VALUE), eq(1));