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

Merge "Fix a unit test regression." into oc-dev am: affc8fa18e

Browse Source 
am: 60b40a31c8

Change-Id: Ib37112094988b3837b261fb7be28f4e3cecbe4f9
This commit is contained in:
Daniel Nishi
2017-04-05 20:11:18 +00:00
committed by android-build-merger
parent 7fa7935b55 60b40a31c8
commit 3ac4d429f1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.deviceinfo;
import android.app.Activity; import android.app.Activity;
import android.app.usage.StorageStatsManager;
import android.icu.text.NumberFormat; import android.icu.text.NumberFormat;
import android.os.storage.VolumeInfo; import android.os.storage.VolumeInfo;
import android.text.format.Formatter; import android.text.format.Formatter;
@@ -40,6 +41,7 @@ import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -73,9 +75,14 @@ public class StorageSettingsTest {
final SummaryLoader.SummaryProvider provider = final SummaryLoader.SummaryProvider provider =
StorageSettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, loader); StorageSettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, loader);
final VolumeInfo volumeInfo = mVolumes.get(0); final VolumeInfo volumeInfo = mVolumes.get(0);
when(volumeInfo.isMountedReadable()).thenReturn(true);
when(volumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE); when(volumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);
when(volumeInfo.getPath().getTotalSpace()).thenReturn(500L); when(mStorageManagerVolumeProvider.getTotalBytes(
when(volumeInfo.getPath().getFreeSpace()).thenReturn(0L); any(StorageStatsManager.class), any(VolumeInfo.class)))
.thenReturn(500L);
when(mStorageManagerVolumeProvider.getFreeBytes(
any(StorageStatsManager.class), any(VolumeInfo.class)))
.thenReturn(0L);
ReflectionHelpers.setField( ReflectionHelpers.setField(
provider, "mStorageManagerVolumeProvider", mStorageManagerVolumeProvider); provider, "mStorageManagerVolumeProvider", mStorageManagerVolumeProvider);