Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf2f826a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use SettingsLibRobolectricTestRun everywhere."

parents 4471744e b5bf739d

packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settingslib;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.mock;
@@ -43,13 +44,12 @@ import org.junit.runner.RunWith; 
import org.mockito.Answers;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



/**

 * Tests for {@link HelpUtils}.

 */

@RunWith(RobolectricTestRunner.class)

@RunWith(SettingsLibRobolectricTestRunner.class)

public class HelpUtilsTest {

    private static final String TEST_HELP_URL = "intent:#Intent;action=com.android.test;end";

    private static final String PACKAGE_NAME_KEY = "package-name-key";

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java

+16 −9
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.settingslib.bluetooth;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Matchers.any;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.doAnswer;
@@ -31,23 +32,29 @@ import android.content.Context; 
import android.content.res.Resources;



import com.android.settingslib.R;

import com.android.settingslib.SettingsLibRobolectricTestRunner;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;



@RunWith(RobolectricTestRunner.class)

@RunWith(SettingsLibRobolectricTestRunner.class)

public class A2dpProfileTest {



    @Mock Context mContext;

    @Mock LocalBluetoothAdapter mAdapter;

    @Mock CachedBluetoothDeviceManager mDeviceManager;

    @Mock LocalBluetoothProfileManager mProfileManager;

    @Mock BluetoothDevice mDevice;

    @Mock BluetoothA2dp mBluetoothA2dp;

    @Mock

    Context mContext;

    @Mock

    LocalBluetoothAdapter mAdapter;

    @Mock

    CachedBluetoothDeviceManager mDeviceManager;

    @Mock

    LocalBluetoothProfileManager mProfileManager;

    @Mock

    BluetoothDevice mDevice;

    @Mock

    BluetoothA2dp mBluetoothA2dp;

    BluetoothProfile.ServiceListener mServiceListener;



    A2dpProfile mProfile;

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java

+3 −5
Original line number Diff line number Diff line
@@ -15,26 +15,24 @@ 
 */

package com.android.settingslib.bluetooth;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.verify;



import android.bluetooth.BluetoothHeadset;

import android.bluetooth.BluetoothProfile;

import android.content.Context;

import android.content.Intent;



import android.telephony.TelephonyManager;



import com.android.settingslib.SettingsLibRobolectricTestRunner;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



@RunWith(RobolectricTestRunner.class)

@RunWith(SettingsLibRobolectricTestRunner.class)

public class BluetoothEventManagerTest {



    @Mock

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java

+2 −8
Original line number Diff line number Diff line
@@ -17,12 +17,8 @@ package com.android.settingslib.bluetooth; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyString;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.bluetooth.BluetoothAdapter;
@@ -31,20 +27,18 @@ import android.bluetooth.BluetoothDevice; 
import android.bluetooth.BluetoothProfile;

import android.content.Context;



import com.android.settingslib.R;

import com.android.settingslib.SettingsLibRobolectricTestRunner;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



import java.util.Collection;



@RunWith(RobolectricTestRunner.class)

@RunWith(SettingsLibRobolectricTestRunner.class)

public class CachedBluetoothDeviceManagerTest {

    private final static String DEVICE_NAME_1 = "TestName_1";

    private final static String DEVICE_NAME_2 = "TestName_2";

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HeadsetProfileTest.java

+3 −2
Original line number Diff line number Diff line
@@ -13,15 +13,16 @@ import android.bluetooth.BluetoothHeadset; 
import android.bluetooth.BluetoothProfile;

import android.content.Context;



import com.android.settingslib.SettingsLibRobolectricTestRunner;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



@RunWith(RobolectricTestRunner.class)

@RunWith(SettingsLibRobolectricTestRunner.class)

public class HeadsetProfileTest {



    @Mock