From b5bf739dbf24a49b8305c2dbecd2d52677eae4e3 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 25 Jul 2018 13:36:33 -0700 Subject: [PATCH] Use SettingsLibRobolectricTestRun everywhere. Test: robotests Change-Id: Ic36be5025e63c3dcf41d32b5c5390777a3fb0158 --- .../android/settingslib/HelpUtilsTest.java | 4 +-- .../bluetooth/A2dpProfileTest.java | 25 ++++++++++++------- .../bluetooth/BluetoothEventManagerTest.java | 8 +++--- .../CachedBluetoothDeviceManagerTest.java | 10 ++------ .../bluetooth/HeadsetProfileTest.java | 5 ++-- .../LocalBluetoothProfileManagerTest.java | 12 ++++----- .../AbstractPreferenceControllerTest.java | 7 ++++-- .../android/settingslib/drawer/TileTest.java | 7 +++--- .../InputMethodAndSubtypeUtilCompatTest.java | 5 ++-- .../InputMethodAndSubtypeUtilTest.java | 11 ++++---- .../settingslib/utils/IconCacheTest.java | 5 ++-- .../settingslib/utils/ThreadUtilsTest.java | 6 +++-- .../widget/AnimatedImageViewTest.java | 5 ++-- 13 files changed, 58 insertions(+), 52 deletions(-) diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java index e153c3ed1edf1..755331397a17d 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java @@ -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"; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java index ef13a5faa11c9..b2ab45ce9dc5e 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java @@ -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; @@ -126,7 +133,7 @@ public class A2dpProfileTest { private static String KNOWN_CODEC_LABEL = "Use high quality audio: %1$s"; private static String UNKNOWN_CODEC_LABEL = "Use high quality audio"; private static String[] CODEC_NAMES = - new String[] { "Default", "SBC", "AAC", "aptX", "aptX HD", "LDAC" }; + new String[]{"Default", "SBC", "AAC", "aptX", "aptX HD", "LDAC"}; /** * Helper for setting up several tests of getHighQualityAudioOptionLabel diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java index 1080690225676..5f42b667fdd3f 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/BluetoothEventManagerTest.java @@ -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 diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java index 16ed85cf5afad..c90438404a12a 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java @@ -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"; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HeadsetProfileTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HeadsetProfileTest.java index 03b023b75f4a7..bc8be4d5c3ddb 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HeadsetProfileTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HeadsetProfileTest.java @@ -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 diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java index d342bc8784771..77fb272f52317 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManagerTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -37,20 +36,19 @@ import android.content.Context; import android.content.Intent; import android.os.ParcelUuid; -import java.util.ArrayList; -import java.util.List; +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; -@RunWith(RobolectricTestRunner.class) -@Config(resourceDir = "../../res") +import java.util.ArrayList; +import java.util.List; + +@RunWith(SettingsLibRobolectricTestRunner.class) public class LocalBluetoothProfileManagerTest { @Mock private CachedBluetoothDeviceManager mDeviceManager; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java index 5261ea0c88bb1..4d7553cd85daf 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/AbstractPreferenceControllerTest.java @@ -16,21 +16,24 @@ package com.android.settingslib.core; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +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 AbstractPreferenceControllerTest { @Mock diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileTest.java index 5d352f08bedf7..7b9f92a96e3e5 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileTest.java @@ -1,19 +1,18 @@ package com.android.settingslib.drawer; -import static com.google.common.truth.Truth.assertThat; - import static com.android.settingslib.drawer.TileUtils.META_DATA_KEY_PROFILE; import static com.android.settingslib.drawer.TileUtils.PROFILE_ALL; import static com.android.settingslib.drawer.TileUtils.PROFILE_PRIMARY; +import static com.google.common.truth.Truth.assertThat; + import android.os.Bundle; import com.android.settingslib.SettingsLibRobolectricTestRunner; import org.junit.Before; -import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.junit.Test; +import org.junit.runner.RunWith; @RunWith(SettingsLibRobolectricTestRunner.class) public class TileTest { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtilCompatTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtilCompatTest.java index ddadac105c18d..1acb04eef4307 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtilCompatTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtilCompatTest.java @@ -25,15 +25,16 @@ import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodSubtype; import android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder; +import com.android.settingslib.SettingsLibRobolectricTestRunner; + import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; -@RunWith(RobolectricTestRunner.class) +@RunWith(SettingsLibRobolectricTestRunner.class) public class InputMethodAndSubtypeUtilCompatTest { private static final HashSet EMPTY_STRING_SET = new HashSet<>(); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtilTest.java index d0a0686782ab1..03ab261aa75a7 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtilTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/inputmethod/InputMethodAndSubtypeUtilTest.java @@ -18,10 +18,6 @@ package com.android.settingslib.inputmethod; import static com.google.common.truth.Truth.assertThat; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; - import android.content.pm.ApplicationInfo; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; @@ -29,11 +25,16 @@ import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodSubtype; import android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder; +import com.android.settingslib.SettingsLibRobolectricTestRunner; + +import org.junit.Test; +import org.junit.runner.RunWith; + import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; -@RunWith(RobolectricTestRunner.class) +@RunWith(SettingsLibRobolectricTestRunner.class) public class InputMethodAndSubtypeUtilTest { private static final HashSet EMPTY_STRING_SET = new HashSet<>(); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/IconCacheTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/IconCacheTest.java index 026ad47f99a21..645dfa1276268 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/IconCacheTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/IconCacheTest.java @@ -30,13 +30,14 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; +import com.android.settingslib.SettingsLibRobolectricTestRunner; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -@RunWith(RobolectricTestRunner.class) +@RunWith(SettingsLibRobolectricTestRunner.class) public class IconCacheTest { private Icon mIcon; private Context mContext; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java index 83a9d5be0ae7d..57c69f447a834 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/ThreadUtilsTest.java @@ -17,14 +17,16 @@ package com.android.settingslib.utils; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.fail; +import com.android.settingslib.SettingsLibRobolectricTestRunner; + import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowLooper; -@RunWith(RobolectricTestRunner.class) +@RunWith(SettingsLibRobolectricTestRunner.class) public class ThreadUtilsTest { @Test diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AnimatedImageViewTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AnimatedImageViewTest.java index 36abd204d088e..a00f12d9a6d99 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AnimatedImageViewTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/AnimatedImageViewTest.java @@ -22,13 +22,14 @@ import android.app.Activity; import android.graphics.drawable.AnimatedRotateDrawable; import android.view.View; +import com.android.settingslib.SettingsLibRobolectricTestRunner; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import org.robolectric.RobolectricTestRunner; -@RunWith(RobolectricTestRunner.class) +@RunWith(SettingsLibRobolectricTestRunner.class) public class AnimatedImageViewTest { private AnimatedImageView mAnimatedImageView;