From a0dc31f3c53cde9cc5e23d8b6e3a6c2af63fbcf2 Mon Sep 17 00:00:00 2001 From: Michael Groover Date: Thu, 20 Jan 2022 11:40:48 -0800 Subject: [PATCH] Resolve test failure in WorkModePreferenceControllerTest Android T introduced a new requirement that apps registering for non-system broadcasts via Context#registerReceiver must specify a flag indicating whether the receiver should be exported. This flag was added to the receiver in WorkModePreferenceController, but this broke a test since the signature of the registerReceiver method was changed. This commit updates the signature of the method in the test to also expect an int parameter for the flags. Fixes: 214906107 Test: make RunSettingsRoboTests ROBOTEST_FILTER=WorkModePreferenceControllerTest Change-Id: I17061ab24ed3ec3def4062fe461803ad88bce9c8 --- .../settings/accounts/WorkModePreferenceControllerTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java index c7e571fafd2..b5d1cc78eba 100644 --- a/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -32,7 +33,6 @@ import androidx.preference.SwitchPreference; import com.android.settings.R; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -106,10 +106,9 @@ public class WorkModePreferenceControllerTest { } @Test - @Ignore public void onStart_shouldRegisterReceiver() { mController.onStart(); - verify(mContext).registerReceiver(eq(mController.mReceiver), any()); + verify(mContext).registerReceiver(eq(mController.mReceiver), any(), anyInt()); } @Test