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

Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef am: 1ee62c16a3

Browse Source 
am: df916872c1

Change-Id: Ie842bc43d7af52f3b797eba63c2ec9e5fb886381
This commit is contained in:
Andrew Sapperstein
2017-07-27 05:30:09 +00:00
committed by android-build-merger
parent 32bb4393e0 df916872c1
commit 71902daa81
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
View File

@@ -36,6 +36,8 @@ import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.setupwizardlib.GlifLayout; import com.android.setupwizardlib.GlifLayout;
import org.junit.After;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
@@ -56,6 +58,17 @@ import org.robolectric.shadows.ShadowDrawable;
}) })
public class ChooseLockPasswordTest { public class ChooseLockPasswordTest {
@Before
public void setUp() throws Exception {
SettingsShadowResources.overrideResource(
com.android.internal.R.string.config_headlineFontFamily, "");
}
@After
public void tearDown() {
SettingsShadowResources.reset();
}
@Test @Test
public void intentBuilder_setPassword_shouldAddExtras() { public void intentBuilder_setPassword_shouldAddExtras() {
Intent intent = new IntentBuilder(application) Intent intent = new IntentBuilder(application)