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

Fix borken test on Bluetooth and connected package

Browse Source 
Bug: 187239965
Test: make RunSettingsRoboTests -j56
Change-Id: Ic0d60a6cd46b1211efb2021f079c0b0a6534b383
This commit is contained in:
Hugh Chen
2021-05-05 14:31:01 +08:00
parent 9246f6f8b0
commit db53d1c6f8
8 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
View File

@@ -29,6 +29,8 @@ import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.util.Pair;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
@@ -100,6 +102,8 @@ public class PreviouslyConnectedDevicePreferenceControllerTest {
private BluetoothDevice mBluetoothDevice4;
@Mock
private BluetoothDevice mBluetoothDevice5;
@Mock
private Drawable mDrawable;
private Context mContext;
private PreviouslyConnectedDevicePreferenceController mPreConnectedDeviceController;
@@ -109,6 +113,7 @@ public class PreviouslyConnectedDevicePreferenceControllerTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
Pair<Drawable, String> pairs = new Pair<>(mDrawable, "fake_device");
mContext = spy(RuntimeEnvironment.application);
doReturn(mContext).when(mDashboardFragment).getContext();
doReturn(mPackageManager).when(mContext).getPackageManager();
@@ -120,14 +125,19 @@ public class PreviouslyConnectedDevicePreferenceControllerTest {
when(mCachedDevice1.getDevice()).thenReturn(mBluetoothDevice1);
when(mCachedDevice1.getAddress()).thenReturn(FAKE_ADDRESS_1);
when(mCachedDevice1.getDrawableWithDescription()).thenReturn(pairs);
when(mCachedDevice2.getDevice()).thenReturn(mBluetoothDevice2);
when(mCachedDevice2.getAddress()).thenReturn(FAKE_ADDRESS_2);
when(mCachedDevice2.getDrawableWithDescription()).thenReturn(pairs);
when(mCachedDevice3.getDevice()).thenReturn(mBluetoothDevice3);
when(mCachedDevice3.getAddress()).thenReturn(FAKE_ADDRESS_3);
when(mCachedDevice3.getDrawableWithDescription()).thenReturn(pairs);
when(mCachedDevice4.getDevice()).thenReturn(mBluetoothDevice4);
when(mCachedDevice4.getAddress()).thenReturn(FAKE_ADDRESS_4);
when(mCachedDevice4.getDrawableWithDescription()).thenReturn(pairs);
when(mCachedDevice5.getDevice()).thenReturn(mBluetoothDevice5);
when(mCachedDevice5.getAddress()).thenReturn(FAKE_ADDRESS_5);
when(mCachedDevice5.getDrawableWithDescription()).thenReturn(pairs);
final List<BluetoothDevice> mMostRecentlyConnectedDevices = new ArrayList<>();
mMostRecentlyConnectedDevices.add(mBluetoothDevice1);

4
tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
View File

@@ -33,6 +33,7 @@ import static org.mockito.Mockito.when;
import android.hardware.usb.UsbManager;
import android.net.TetheringManager;
import android.os.Handler;
import androidx.preference.PreferenceScreen;
@@ -53,6 +54,8 @@ public class UsbDefaultFragmentTest {
private UsbBackend mUsbBackend;
@Mock
private TetheringManager mTetheringManager;
@Mock
private Handler mHandler;
private UsbDefaultFragment mFragment;
@@ -62,6 +65,7 @@ public class UsbDefaultFragmentTest {
mFragment = new TestFragment();
mFragment.mUsbBackend = mUsbBackend;
mFragment.mTetheringManager = mTetheringManager;
mFragment.mHandler = mHandler;
}
@Test