Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d4d6db6 authored by Alex Stetson's avatar Alex Stetson Committed by Automerger Merge Worker
Browse files

Merge "Fix failing KeyguardUpdateMonitorTest" into udc-dev am: 6b01920b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21487336



Change-Id: Ia1f3e7b40d8b5c76151d2e51a88ed51a49aaf66e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f2a821c 6b01920b

packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java

+4 −7
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ import static org.mockito.ArgumentMatchers.eq; 
import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.spy;
@@ -2415,8 +2416,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
    @Test

    @Test

    public void testUsbComplianceIntent_refreshBatteryInfo() {

    public void testUsbComplianceIntent_refreshBatteryInfo() {

        Context contextSpy = getSpyContext();

        Context contextSpy = getSpyContext();

        when(contextSpy.registerReceiver(eq(null), any(IntentFilter.class)))

                .thenReturn(getBatteryIntent());





        mKeyguardUpdateMonitor.mBroadcastReceiver.onReceive(

        mKeyguardUpdateMonitor.mBroadcastReceiver.onReceive(

                contextSpy, new Intent(UsbManager.ACTION_USB_PORT_COMPLIANCE_CHANGED));

                contextSpy, new Intent(UsbManager.ACTION_USB_PORT_COMPLIANCE_CHANGED));
@@ -2429,8 +2428,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
    public void testUsbComplianceIntent_refreshBatteryInfoWithIncompatibleCharger() {

    public void testUsbComplianceIntent_refreshBatteryInfoWithIncompatibleCharger() {

        Context contextSpy = getSpyContext();

        Context contextSpy = getSpyContext();

        setupIncompatibleCharging();

        setupIncompatibleCharging();

        when(contextSpy.registerReceiver(eq(null), any(IntentFilter.class)))

                .thenReturn(getBatteryIntent());





        mKeyguardUpdateMonitor.mBroadcastReceiver.onReceive(

        mKeyguardUpdateMonitor.mBroadcastReceiver.onReceive(

                contextSpy, new Intent(UsbManager.ACTION_USB_PORT_COMPLIANCE_CHANGED));

                contextSpy, new Intent(UsbManager.ACTION_USB_PORT_COMPLIANCE_CHANGED));
@@ -2740,10 +2737,10 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
    }

    }





    private Context getSpyContext() {

    private Context getSpyContext() {

        mContext.addMockSystemService(UsbManager.class, mUsbManager);

        Context contextSpy = spy(mContext);

        Context contextSpy = spy(mContext);

        when(contextSpy.getSystemService(UsbManager.class)).thenReturn(mUsbManager);

        doReturn(getBatteryIntent()).when(contextSpy).registerReceiver(eq(null),

        when(contextSpy.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)))

                any(IntentFilter.class));

                .thenReturn(new Intent(Intent.ACTION_BATTERY_CHANGED));

        return contextSpy;

        return contextSpy;

    }

    }