diff --git a/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java index aafeed08049..a5dbf785771 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataPlanSummaryPreferenceTest.java @@ -29,6 +29,7 @@ import com.android.settings.TestConfig; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.DonutView; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -56,6 +57,8 @@ public final class DataPlanSummaryPreferenceTest { @Before public void setUp() { + SettingsShadowResources.overrideResource( + com.android.internal.R.string.config_headlineFontFamily, ""); Context context = RuntimeEnvironment.application; mPreference = new DataPlanSummaryPreference(context); LayoutInflater inflater = LayoutInflater.from(context); @@ -64,6 +67,11 @@ public final class DataPlanSummaryPreferenceTest { mHolder = PreferenceViewHolder.createInstanceForTests(view); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void shouldRender_withoutData() { mPreference.onBindViewHolder(mHolder); diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java index d3c6a2506d7..bd40240a636 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java @@ -42,6 +42,7 @@ import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settingslib.deviceinfo.StorageVolumeProvider; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -70,6 +71,8 @@ public class StorageSummaryDonutPreferenceControllerTest { @Before public void setUp() throws Exception { + SettingsShadowResources.overrideResource( + com.android.internal.R.string.config_headlineFontFamily, ""); mContext = spy(RuntimeEnvironment.application.getApplicationContext()); FakeFeatureFactory.setupForTest(mContext); mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext); @@ -84,6 +87,11 @@ public class StorageSummaryDonutPreferenceControllerTest { mHolder = PreferenceViewHolder.createInstanceForTests(view); } + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void testEmpty() throws Exception { mController.updateBytes(0, 32 * GIGABYTE); diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java index 3e9c39c2d1a..39a0fb66663 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java @@ -38,6 +38,8 @@ import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonito import com.android.settings.testutils.shadow.ShadowEventLogWriter; import com.android.settings.testutils.shadow.ShadowUtils; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; @@ -66,6 +68,17 @@ import java.util.List; }) public class SetupChooseLockPasswordTest { + @Before + public void setUp() throws Exception { + SettingsShadowResources.overrideResource( + com.android.internal.R.string.config_headlineFontFamily, ""); + } + + @After + public void tearDown() { + SettingsShadowResources.reset(); + } + @Test public void createActivity_shouldNotCrash() { // Basic sanity test for activity created without crashing