From 20e0e78951555b77397955eb63210186687848b6 Mon Sep 17 00:00:00 2001 From: Alex Stetson Date: Fri, 17 Feb 2023 16:45:48 -0800 Subject: [PATCH] Fix failing KeyguardUpdateMonitorTest Bug: 269803127 Test: atest com.android.keyguard.KeyguardUpdateMonitorTest Change-Id: I920ddd394674b24fe9c0dfc2e073cb90b20cec74 --- .../android/keyguard/KeyguardUpdateMonitorTest.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java index 9fe7506ca7dd0..1d09d0b33a901 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java @@ -48,6 +48,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -2413,8 +2414,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { @Test public void testUsbComplianceIntent_refreshBatteryInfo() { Context contextSpy = getSpyContext(); - when(contextSpy.registerReceiver(eq(null), any(IntentFilter.class))) - .thenReturn(getBatteryIntent()); mKeyguardUpdateMonitor.mBroadcastReceiver.onReceive( contextSpy, new Intent(UsbManager.ACTION_USB_PORT_COMPLIANCE_CHANGED)); @@ -2427,8 +2426,6 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { public void testUsbComplianceIntent_refreshBatteryInfoWithIncompatibleCharger() { Context contextSpy = getSpyContext(); setupIncompatibleCharging(); - when(contextSpy.registerReceiver(eq(null), any(IntentFilter.class))) - .thenReturn(getBatteryIntent()); mKeyguardUpdateMonitor.mBroadcastReceiver.onReceive( contextSpy, new Intent(UsbManager.ACTION_USB_PORT_COMPLIANCE_CHANGED)); @@ -2738,10 +2735,10 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { } private Context getSpyContext() { + mContext.addMockSystemService(UsbManager.class, mUsbManager); Context contextSpy = spy(mContext); - when(contextSpy.getSystemService(UsbManager.class)).thenReturn(mUsbManager); - when(contextSpy.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED))) - .thenReturn(new Intent(Intent.ACTION_BATTERY_CHANGED)); + doReturn(getBatteryIntent()).when(contextSpy).registerReceiver(eq(null), + any(IntentFilter.class)); return contextSpy; }