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

Merge "Fix robotests." into oc-dr1-dev

Browse Source
This commit is contained in:
Andrew Sapperstein
2017-07-25 23:37:37 +00:00
committed by Android (Google) Code Review
parent 5b67e453bf d2cf55bccd
commit b5696a9162
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
View File

@@ -42,6 +42,7 @@ import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.deviceinfo.StorageVolumeProvider; import com.android.settingslib.deviceinfo.StorageVolumeProvider;
import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -70,6 +71,8 @@ public class StorageSummaryDonutPreferenceControllerTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
SettingsShadowResources.overrideResource(
com.android.internal.R.string.config_headlineFontFamily, "");
mContext = spy(RuntimeEnvironment.application.getApplicationContext()); mContext = spy(RuntimeEnvironment.application.getApplicationContext());
FakeFeatureFactory.setupForTest(mContext); FakeFeatureFactory.setupForTest(mContext);
mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext); mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
@@ -84,6 +87,11 @@ public class StorageSummaryDonutPreferenceControllerTest {
mHolder = PreferenceViewHolder.createInstanceForTests(view); mHolder = PreferenceViewHolder.createInstanceForTests(view);
} }
@After
public void tearDown() {
SettingsShadowResources.reset();
}
@Test @Test
public void testEmpty() throws Exception { public void testEmpty() throws Exception {
mController.updateBytes(0, 32 * GIGABYTE); mController.updateBytes(0, 32 * GIGABYTE);

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

@@ -38,6 +38,8 @@ import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonito
import com.android.settings.testutils.shadow.ShadowEventLogWriter; import com.android.settings.testutils.shadow.ShadowEventLogWriter;
import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.testutils.shadow.ShadowUtils;
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;
@@ -66,6 +68,17 @@ import java.util.List;
}) })
public class SetupChooseLockPasswordTest { 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 @Test
public void createActivity_shouldNotCrash() { public void createActivity_shouldNotCrash() {
// Basic sanity test for activity created without crashing // Basic sanity test for activity created without crashing