diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java index 1904cb59d70..cfd256f3241 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java @@ -29,6 +29,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.companion.CompanionDeviceManager; import android.content.Context; import android.hardware.input.InputManager; import android.os.Bundle; @@ -49,8 +50,9 @@ import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.google.common.collect.ImmutableList; + import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Answers; @@ -63,7 +65,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.fakes.RoboMenu; -@Ignore("b/313014781") @RunWith(RobolectricTestRunner.class) @Config(shadows = { com.android.settings.testutils.shadow.ShadowUserManager.class, @@ -90,12 +91,17 @@ public class BluetoothDeviceDetailsFragmentTest { private UserManager mUserManager; @Mock private InputManager mInputManager; + @Mock + private CompanionDeviceManager mCompanionDeviceManager; @Before public void setUp() { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); doReturn(mInputManager).when(mContext).getSystemService(InputManager.class); + doReturn(mCompanionDeviceManager).when(mContext) + .getSystemService(CompanionDeviceManager.class); + when(mCompanionDeviceManager.getAllAssociations()).thenReturn(ImmutableList.of()); removeInputDeviceWithMatchingBluetoothAddress(); FakeFeatureFactory.setupForTest();