PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failing tests in BluetoothDeviceDetailsFragmentTest

Browse Source 
BUG: 313014781
Test: atest SettingsRoboTests:com.android.settings.bluetooth.BluetoothDeviceDetailsFragmentTest
Change-Id: I320875121899aed917041d31e186ea6bfbc5f735
This commit is contained in:
Haijie Hong
2023-11-29 11:35:12 +08:00
parent 6a3a3e2ac7
commit ffabf36177
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
View File

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