From d33a1e3f70ae52480c14c2629dadc84286cea93f Mon Sep 17 00:00:00 2001 From: Joe Bolinger Date: Wed, 19 Jan 2022 21:55:46 +0000 Subject: [PATCH] Fix broken test. Fix: 215311430 Test: m -j RunSettingsLibRoboTests ROBOTEST_FILTER=BiometricActionDisabledByAdminControllerTest Change-Id: I18313b655994c0eb06b81ab05c0d665d784e844a --- .../BiometricActionDisabledByAdminControllerTest.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminControllerTest.java index aa11952397b40..06b6fc8ef73db 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/BiometricActionDisabledByAdminControllerTest.java @@ -22,7 +22,6 @@ import static com.android.settingslib.enterprise.FakeDeviceAdminStringProvider.D import static junit.framework.Assert.assertNotNull; import static junit.framework.TestCase.assertEquals; -import static junit.framework.TestCase.assertSame; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -37,7 +36,6 @@ import android.provider.Settings; import com.android.settingslib.RestrictedLockUtils; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -67,9 +65,8 @@ public class BiometricActionDisabledByAdminControllerTest { } @Test - @Ignore public void buttonClicked() { - ComponentName componentName = mock(ComponentName.class); + ComponentName componentName = new ComponentName("com.android.test", "AThing"); RestrictedLockUtils.EnforcedAdmin enforcedAdmin = new RestrictedLockUtils.EnforcedAdmin( componentName, new UserHandle(UserHandle.myUserId())); @@ -85,6 +82,6 @@ public class BiometricActionDisabledByAdminControllerTest { assertEquals(Settings.SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS, intentCaptor.getValue().getStringExtra( Settings.EXTRA_SUPERVISOR_RESTRICTED_SETTING_KEY)); - assertSame(componentName, intentCaptor.getValue().getComponent()); + assertEquals(componentName.getPackageName(), intentCaptor.getValue().getPackage()); } }